Add menu item to start/stop service

Fix db leak

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -24,6 +24,7 @@ package uk.co.md87.android.contextanalyser;
 
 import android.app.Service;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
@@ -61,7 +62,8 @@ import uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder;
  *
  * @author chris
  */
-public class ContextAnalyserService extends Service {
+public class ContextAnalyserService extends Service
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final String ACTIVITY_CHANGED_INTENT
             = "uk.co.md87.android.contextanalyser.ACTIVITY_CHANGED";
@@ -121,8 +123,8 @@ public class ContextAnalyserService extends Service {
     private Handler handler = new Handler();
 
     @Override
-    public void onCreate() {
-        super.onCreate();
+    public void onStart(Intent intent, int startId) {
+        super.onStart(intent, startId);
 
         Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
 
@@ -139,6 +141,11 @@ public class ContextAnalyserService extends Service {
         handler.postDelayed(scheduleRunnable, POLLING_DELAY);
 
         FlurryAgent.onStartSession(this, "MKB8YES3C6CFB86PXYXK");
+
+        Log.i("ContextAnalyser", "Starting...");
+
+        SharedPreferences prefs = getSharedPreferences("contextanalyser", MODE_WORLD_READABLE);
+        prefs.registerOnSharedPreferenceChangeListener(this);
     }
     
     public void poll() {
@@ -346,6 +353,8 @@ public class ContextAnalyserService extends Service {
     public void onDestroy() {
         super.onDestroy();
 
+        dataHelper.close();
+
         handler.removeCallbacks(scheduleRunnable);
         FlurryAgent.onEndSession(this);
     }
@@ -355,4 +364,12 @@ public class ContextAnalyserService extends Service {
         return binder;
     }
 
+    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+        if (!prefs.getBoolean("run", true)) {
+            Log.i("ContextAnalyser", "Stopping...");
+            stopSelf();
+            prefs.unregisterOnSharedPreferenceChangeListener(this);
+        }
+    }
+
 }

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/DataHelper.java

@@ -266,6 +266,10 @@ public class DataHelper {
         }
     }
 
+    public void close() {
+        db.close();
+    }
+
     private static class OpenHelper extends SQLiteOpenHelper {
 
         public OpenHelper(final Context context) {

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/IntroActivity.java

@@ -24,7 +24,10 @@ package uk.co.md87.android.contextanalyser;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.webkit.WebView;
 
 /**
@@ -43,7 +46,34 @@ public class IntroActivity extends Activity {
         final WebView webview = (WebView) findViewById(R.id.webview);
         webview.loadUrl("http://chris.smith.name/android/contextanalyser/");
 
-        startService(new Intent(this, ContextAnalyserService.class));
+        SharedPreferences prefs = getSharedPreferences("contextanalyser", MODE_WORLD_READABLE);
+
+        if (prefs.getBoolean("run", true)) {
+            startService(new Intent(this, ContextAnalyserService.class));
+        }
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        SharedPreferences prefs = getSharedPreferences("contextanalyser", MODE_WORLD_READABLE);
+        menu.clear();
+        menu.add(0, 0, 0, prefs.getBoolean("run", true) ? "Disable service" : "Enable service");
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        SharedPreferences prefs = getSharedPreferences("contextanalyser", MODE_WORLD_READABLE);
+        boolean old = prefs.getBoolean("run", true);
+        prefs.edit().putBoolean("run", !old).commit();
+
+        if (!old) {
+            startService(new Intent(this, ContextAnalyserService.class));
+        }
+        
+        return super.onOptionsItemSelected(item);
     }
 
+
+
 }