Merge branch 'bugs' into edge

src/android/BackgroundGeolocationService.java

@@ -123,7 +123,10 @@ public class BackgroundGeolocationService extends Service implements GoogleApiCl
     public int onStartCommand(Intent intent, int flags, int startId) {
         instance = this;
         
-        EventBus.getDefault().register(this);
+        EventBus eventBus = EventBus.getDefault();
+        if (!eventBus.isRegistered(this)) {
+            eventBus.register(this);
+        }
         
         // Load config settings
         SharedPreferences settings = getSharedPreferences(TAG, 0);
@@ -348,10 +351,12 @@ public class BackgroundGeolocationService extends Service implements GoogleApiCl
                 startTone("long_beep");
                 // set our stationaryLocation
                 stationaryLocation = LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
+                if (stationaryLocation != null) {
                     EventBus.getDefault().post(new StationaryLocation(stationaryLocation));
                 }
             }
         }
+    }
     /**
      * Translates a number representing desired accuracy of GeoLocation system from set [0, 10, 100, 1000].
      * 0:  most aggressive, most accurate, worst battery drain
@@ -579,10 +584,13 @@ public class BackgroundGeolocationService extends Service implements GoogleApiCl
     private void cleanUp() {
         instance = null;
         EventBus.getDefault().unregister(this);
+        
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             removeActivityUpdates();
             removeLocationUpdates();
             googleApiClient.disconnect();
         }
+    }
     
     /**
      * Convert a Location instance to JSONObject