LocationGooglePlayServicesProvider compatible with Fragment mrmans0n#197

https://github.com/mrmans0n/smart-location-lib/pull/197/files

Author: ohjongin

library/src/main/java/io/nlopez/smartlocation/location/providers/LocationGooglePlayServicesProvider.java

@@ -9,7 +9,9 @@
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Looper;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.Fragment;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -52,6 +54,7 @@ public class LocationGooglePlayServicesProvider implements ServiceLocationProvid
     private boolean checkLocationSettings;
     private boolean fulfilledCheckLocationSettings;
     private boolean alwaysShow = true;
+    private Fragment mFragment;
 
     public LocationGooglePlayServicesProvider() {
         checkLocationSettings =  false;
@@ -68,6 +71,21 @@ public LocationGooglePlayServicesProvider(ServiceConnectionListener serviceListe
         this.serviceListener = serviceListener;
     }
 
+    public LocationGooglePlayServicesProvider(@NonNull Fragment fragment) {
+        this();
+        mFragment = fragment;
+    }
+
+    public LocationGooglePlayServicesProvider(@NonNull Fragment fragment, GooglePlayServicesListener playServicesListener) {
+        this(fragment);
+        googlePlayServicesListener = playServicesListener;
+    }
+
+    public LocationGooglePlayServicesProvider(@NonNull Fragment fragment, ServiceConnectionListener serviceListener) {
+        this(fragment);
+        this.serviceListener = serviceListener;
+    }
+
     @Override
     public void init(Context context, Logger logger) {
         this.logger = logger;
@@ -359,7 +377,13 @@ public void onResult(LocationSettingsResult locationSettingsResult) {
                     logger.w("Location settings are not satisfied. Show the user a dialog to " +
                             "upgrade location settings. You should hook into the Activity onActivityResult and call this provider's onActivityResult method for continuing this call flow. ");
 
-                    if (context instanceof Activity) {
+                    if (mFragment != null) {
+                        try {
+                            mFragment.startIntentSenderForResult(status.getResolution().getIntentSender(), REQUEST_CHECK_SETTINGS, null, 0, 0, 0, null);
+                        } catch (IntentSender.SendIntentException e) {
+                            logger.i("getIntentSender error unable to execute request.");
+                        }
+                    } else if (context instanceof Activity) {
                         try {
                             // Show the dialog by calling startResolutionForResult(), and check the result
                             // in onActivityResult().

library/src/main/java/io/nlopez/smartlocation/location/providers/LocationGooglePlayServicesWithFallbackProvider.java

@@ -1,10 +1,14 @@
 package io.nlopez.smartlocation.location.providers;
 
 import android.content.Context;
+import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 
 import io.nlopez.smartlocation.OnLocationUpdatedListener;
@@ -28,13 +32,43 @@ public class LocationGooglePlayServicesWithFallbackProvider implements LocationP
     private LocationProvider provider;
 
     public LocationGooglePlayServicesWithFallbackProvider(Context context) {
-        if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
             provider = new LocationGooglePlayServicesProvider(this);
         } else {
             provider = new LocationManagerProvider();
         }
     }
 
+    public LocationGooglePlayServicesWithFallbackProvider(@NonNull Fragment fragment, Context context) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            provider = new LocationGooglePlayServicesProvider(fragment, this);
+        } else {
+            provider = new LocationManagerProvider();
+        }
+    }
+
+    public LocationGooglePlayServicesWithFallbackProvider(Context context, boolean checkLocationSettings, boolean alwaysShow) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            LocationGooglePlayServicesProvider locationGooglePlayServicesProvider = new LocationGooglePlayServicesProvider(this);
+            locationGooglePlayServicesProvider.setCheckLocationSettings(checkLocationSettings);
+            locationGooglePlayServicesProvider.setLocationSettingsAlwaysShow(alwaysShow);
+            provider = locationGooglePlayServicesProvider;
+        } else {
+            provider = new LocationManagerProvider();
+        }
+    }
+
+    public LocationGooglePlayServicesWithFallbackProvider(@NonNull Fragment fragment, Context context, boolean checkLocationSettings, boolean alwaysShow) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            LocationGooglePlayServicesProvider locationGooglePlayServicesProvider = new LocationGooglePlayServicesProvider(fragment, this);
+            locationGooglePlayServicesProvider.setCheckLocationSettings(checkLocationSettings);
+            locationGooglePlayServicesProvider.setLocationSettingsAlwaysShow(alwaysShow);
+            provider = locationGooglePlayServicesProvider;
+        } else {
+            provider = new LocationManagerProvider();
+        }
+    }
+
     @Override
     public void init(Context context, Logger logger) {
         this.logger = logger;
@@ -80,6 +114,12 @@ public void onConnectionFailed(ConnectionResult connectionResult) {
         fallbackToLocationManager();
     }
 
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (provider instanceof LocationGooglePlayServicesProvider) {
+            ((LocationGooglePlayServicesProvider) provider).onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     private void fallbackToLocationManager() {
         logger.d("FusedLocationProvider not working, falling back and using LocationManager");
         provider = new LocationManagerProvider();