GoogleApiClient connected check to prevent rare edge case

Author: jkasten2

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

@@ -235,6 +235,7 @@ private static void receivedLocationPoint(Location location) {
       scheduleUpdate(classContext);
    }
 
+   // Hold on to reference incase gms uses weak referencing.
    private static LocationUpdateListener locationUpdateListener;
 
    private static class GoogleApiClientListener implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
@@ -297,7 +298,9 @@ static PendingResult<Status> requestLocationUpdates(GoogleApiClient googleApiCli
       }
 
       static PendingResult<Status> removeLocationUpdates(GoogleApiClient googleApiClient, LocationListener locationListener) {
-         return LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener);
+         if (googleApiClient.isConnected())
+            return LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener);
+         return null;
       }
 
       @SuppressWarnings("MissingPermission")

OneSignalSDK/onesignal/src/unity/java/com/onesignal/OneSignalUnityProxy.java

@@ -41,9 +41,6 @@ public class OneSignalUnityProxy implements NotificationOpenedHandler, Notificat
 
    private static String unityListenerName;
    private static java.lang.reflect.Method unitySendMessage;
-   
-   private static OSPermissionObserver permissionObserver;
-   private static OSSubscriptionObserver subscriptionObserver;
 
    @SuppressWarnings({ "unchecked", "rawtypes" })
    public OneSignalUnityProxy(String listenerName, String googleProjectNumber, String oneSignalAppId, int logLevel, int visualLogLevel) {