[TIMOB-20522] Improve validation

tidev · Feb 21, 2018 · 9cfe99c · 9cfe99c
1 parent 2923853
commit 9cfe99c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/FusedLocationProvider.java b/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/FusedLocationProvider.java
@@ -179,9 +179,12 @@ public static boolean validVersion()
 
 		public static boolean available(Context context)
 		{
-			googleApiCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
-			if (googleApiCode == ConnectionResult.SUCCESS) {
-				return true;
+			GoogleApiAvailability availability = GoogleApiAvailability.getInstance();
+			if (availability != null) {
+				googleApiCode = availability.isGooglePlayServicesAvailable(context);
+				if (googleApiCode == ConnectionResult.SUCCESS) {
+					return true;
+				}
 			}
 
 			Log.w(TAG, "Google Play Services is not available");

diff --git a/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/LocationProviderProxy.java b/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/LocationProviderProxy.java
@@ -9,6 +9,7 @@
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.Log;
+import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 
@@ -105,7 +106,8 @@ public LocationProviderProxy(String name, double minUpdateDistance, double minUp
 	 */
 	public Object getLocationCallback()
 	{
-		if (locationCallback == null && FusedLocationProvider.hasPlayServices(getActivity())) {
+		if (locationCallback == null
+			&& FusedLocationProvider.hasPlayServices(TiApplication.getAppRootOrCurrentActivity())) {
 			locationCallback = FusedLocationProvider.createLocationCallback(providerListener, getName());
 		}
 		return locationCallback;