status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[android] misc cleanup of redundant code / play services code

This commit is contained in:
Salakar 2017-10-06 16:19:37 +01:00
parent 7b68d2c660
commit 99699e97bd
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
android/src/main/java/io/invertase/firebase/RNFirebaseModule.java
View File

@ -37,18 +37,6 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule implements Life
return TAG; return TAG;
} }
@ReactMethod
public void promptPlayServices() {
GoogleApiAvailability gapi = GoogleApiAvailability.getInstance();
int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext());
if (status != ConnectionResult.SUCCESS && gapi.isUserResolvableError(status)) {
Activity activity = getCurrentActivity();
if (activity != null) {
gapi.getErrorDialog(activity, status, 2404).show();
}
}
}
@ReactMethod @ReactMethod
public void initializeApp(String appName, ReadableMap options, Callback callback) { public void initializeApp(String appName, ReadableMap options, Callback callback) {
@ -84,6 +72,9 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule implements Life
} }
} }
/**
* @return
*/
private WritableMap getPlayServicesStatus() { private WritableMap getPlayServicesStatus() {
GoogleApiAvailability gapi = GoogleApiAvailability.getInstance(); GoogleApiAvailability gapi = GoogleApiAvailability.getInstance();
final int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext()); final int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext());
@ -99,18 +90,50 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule implements Life
return result; return result;
} }
/**
* Prompt the device user to update play services
*/
@ReactMethod
public void promptPlayServices() {
GoogleApiAvailability gapi = GoogleApiAvailability.getInstance();
int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext());
if (status != ConnectionResult.SUCCESS && gapi.isUserResolvableError(status)) {
Activity activity = getCurrentActivity();
if (activity != null) {
gapi.getErrorDialog(activity, status, status).show();
}
}
}
/**
* Prompt the device user to update play services
*/
@ReactMethod
public void makePlayServicesAvailable() {
GoogleApiAvailability gapi = GoogleApiAvailability.getInstance();
int status = gapi.isGooglePlayServicesAvailable(getReactApplicationContext());
if (status != ConnectionResult.SUCCESS) {
Activity activity = getCurrentActivity();
if (activity != null) {
gapi.makeGooglePlayServicesAvailable(activity);
}
}
}
@Override @Override
public void onHostResume() { public void onHostResume() {
WritableMap params = Arguments.createMap(); // WritableMap params = Arguments.createMap();
params.putBoolean("isForeground", true); // params.putBoolean("isForeground", true);
Utils.sendEvent(getReactApplicationContext(), "RNFirebaseAppState", params); // Utils.sendEvent(getReactApplicationContext(), "RNFirebaseAppState", params);
} }
@Override @Override
public void onHostPause() { public void onHostPause() {
WritableMap params = Arguments.createMap(); // WritableMap params = Arguments.createMap();
params.putBoolean("isForeground", false); // params.putBoolean("isForeground", false);
Utils.sendEvent(getReactApplicationContext(), "RNFirebaseAppState", params); // Utils.sendEvent(getReactApplicationContext(), "RNFirebaseAppState", params);
} }
@Override @Override
@ -137,7 +160,7 @@ public class RNFirebaseModule extends ReactContextBaseJavaModule implements Life
appProps.put("messagingSenderId", appOptions.getGcmSenderId()); appProps.put("messagingSenderId", appOptions.getGcmSenderId());
appProps.put("projectId", appOptions.getProjectId()); appProps.put("projectId", appOptions.getProjectId());
appProps.put("storageBucket", appOptions.getStorageBucket()); appProps.put("storageBucket", appOptions.getStorageBucket());
// TODO no way to get client id currently from app options // TODO no way to get client id currently from app options - firebase sdk issue
appMapsList.add(appProps); appMapsList.add(appProps);
} }