Merge pull request #1398 from invertase/functions-multi-app-regions

[utils][js][android] add `firebase.utils().getPlayServicesStatus(): P…
This commit is contained in:
Michael Diarmid 2018-08-14 01:51:01 +01:00 committed by GitHub
commit 23e28e453f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -73,10 +73,15 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule {
} }
} }
@ReactMethod
public void getPlayServicesStatus(Promise promise) {
promise.resolve(getPlayServicesStatusMap());
}
/** /**
* @return * @return
*/ */
private WritableMap getPlayServicesStatus() { private WritableMap getPlayServicesStatusMap() {
GoogleApiAvailability gapi = GoogleApiAvailability.getInstance(); GoogleApiAvailability gapi = GoogleApiAvailability.getInstance();
final int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext()); final int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext());
WritableMap result = Arguments.createMap(); WritableMap result = Arguments.createMap();
@ -176,7 +181,7 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule {
} }
constants.put("apps", appMapsList); constants.put("apps", appMapsList);
constants.put("playServicesAvailability", getPlayServicesStatus()); constants.put("playServicesAvailability", getPlayServicesStatusMap());
return constants; return constants;
} }
} }

View File

@ -55,6 +55,11 @@ export default class RNFirebaseUtils extends ModuleBase {
} }
} }
getPlayServicesStatus(): Promise<GoogleApiAvailabilityType | null> {
if (isIOS) return Promise.resolve(null);
return FirebaseCoreModule.getPlayServicesStatus();
}
promptForPlayServices() { promptForPlayServices() {
if (isIOS) return null; if (isIOS) return null;
return FirebaseCoreModule.promptForPlayServices(); return FirebaseCoreModule.promptForPlayServices();