kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-06-16 02:44:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE when showing dialog while app is backgrounded

Browse Source
This commit is contained in:
Geoffrey Goh
2016-07-28 10:48:15 -07:00
parent 47c792e08d
commit cdbb8dbd49
1 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
android/app/src/main/java/com/microsoft/codepush/react/CodePushDialog.java
View File

@@ -5,6 +5,7 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
@@ -15,10 +16,49 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
super(reactContext);
}
private LifecycleEventListener mLifecycleEventListener = null;
@ReactMethod
public void showDialog(String title, String message, String button1Text, String button2Text,
final Callback successCallback, Callback errorCallback) {
AlertDialog.Builder builder = new AlertDialog.Builder(getCurrentActivity());
public void showDialog(final String title, final String message, final String button1Text,
final String button2Text, final Callback successCallback, Callback errorCallback) {
Activity currentActivity = getCurrentActivity();
if (currentActivity == null) {
// If getCurrentActivity is null, it could be because the app is backgrounded,
// so we show the dialog when the app resumes)
mLifecycleEventListener = new LifecycleEventListener() {
private boolean shown = false;
@Override
public void onHostResume() {
Activity currentActivity = getCurrentActivity();
if (!shown && currentActivity != null) {
shown = true;
// Set to null to allow GC.
mLifecycleEventListener = null;
showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);
}
}
@Override
public void onHostPause() {
}
@Override
public void onHostDestroy() {
}
};
} else {
showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);
}
}
private void showDialogInternal(String title, String message, String button1Text,
String button2Text, final Callback successCallback, Activity currentActivity) {
AlertDialog.Builder builder = new AlertDialog.Builder(currentActivity);
builder.setCancelable(false);