From a091aabc316e21a096f39f17a12e83e352372fa3 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 21 Mar 2010 16:15:00 -0500
Subject: [PATCH] Move quit to ContextApplication

---
 src/org/kreed/vanilla/ContextApplication.java      | 4 +++-
 src/org/kreed/vanilla/NowPlayingActivity.java      | 2 +-
 src/org/kreed/vanilla/PlaybackServiceActivity.java | 8 +-------
 src/org/kreed/vanilla/RemoteActivity.java          | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/org/kreed/vanilla/ContextApplication.java b/src/org/kreed/vanilla/ContextApplication.java
index 96c22fdd..95183d80 100644
--- a/src/org/kreed/vanilla/ContextApplication.java
+++ b/src/org/kreed/vanilla/ContextApplication.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.content.Intent;
 
 public class ContextApplication extends Application {
 	private static ContextApplication mInstance;
@@ -48,8 +49,9 @@ public class ContextApplication extends Application {
 		mActivities.remove(activity);
 	}
 
-	public static void finishAllActivities()
+	public static void quit(Context context)
 	{
+		context.stopService(new Intent(context, PlaybackService.class));
 		for (int i = mActivities.size(); --i != -1; )
 			mActivities.remove(i).finish();
 	}
diff --git a/src/org/kreed/vanilla/NowPlayingActivity.java b/src/org/kreed/vanilla/NowPlayingActivity.java
index 0677a7fb..7928ca11 100644
--- a/src/org/kreed/vanilla/NowPlayingActivity.java
+++ b/src/org/kreed/vanilla/NowPlayingActivity.java
@@ -226,7 +226,7 @@ public class NowPlayingActivity extends PlaybackServiceActivity implements View.
 	{
 		switch (item.getItemId()) {
 		case MENU_QUIT:
-			quit(this);
+			ContextApplication.quit(this);
 			break;
 		case MENU_PREFS:
 			startActivity(new Intent(this, PreferencesActivity.class));
diff --git a/src/org/kreed/vanilla/PlaybackServiceActivity.java b/src/org/kreed/vanilla/PlaybackServiceActivity.java
index 1b72b309..b5e1efce 100644
--- a/src/org/kreed/vanilla/PlaybackServiceActivity.java
+++ b/src/org/kreed/vanilla/PlaybackServiceActivity.java
@@ -84,7 +84,7 @@ public abstract class PlaybackServiceActivity extends Activity implements Servic
 	{
 		switch (keyCode) {
 		case KeyEvent.KEYCODE_BACK:
-			quit(context);
+			ContextApplication.quit(context);
 			return true;
 		}
 
@@ -97,12 +97,6 @@ public abstract class PlaybackServiceActivity extends Activity implements Servic
 		return handleKeyLongPress(this, keyCode);
 	}
 
-	protected static void quit(Context context)
-	{
-		context.stopService(new Intent(context, PlaybackService.class));
-		ContextApplication.finishAllActivities();
-	}
-
 	protected abstract void setState(int state);
 	protected abstract void setService(IPlaybackService service);
 
diff --git a/src/org/kreed/vanilla/RemoteActivity.java b/src/org/kreed/vanilla/RemoteActivity.java
index f075d6da..2d433afa 100644
--- a/src/org/kreed/vanilla/RemoteActivity.java
+++ b/src/org/kreed/vanilla/RemoteActivity.java
@@ -84,7 +84,7 @@ public class RemoteActivity extends PlaybackServiceActivity implements View.OnCl
 	public void onClick(View view)
 	{
 		if (view == mKillButton) {
-			quit(this);
+			ContextApplication.quit(this);
 		} else if (view == mOpenButton) {
 			startActivity(new Intent(this, NowPlayingActivity.class));
 			finish();