fix #224 (#227)

* fix #224 * implement review comments
lostzen · Jun 28, 2017 · 539c066 · 539c066
1 parent eec8cd1
commit 539c066
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java
@@ -42,10 +42,15 @@ public class FusedLocationProviderApiImpl extends ApiImpl
   private IFusedLocationProviderCallback.Stub remoteCallback
       = new IFusedLocationProviderCallback.Stub() {
     public void onLocationChanged(final Location location) throws RemoteException {
+
       new Handler(Looper.getMainLooper()).post(new Runnable() {
         @Override public void run() {
-          final LostClientManager clientManager = LostClientManager.shared();
-          serviceCallbackManager.onLocationChanged(context, location, clientManager, service);
+          // #224: this call is async, service may have been legally set to null in the meantime
+          if (service != null)
+          {
+            final LostClientManager clientManager = LostClientManager.shared();
+            serviceCallbackManager.onLocationChanged(context, location, clientManager, service);
+          }
         }
       });
     }

diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationServiceCallbackManager.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationServiceCallbackManager.java
@@ -18,20 +18,14 @@ public class FusedLocationServiceCallbackManager {
   /**
    * Called when a new location has been received. This method handles dispatching changes to all
    * {@link com.mapzen.android.lost.api.LocationListener}s, {@link android.app.PendingIntent}s, and
-   * {@link com.mapzen.android.lost.api.LocationCallback}s which are registered. If the
-   * {@link IFusedLocationProviderService} is null, an {@link IllegalStateException} will be thrown.
+   * {@link com.mapzen.android.lost.api.LocationCallback}s which are registered.
    * @param context
    * @param location
    * @param clientManager
    * @param service
    */
   void onLocationChanged(Context context, Location location, LostClientManager clientManager,
       IFusedLocationProviderService service) {
-    if (service == null) {
-      throw new IllegalStateException("Location update received after client was "
-          + "disconnected. Did you forget to unregister location updates before "
-          + "disconnecting?");
-    }
 
     ReportedChanges changes = clientManager.reportLocationChanged(location);
 

diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.location.Location;
 import android.os.Looper;
+import android.os.RemoteException;
 import android.support.annotation.NonNull;
 
 import java.util.ArrayList;

diff --git a/...c/test/java/com/mapzen/android/lost/internal/FusedLocationServiceCallbackManagerTest.java b/...c/test/java/com/mapzen/android/lost/internal/FusedLocationServiceCallbackManagerTest.java
@@ -20,12 +20,6 @@ public class FusedLocationServiceCallbackManagerTest {
   FusedLocationServiceCallbackManager callbackManager =
       new FusedLocationServiceCallbackManager();
 
-  @Test(expected = IllegalStateException.class)
-  public void onLocationChanged_shouldThrowIfServiceDisconnected() {
-    callbackManager.onLocationChanged(mock(Context.class), mock(Location.class),
-        mock(LostClientManager.class), null);
-  }
-
   @Test public void onLocationChanged_shouldReportLocationChanged() {
     LostClientManager clientManager = mock(LostClientManager.class);
     Location location = mock(Location.class);