From 7e05f88c4a8223cb56bf771a9ae6441b141427bb Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Fri, 12 Mar 2010 23:42:26 -0600
Subject: [PATCH] Don't autoconnect to service if it was explicity stopped
 within the application

---
 src/org/kreed/vanilla/NowPlayingActivity.java   |  4 ++--
 src/org/kreed/vanilla/PlaybackService.java      |  4 ++++
 .../kreed/vanilla/PlaybackServiceActivity.java  | 17 ++++++++++++++++-
 src/org/kreed/vanilla/RemoteActivity.java       |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/org/kreed/vanilla/NowPlayingActivity.java b/src/org/kreed/vanilla/NowPlayingActivity.java
index f642a237..a96becf4 100644
--- a/src/org/kreed/vanilla/NowPlayingActivity.java
+++ b/src/org/kreed/vanilla/NowPlayingActivity.java
@@ -183,7 +183,7 @@ public class NowPlayingActivity extends PlaybackServiceActivity implements View.
 	{
 		super.onStart();
 
-		bindPlaybackService();
+		bindPlaybackService(false);
 
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(PlaybackService.EVENT_SONG_CHANGED);
@@ -371,7 +371,7 @@ public class NowPlayingActivity extends PlaybackServiceActivity implements View.
 				updateProgress();
 			}
 		} else if (view == mReconnectButton) {
-			bindPlaybackService();
+			bindPlaybackService(true);
 		} else {
 			try {
 				if (view == mNextButton)
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index aee095fc..e763e605 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -430,6 +430,10 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 		TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 		telephonyManager.listen(mCallListener, PhoneStateListener.LISTEN_CALL_STATE);
 
+		SharedPreferences.Editor editor = mSettings.edit();
+		editor.putBoolean("explicit_stop", false);
+		editor.commit();
+
 		Looper.loop();
 	}
 
diff --git a/src/org/kreed/vanilla/PlaybackServiceActivity.java b/src/org/kreed/vanilla/PlaybackServiceActivity.java
index 1f5ceb77..cdfa9b86 100644
--- a/src/org/kreed/vanilla/PlaybackServiceActivity.java
+++ b/src/org/kreed/vanilla/PlaybackServiceActivity.java
@@ -23,7 +23,9 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.view.KeyEvent;
 
 public class PlaybackServiceActivity extends Activity implements ServiceConnection {
@@ -45,8 +47,16 @@ public class PlaybackServiceActivity extends Activity implements ServiceConnecti
 		return handleKeyLongPress(this, keyCode);
 	}
 
-	protected void bindPlaybackService()
+	protected void bindPlaybackService(boolean force)
 	{
+		if (!force) {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+			if (prefs.getBoolean("explicit_stop", false)) {
+				setService(null);
+				return;
+			}
+		}
+
 		Intent intent = new Intent(this, PlaybackService.class);
 		startService(intent);
 		bindService(intent, this, Context.BIND_AUTO_CREATE);
@@ -54,6 +64,11 @@ public class PlaybackServiceActivity extends Activity implements ServiceConnecti
 
 	protected static void stopPlaybackService(Activity activity)
 	{
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+		SharedPreferences.Editor editor = prefs.edit();
+		editor.putBoolean("explicit_stop", true);
+		editor.commit();
+
 		activity.stopService(new Intent(activity, PlaybackService.class));
 	}
 
diff --git a/src/org/kreed/vanilla/RemoteActivity.java b/src/org/kreed/vanilla/RemoteActivity.java
index 6d4aa799..1d0ad625 100644
--- a/src/org/kreed/vanilla/RemoteActivity.java
+++ b/src/org/kreed/vanilla/RemoteActivity.java
@@ -68,7 +68,7 @@ public class RemoteActivity extends PlaybackServiceActivity implements View.OnCl
 	{
 		super.onResume();
 
-		bindPlaybackService();
+		bindPlaybackService(true);
 		registerReceiver(mReceiver, new IntentFilter(PlaybackService.EVENT_STATE_CHANGED));
 	}