make sure monitor service is running

guardianproject · Nov 3, 2017 · c8236b7 · c8236b7
1 parent 083d895
commit c8236b7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -75,6 +75,7 @@ public class MonitorService extends Service {
     BarometerMonitor mBaroMonitor = null;
     AmbientLightMonitor mLightMonitor = null;
 
+    private boolean mIsRunning = false;
     /**
      * Last Event instances
      */
@@ -150,6 +151,7 @@ public void onDestroy() {
 		stopForeground(true);
 
 
+
     }
 
     /**
@@ -199,8 +201,16 @@ private void showNotification() {
 
     }
 
+    public boolean isRunning ()
+    {
+        return mIsRunning = true;
+
+    }
+
     private void startSensors ()
     {
+        mIsRunning = true;
+
         if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {
             mAccelManager = new AccelerometerMonitor(this);
             mBaroMonitor = new BarometerMonitor(this);
@@ -215,6 +225,8 @@ private void startSensors ()
 
     private void stopSensors ()
     {
+        mIsRunning = false;
+
         if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {
             mAccelManager.stop(this);
             mBaroMonitor.stop(this);

diff --git a/src/main/java/info/guardianproject/phoneypot/service/PowerConnectionReceiver.java b/src/main/java/info/guardianproject/phoneypot/service/PowerConnectionReceiver.java
@@ -26,7 +26,8 @@ public void onReceive(Context context, Intent intent) {
         boolean usbCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_USB;
         boolean acCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_AC;
 
-        if (MonitorService.getInstance() != null) {
+        if (MonitorService.getInstance() != null
+                && MonitorService.getInstance().isRunning()) {
             MonitorService.getInstance().alert(EventTrigger.POWER, context.getString(R.string.status_charging) + isCharging + " USB:" + usbCharge + " AC:" + acCharge);
         }
     }