Fixed ANR lock with location by adding a HandlerThread

* Fixed bg type as well

Author: jkasten2

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

@@ -40,6 +40,8 @@
 import android.location.Location;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.support.annotation.NonNull;
 
 import com.google.android.gms.common.ConnectionResult;
@@ -68,6 +70,8 @@ static class LocationPoint {
    private static GoogleApiClientCompatProxy mGoogleApiClient;
    static String requestPermission;
    private static Context classContext;
+   
+   private static LocationHandlerThread locationHandlerThread;
 
    interface LocationHandler {
       void complete(LocationPoint point);
@@ -167,12 +171,16 @@ static void startGetLocation() {
 
       try {
          startFallBackThread();
+         
+         if (locationHandlerThread == null)
+            locationHandlerThread = new LocationHandlerThread();
 
          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);
 
@@ -308,4 +316,14 @@ static Location getLastLocation(GoogleApiClient googleApiClient) {
          return LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
       }
    }
+   
+   static class LocationHandlerThread extends HandlerThread {
+      Handler mHandler = null;
+      
+      LocationHandlerThread() {
+         super("OSH_LocationHandlerThread");
+         start();
+         mHandler = new Handler(getLooper());
+      }
+   }
 }

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

@@ -285,9 +285,8 @@ private Set<String> getGroupChangeFields(UserState changedTo) {
                 || syncValues.optDouble("lat") != changedTo.syncValues.getDouble("lat")
                 || syncValues.optDouble("long") != changedTo.syncValues.getDouble("long")
                 || syncValues.optDouble("loc_acc") != changedTo.syncValues.getDouble("loc_acc")
-                || syncValues.optInt("loc_type") != changedTo.syncValues.optInt("loc_type")) {
-               if (changedTo.dependValues.optBoolean("loc_bg"))
-                  changedTo.syncValues.put("loc_bg", changedTo.dependValues.optBoolean("loc_bg"));
+                || syncValues.optInt("loc_type ") != changedTo.syncValues.optInt("loc_type")) {
+                  changedTo.syncValues.put("loc_bg", changedTo.dependValues.opt("loc_bg"));
                return LOCATION_FIELDS_SET;
             }
          } catch (Throwable t) {}

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -1404,7 +1404,8 @@ public void testLocationSchedule() throws Exception {
       Assert.assertEquals(1.1d, ShadowOneSignalRestClient.lastPost.optDouble("lat"));
       Assert.assertEquals(2.2d, ShadowOneSignalRestClient.lastPost.optDouble("long"));
       Assert.assertEquals(3.3f, ShadowOneSignalRestClient.lastPost.opt("loc_acc"));
-      Assert.assertFalse(ShadowOneSignalRestClient.lastPost.has("loc_bg"));
+      
+      Assert.assertEquals(false, ShadowOneSignalRestClient.lastPost.opt("loc_bg"));
       Assert.assertEquals("11111111-2222-3333-4444-555555555555", ShadowOneSignalRestClient.lastPost.opt("ad_id"));
 
       // Testing loc_bg