Check activity recognition connected before disconnecting

mendhak · Aug 16, 2015 · 98b6487 · 98b6487
1 parent 3052a24
commit 98b6487
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/gpslogger/src/main/java/com/mendhak/gpslogger/GpsLoggingService.java b/gpslogger/src/main/java/com/mendhak/gpslogger/GpsLoggingService.java
@@ -136,8 +136,10 @@ public void onConnectionFailed(ConnectionResult arg0) {
     private void StopActivityRecognitionUpdates(){
         try{
             tracer.debug("Stopping activity recognition updates");
-            ActivityRecognition.ActivityRecognitionApi.removeActivityUpdates(googleApiClient, activityRecognitionPendingIntent);
-            googleApiClient.disconnect();
+            if(googleApiClient != null && googleApiClient.isConnected()){
+                ActivityRecognition.ActivityRecognitionApi.removeActivityUpdates(googleApiClient, activityRecognitionPendingIntent);
+                googleApiClient.disconnect();
+            }
         }
         catch(Throwable t){
             tracer.warn(SessionLogcatAppender.MARKER_INTERNAL, "Tried to stop activity recognition updates", t);