Merge pull request #536 from OneSignal/location_sync

Synchronize LocationGMS

Author: Nightsd01

OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationGMS.java

@@ -75,6 +75,8 @@ static class LocationPoint {
 
    private static LocationHandlerThread locationHandlerThread;
 
+   protected static final Object syncLock = new Object() {};
+
    enum CALLBACK_TYPE {
       STARTUP, PROMPT_LOCATION, SYNC_SERVICE
    }
@@ -178,25 +180,27 @@ static void startGetLocation() {
          return;
 
       try {
-         startFallBackThread();
-         
-         if (locationHandlerThread == null)
-            locationHandlerThread = new LocationHandlerThread();
-
-         if (mGoogleApiClient == null || mLastLocation == null) {
-            GoogleApiClientListener googleApiClientListener = new GoogleApiClientListener();
-            GoogleApiClient googleApiClient = new GoogleApiClient.Builder(classContext)
-                    .addApi(LocationServices.API)
-                    .addConnectionCallbacks(googleApiClientListener)
-                    .addOnConnectionFailedListener(googleApiClientListener)
-                    .setHandler(locationHandlerThread.mHandler)
-                    .build();
-            mGoogleApiClient = new GoogleApiClientCompatProxy(googleApiClient);
-
-            mGoogleApiClient.connect();
+         synchronized (syncLock) {
+            startFallBackThread();
+
+            if (locationHandlerThread == null)
+               locationHandlerThread = new LocationHandlerThread();
+
+            if (mGoogleApiClient == null || mLastLocation == null) {
+               GoogleApiClientListener googleApiClientListener = new GoogleApiClientListener();
+               GoogleApiClient googleApiClient = new GoogleApiClient.Builder(classContext)
+                       .addApi(LocationServices.API)
+                       .addConnectionCallbacks(googleApiClientListener)
+                       .addOnConnectionFailedListener(googleApiClientListener)
+                       .setHandler(locationHandlerThread.mHandler)
+                       .build();
+               mGoogleApiClient = new GoogleApiClientCompatProxy(googleApiClient);
+
+               mGoogleApiClient.connect();
+            }
+            else if (mLastLocation != null)
+               fireCompleteForLocation(mLastLocation);
          }
-         else if (mLastLocation != null)
-            fireCompleteForLocation(mLastLocation);
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.WARN, "Location permission exists but there was an error initializing: ", t);
          fireFailedComplete();
@@ -225,9 +229,12 @@ public void run() {
 
    static void fireFailedComplete() {
       PermissionsActivity.answered = false;
-      if(mGoogleApiClient != null)
-         mGoogleApiClient.disconnect();
-      mGoogleApiClient = null;
+
+      synchronized (syncLock) {
+         if(mGoogleApiClient != null)
+            mGoogleApiClient.disconnect();
+         mGoogleApiClient = null;
+      }
 
       fireComplete(null);
    }
@@ -283,30 +290,35 @@ private static void fireCompleteForLocation(Location location) {
    }
 
    static void onFocusChange() {
-      if (mGoogleApiClient == null || !mGoogleApiClient.realInstance().isConnected())
-         return;
+      synchronized (syncLock) {
+         if (mGoogleApiClient == null || !mGoogleApiClient.realInstance().isConnected())
+            return;
+
+         GoogleApiClient googleApiClient = mGoogleApiClient.realInstance();
 
-      GoogleApiClient googleApiClient = mGoogleApiClient.realInstance();
-      if (locationUpdateListener != null)
-         LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationUpdateListener);
+         if (locationUpdateListener != null)
+            LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationUpdateListener);
 
-      locationUpdateListener = new LocationUpdateListener(googleApiClient);
+         locationUpdateListener = new LocationUpdateListener(googleApiClient);
+      }
    }
 
    static LocationUpdateListener locationUpdateListener;
 
    private static class GoogleApiClientListener implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
       @Override
       public void onConnected(Bundle bundle) {
-         PermissionsActivity.answered = false;
+         synchronized (syncLock) {
+            PermissionsActivity.answered = false;
 
-         if (mLastLocation == null) {
-            mLastLocation = FusedLocationApiWrapper.getLastLocation(mGoogleApiClient.realInstance());
-            if (mLastLocation != null)
-               fireCompleteForLocation(mLastLocation);
-         }
+            if (mLastLocation == null) {
+               mLastLocation = FusedLocationApiWrapper.getLastLocation(mGoogleApiClient.realInstance());
+               if (mLastLocation != null)
+                  fireCompleteForLocation(mLastLocation);
+            }
 
-         locationUpdateListener = new LocationUpdateListener(mGoogleApiClient.realInstance());
+            locationUpdateListener = new LocationUpdateListener(mGoogleApiClient.realInstance());
+         }
       }
 
       @Override
@@ -324,7 +336,8 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
    static class LocationUpdateListener implements LocationListener {
 
       private GoogleApiClient mGoogleApiClient;
-      
+
+      // this initializer method is already synchronized from LocationGMS with respect to the GoogleApiClient lock
       LocationUpdateListener(GoogleApiClient googleApiClient) {
          mGoogleApiClient = googleApiClient;
 
@@ -352,17 +365,21 @@ static class FusedLocationApiWrapper {
       @SuppressWarnings("MissingPermission")
       static void requestLocationUpdates(GoogleApiClient googleApiClient, LocationRequest locationRequest, LocationListener locationListener) {
          try {
-            if (googleApiClient.isConnected())
-               LocationServices.FusedLocationApi.requestLocationUpdates(googleApiClient, locationRequest, locationListener);
+            synchronized (LocationGMS.syncLock) {
+               if (googleApiClient.isConnected())
+                  LocationServices.FusedLocationApi.requestLocationUpdates(googleApiClient, locationRequest, locationListener);
+            }
          } catch(Throwable t) {
             OneSignal.Log(OneSignal.LOG_LEVEL.WARN, "FusedLocationApi.requestLocationUpdates failed!", t);
          }
       }
 
       @SuppressWarnings("MissingPermission")
       static Location getLastLocation(GoogleApiClient googleApiClient) {
-         if (googleApiClient.isConnected())
-            return LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
+         synchronized(LocationGMS.syncLock) {
+            if (googleApiClient.isConnected())
+               return LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
+         }
          return null;
       }
    }