kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-06-13 01:18:56 +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:52:29 -07:00
parent cdbb8dbd49
commit 20370fa3ca
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
super(reactContext);
}
private LifecycleEventListener mLifecycleEventListener = null;
@ReactMethod
public void showDialog(final String title, final String message, final String button1Text,
final String button2Text, final Callback successCallback, Callback errorCallback) {
@@ -25,7 +23,7 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
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() {
getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
private boolean shown = false;
@Override
@@ -33,10 +31,7 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
Activity currentActivity = getCurrentActivity();
if (!shown && currentActivity != null) {
shown = true;
// Set to null to allow GC.
mLifecycleEventListener = null;
getReactApplicationContext().removeLifecycleEventListener(this);
showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);
}
}
@@ -50,7 +45,7 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
public void onHostDestroy() {
}
};
});
} else {
showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);
}