From ad9da693894318f52085b4ce8d713e5a22c5097c Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Wed, 29 Dec 2010 20:46:32 +0000
Subject: [PATCH] KillerCallback instead of KillerService

---
 AndroidManifest.xml                           |  2 +-
 .../android/fbreader/FBReader.java            |  4 +--
 ...KillerService.java => KillerCallback.java} | 25 +++----------------
 3 files changed, 7 insertions(+), 24 deletions(-)
 rename src/org/geometerplus/android/fbreader/library/{KillerService.java => KillerCallback.java} (69%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f6d5ee33b..86cd37882 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,7 +66,7 @@
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
 		</activity>
 		<service android:name="org.geometerplus.android.fbreader.library.InitializationService" android:process=":library" />
-		<service android:name="org.geometerplus.android.fbreader.library.KillerService" android:process=":library" />
+		<receiver android:name="org.geometerplus.android.fbreader.library.KillerCallback" android:process=":library" />
 		<activity android:name="org.geometerplus.android.fbreader.library.LibraryTopLevelActivity" android:launchMode="singleTask" android:process=":library" android:configChanges="orientation|keyboardHidden">
 			<intent-filter>
 				<action android:name="android.intent.action.SEARCH" />
diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java
index 423680694..b18cb88c0 100644
--- a/src/org/geometerplus/android/fbreader/FBReader.java
+++ b/src/org/geometerplus/android/fbreader/FBReader.java
@@ -44,7 +44,7 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
 import org.geometerplus.fbreader.fbreader.ActionCode;
 import org.geometerplus.fbreader.fbreader.FBReaderApp;
 
-import org.geometerplus.android.fbreader.library.KillerService;
+import org.geometerplus.android.fbreader.library.KillerCallback;
 
 public final class FBReader extends ZLAndroidActivity {
 	public static final String BOOK_PATH_KEY = "BookPath";
@@ -185,7 +185,7 @@ public final class FBReader extends ZLAndroidActivity {
 	@Override
 	public void onResume() {
 		super.onResume();
-		startService(new Intent(getApplicationContext(), KillerService.class));
+		sendBroadcast(new Intent(getApplicationContext(), KillerCallback.class));
 		ControlButtonPanel.restoreVisibilities();
 	}
 
diff --git a/src/org/geometerplus/android/fbreader/library/KillerService.java b/src/org/geometerplus/android/fbreader/library/KillerCallback.java
similarity index 69%
rename from src/org/geometerplus/android/fbreader/library/KillerService.java
rename to src/org/geometerplus/android/fbreader/library/KillerCallback.java
index 5cfce1bc6..6c3463e35 100644
--- a/src/org/geometerplus/android/fbreader/library/KillerService.java
+++ b/src/org/geometerplus/android/fbreader/library/KillerCallback.java
@@ -19,31 +19,14 @@
 
 package org.geometerplus.android.fbreader.library;
 
-import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
-import android.os.IBinder;
 import android.os.Process;
 
-public class KillerService extends Service {
+public class KillerCallback extends BroadcastReceiver {
 	@Override
-	public IBinder onBind(Intent intent) {
-		return null;
-	}
-
-	@Override
-	public void onStart(Intent intent, int startId) {
-		stopSelf();
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		onStart(intent, startId);
-		return 0;
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
+	public void onReceive(Context context, Intent intent) {
 		Process.killProcess(Process.myPid());
 	}
 }