@srcpush/react-native-code-push 1.0.3-feat-new-architecture.1 → 1.0.3-feat-new-arch.2

package/AlertAdapter.js

@@ -2,7 +2,22 @@ import React, { Platform } from "react-native";
 let { Alert } = React;
 
 if (Platform.OS === "android") {
-  const { NativeModules: { CodePushDialog } } = React;
+  function resolveNativeModule(name) {
+    const ReactNative = require("react-native");
+    try {
+      const turboModule =
+        ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+          ? ReactNative.TurboModuleRegistry.get(name)
+          : null;
+      if (turboModule) return turboModule;
+    } catch (_e) {
+      // Ignore and fall back to legacy NativeModules.
+    }
+
+    return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+  }
+
+  const CodePushDialog = resolveNativeModule("CodePushDialog");
     
   Alert = {
     alert(title, message, buttons) {
@@ -13,6 +28,10 @@ if (Platform.OS === "android") {
       const button1Text = buttons[0] ? buttons[0].text : null,
             button2Text = buttons[1] ? buttons[1].text : null;
       
+      if (!CodePushDialog) {
+        throw "CodePushDialog native module is not installed.";
+      }
+
       CodePushDialog.showDialog(
         title, message, button1Text, button2Text,
         (buttonId) => { buttons[buttonId].onPress && buttons[buttonId].onPress(); }, 
@@ -21,4 +40,4 @@ if (Platform.OS === "android") {
   };
 }
 
-module.exports = { Alert };
+module.exports = { Alert };

package/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 ### Environment setup
 
-`node.js` and `npm` are needed for using this project. `npm` comes bundled with the `node.js` installer. You can download the `node.js` installer here: https://nodejs.org/download/.
+`node.js` and `npm` are needed for using this project. `npm` comes bundled with the `node.js` installer. You can download the `node.js` installer here: <https://nodejs.org/download/>.
 
 Once you have installed `node.js` and `npm`, install the dev dependencies for the project.
 
@@ -15,19 +15,22 @@ npm install
 ### Using the plugin manually
 
 Follow these steps to test your modifications to the plugin manually:
+
 - clone this repository
 - install the dependencies
 
-	Navigate to the root folder from your command line console and run:
-	```
-	npm install
-	```
+ Navigate to the root folder from your command line console and run:
+ ```
+ npm install
+ ```
+
 - install the plugin in a React-Native project
 
-	Navigate to the root folder of your React-Native project from your command line console and run:
-	```
-	npm install local_path_to_your_clone_of_this_repo
-	```
+ Navigate to the root folder of your React-Native project from your command line console and run:
+ ```
+ npm install local_path_to_your_clone_of_this_repo
+ ```
+
 - configure the plugin using the steps in the README.md
 - build and run your app on an emulator or device
 
@@ -81,6 +84,7 @@ If you would like to pull the plugin from NPM rather than running the tests on t
 #### Default
 
 To run all of the unit tests on Android and iOS:
+
 ```
 npm run test
 ```
@@ -88,6 +92,7 @@ npm run test
 #### iOS
 
 To run all of the unit tests on iOS:
+
 ```
 npm run test:ios
 ```
@@ -95,6 +100,7 @@ npm run test:ios
 #### Android
 
 To run all of the unit tests on Android:
+
 ```
 npm run test:android
 ```
@@ -107,26 +113,31 @@ The platforms are ordered as follows, and ran in that order:
 android, ios
 
 To run the core unit tests on Android:
+
 ```
 CORE=true npm run test:android
 ```
 
 To run all of the unit tests on iOS and pull the plugin from NPM:
+
 ```
 NPM=true npm run test:ios
 ```
 
 To run all of the unit tests on Android and iOS without building first:
+
 ```
 npm run test:fast
 ```
 
 To run all of the unit tests on iOS and restart the emulators:
+
 ```
 CLEAN=true npm run test:ios
 ```
 
 To run the core unit tests on Android and pull the plugin from NPM:
+
 ```
 NPM=true CORE=true npm run test:android
 ```

package/CodePush.js

@@ -1,11 +1,26 @@
 import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
 import { Alert } from "./AlertAdapter";
 import requestFetchAdapter from "./request-fetch-adapter";
-import { AppState, Platform, TurboModuleRegistry } from "react-native";
+import { AppState, Platform } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
-let NativeCodePush = (TurboModuleRegistry?.get('CodePush')) || require("react-native").NativeModules.CodePush;
+function resolveNativeModule(name) {
+  const ReactNative = require("react-native");
+  try {
+    const turboModule =
+      ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+        ? ReactNative.TurboModuleRegistry.get(name)
+        : null;
+    if (turboModule) return turboModule;
+  } catch (_e) {
+    // Ignore and fall back to legacy NativeModules.
+  }
+
+  return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+}
+
+let NativeCodePush = resolveNativeModule("CodePush");
 const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchCallback = null) {

package/LICENSE.md

@@ -2,7 +2,7 @@ Microsoft CodePush Plugin for React Native
 
 Copyright (c) Microsoft Corporation
 
-All rights reserved. 
+All rights reserved.
 
 MIT License
 
@@ -10,4 +10,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,8 +1,8 @@
-#### [Sign up With Source Push](https://console.srcpush.com/register) to use CodePush SDK
+#### [Sign up With Source Push](https://console.srcpush.com/register) to use Source Push SDK
 
 # React Native SDK for Source Push (CodePush compatible service)
 
-This plugin provides client-side integration for the [CodePush service](https://srcpush.com/), allowing you to easily add a dynamic update experience to your React Native app(s).
+This plugin provides client-side integration for the [Source Push service](https://srcpush.com/), allowing you to easily add a dynamic update experience to your React Native app(s).
 
 <!-- React Native Catalog -->
 
@@ -34,20 +34,20 @@ This plugin provides client-side integration for the [CodePush service](https://
 
 A React Native app is composed of JavaScript files and any accompanying [images](https://reactnative.dev/docs/image), which are bundled together by the [metro bundler](https://github.com/facebook/metro) and distributed as part of a platform-specific binary (i.e. an `.ipa` or `.apk` file). Once the app is released, updating either the JavaScript code (e.g. making bug fixes, adding new features) or image assets, requires you to recompile and redistribute the entire binary, which of course, includes any review time associated with the store(s) you are publishing to.
 
-The CodePush plugin helps get product improvements in front of your end users instantly, by keeping your JavaScript and images synchronized with updates you release to the CodePush server. This way, your app gets the benefits of an offline mobile experience, as well as the "web-like" agility of side-loading updates as soon as they are available. It's a win-win!
+The Source Push plugin helps get product improvements in front of your end users instantly, by keeping your JavaScript and images synchronized with updates you release to the Source Push server. This way, your app gets the benefits of an offline mobile experience, as well as the "web-like" agility of side-loading updates as soon as they are available. It's a win-win!
 
-In order to ensure that your end users always have a functioning version of your app, the CodePush plugin maintains a copy of the previous update, so that in the event that you accidentally push an update which includes a crash, it can automatically roll back. This way, you can rest assured that your newfound release agility won't result in users becoming blocked before you have a chance to roll back on the server. It's a win-win-win!
+In order to ensure that your end users always have a functioning version of your app, the Source Push plugin maintains a copy of the previous update, so that in the event that you accidentally push an update which includes a crash, it can automatically roll back. This way, you can rest assured that your newfound release agility won't result in users becoming blocked before you have a chance to roll back on the server. It's a win-win-win!
 
-*Note: Any product changes which touch native code (e.g. modifying your `AppDelegate.m`/`MainActivity.java` file, adding a new plugin) cannot be distributed via CodePush, and therefore, must be updated via the appropriate store(s).*
+*Note: Any product changes which touch native code (e.g. modifying your `AppDelegate.m`/`MainActivity.java` file, adding a new plugin) cannot be distributed via Source Push, and therefore, must be updated via the appropriate store(s).*
 
 ## Supported React Native platforms
 
 * iOS (7+)
 * Android (4.1+) on TLS 1.2 compatible devices
 
-We try our best to maintain backwards compatibility of our plugin with previous versions of React Native, but due to the nature of the platform, and the existence of breaking changes between releases, it is possible that you need to use a specific version of the CodePush plugin in order to support the exact version of React Native you are using. The following table outlines which CodePush plugin versions officially support the respective React Native versions:
+We try our best to maintain backwards compatibility of our plugin with previous versions of React Native, but due to the nature of the platform, and the existence of breaking changes between releases, it is possible that you need to use a specific version of the Source Push plugin in order to support the exact version of React Native you are using. The following table outlines which Source Push plugin versions officially support the respective React Native versions:
 
-| React Native version(s) | Supporting CodePush version(s)                                                              |
+| React Native version(s) | Supporting Source Push version(s)                                                              |
 |-------------------------|---------------------------------------------------------------------------------------------|
 | <v0.76                  | Use [microsoft/code-push-react-native](https://github.com/microsoft/react-native-code-push) |
 | v0.76, v0.77, 0.78      | v1.0+ *(Support both New and Old Architectures)*                                            |
@@ -56,7 +56,7 @@ We work hard to respond to new RN releases, but they do occasionally break us. W
 
 ### Supported Components
 
-When using the React Native assets system (i.e. using the `require("./foo.png")` syntax), the following list represents the set of core components (and props) that support having their referenced images and videos updated via CodePush:
+When using the React Native assets system (i.e. using the `require("./foo.png")` syntax), the following list represents the set of core components (and props) that support having their referenced images and videos updated via Source Push:
 
 | Component                                       | Prop(s)                                  |
 |-------------------------------------------------|------------------------------------------|
@@ -67,16 +67,16 @@ When using the React Native assets system (i.e. using the `require("./foo.png")`
 | `ToolbarAndroid` <br />*(React Native 0.21.0+)* | `actions[].icon`, `logo`, `overflowIcon` |
 | `Video`                                         | `source`                                 |
 
-The following list represents the set of components (and props) that don't currently support their assets being updated via CodePush, due to their dependency on static images and videos (i.e. using the `{ uri: "foo" }` syntax):
+The following list represents the set of components (and props) that don't currently support their assets being updated via Source Push, due to their dependency on static images and videos (i.e. using the `{ uri: "foo" }` syntax):
 
 | Component   | Prop(s)                                                              |
 |-------------|----------------------------------------------------------------------|
 | `SliderIOS` | `maximumTrackImage`, `minimumTrackImage`, `thumbImage`, `trackImage` |
 | `Video`     | `source`                                                             |
 
-As new core components are released, which support referencing assets, we'll update this list to ensure users know what exactly they can expect to update using CodePush.
+As new core components are released, which support referencing assets, we'll update this list to ensure users know what exactly they can expect to update using Source Push.
 
-*Note: CodePush only works with Video components when using `require` in the source prop. For example:*
+*Note: Source Push only works with Video components when using `require` in the source prop. For example:*
 
 ```javascript
 <Video source={require("./foo.mp4")} />
@@ -84,13 +84,13 @@ As new core components are released, which support referencing assets, we'll upd
 
 ## Getting Started
 
-After you've created an account on [Source Push](https://console.srcpush.com/register), you can start CodePush-ifying your React Native app by running the following command from within your app's root directory:
+After you've created an account on [Source Push](https://console.srcpush.com/register), you can start Source Push-ifying your React Native app by running the following command from within your app's root directory:
 
 ```shell
 npm install --save @srcpush/react-native-code-push
 ```
 
-As with all other React Native plugins, the integration experience is different for iOS and Android, so perform the following setup steps depending on which platform(s) you are targeting. Note, if you are targeting both platforms it is recommended to create separate CodePush applications for each platform.
+As with all other React Native plugins, the integration experience is different for iOS and Android, so perform the following setup steps depending on which platform(s) you are targeting. Note, if you are targeting both platforms it is recommended to create separate Source Push applications for each platform.
 
 *NOTE: This guide assumes you have used the `@react-native-community/cli init` command to initialize your React Native project.*
 
@@ -101,13 +101,13 @@ Then continue with installing the native module
 
 ## Plugin Usage
 
-With the CodePush plugin downloaded and linked, and your app asking CodePush where to get the right JS bundle from, the only thing left is to add the necessary code to your app to control the following policies:
+With the Source Push plugin downloaded and linked, and your app asking Source Push where to get the right JS bundle from, the only thing left is to add the necessary code to your app to control the following policies:
 
 1. When (and how often) to check for an update? (for example app start, in response to clicking a button in a settings page, periodically at some fixed interval)
 
 2. When an update is available, how to present it to the end user?
 
-The simplest way to do this is to "CodePush-ify" your app's root component. To do so, you can choose one of the following two options:
+The simplest way to do this is to "Source Push-ify" your app's root component. To do so, you can choose one of the following two options:
 
 * **Option 1: Wrap your root component with the `codePush` higher-order component:**
 

package/SECURITY.md

@@ -1,20 +1,16 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
-
 ## Security
 
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+Source Push takes the security of our software products and services seriously.
 
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+If you believe you have found a security vulnerability in this repository, please report it to us as described below.
 
 ## Reporting Security Issues
 
 **Please do not report security vulnerabilities through public GitHub issues.**
 
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+Instead, please report them to us via email at [security@srcpush.com](mailto:security@srcpush.com).
 
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
@@ -27,15 +23,3 @@ Please include the requested information listed below (as much as you can provid
 * Impact of the issue, including how an attacker might exploit the issue
 
 This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/android/app/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: "com.android.library"
 
+def safeExtGet(prop, fallback) {
+    return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 def isNewArchitectureEnabled() {
     // To opt-in for the New Architecture, you can either:
     // - Set `newArchEnabled` to true inside the `gradle.properties` file
@@ -22,37 +26,39 @@ def DEFAULT_MIN_SDK_VERSION = 16
 android {
     namespace "com.microsoft.codepush.react"
 
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+    compileSdkVersion safeExtGet("compileSdkVersion", DEFAULT_COMPILE_SDK_VERSION)
+    buildToolsVersion safeExtGet("buildToolsVersion", DEFAULT_BUILD_TOOLS_VERSION)
+
+    buildFeatures {
+        buildConfig true
+    }
 
     defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        minSdkVersion safeExtGet("minSdkVersion", DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGet("targetSdkVersion", DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
         consumerProguardFiles 'proguard-rules.pro'
     }
 
     sourceSets {
         main {
             if (IS_NEW_ARCHITECTURE_ENABLED) {
-                java.srcDirs += ['src/newarch/java']
+                java.srcDirs += ["src/newarch/java"]
+                java.srcDirs += ["$buildDir/generated/source/codegen/java"]
             } else {
-                java.srcDirs += ['src/oldarch/java']
+                java.srcDirs += ["src/oldarch/java"]
             }
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"
+    implementation("com.facebook.react:react-android")
     implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
 }

package/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -7,10 +7,12 @@ import android.content.res.Resources;
 
 import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactPackage;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 
 import org.json.JSONException;
@@ -18,9 +20,11 @@ import org.json.JSONObject;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-public class CodePush implements ReactPackage {
+public class CodePush extends BaseReactPackage {
     private static final Object LOCK = new Object();
     private static volatile CodePush mCurrentInstance;
     public static CodePush getInstance(String deploymentKey, Context context, boolean isDebugMode) {
@@ -422,14 +426,14 @@ public class CodePush implements ReactPackage {
     }
 
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
-        CodePushNativeModule codePushModule = new CodePushNativeModule(reactApplicationContext, this, mUpdateManager, mTelemetryManager, mSettingsManager);
-        CodePushDialog dialogModule = new CodePushDialog(reactApplicationContext);
-
-        List<NativeModule> nativeModules = new ArrayList<>();
-        nativeModules.add(codePushModule);
-        nativeModules.add(dialogModule);
-        return nativeModules;
+    public NativeModule getModule(String name, ReactApplicationContext reactApplicationContext) {
+        if (CodePushNativeModule.NAME.equals(name)) {
+            return new CodePushNativeModule(reactApplicationContext, this, mUpdateManager, mTelemetryManager, mSettingsManager);
+        }
+        if (CodePushDialog.NAME.equals(name)) {
+            return new CodePushDialog(reactApplicationContext);
+        }
+        return null;
     }
 
     // Deprecated in RN v0.47.
@@ -441,4 +445,42 @@ public class CodePush implements ReactPackage {
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return new ArrayList<>();
     }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return new ReactModuleInfoProvider() {
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+
+                Map<String, ReactModuleInfo> map = new HashMap<>();
+                map.put(
+                        CodePushNativeModule.NAME,
+                        new ReactModuleInfo(
+                                CodePushNativeModule.NAME,
+                                CodePushNativeModule.NAME,
+                                false,
+                                false,
+                                true,
+                                false,
+                                isTurboModule
+                        )
+                );
+                map.put(
+                        CodePushDialog.NAME,
+                        new ReactModuleInfo(
+                                CodePushDialog.NAME,
+                                CodePushDialog.NAME,
+                                false,
+                                false,
+                                false,
+                                false,
+                                isTurboModule
+                        )
+                );
+
+                return map;
+            }
+        };
+    }
 }

package/android/app/src/main/java/com/microsoft/codepush/react/{CodePushDialog.java → CodePushDialogImpl.java}

@@ -4,43 +4,43 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 
-import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
 
-public class CodePushDialog extends BaseJavaModule {
+final class CodePushDialogImpl {
+    private final ReactApplicationContext reactContext;
 
-    public CodePushDialog(ReactApplicationContext reactContext) {
-        super(reactContext);
+    CodePushDialogImpl(ReactApplicationContext reactContext) {
+        this.reactContext = reactContext;
     }
 
-    @ReactMethod
-    public void showDialog(final String title, final String message, final String button1Text,
-                           final String button2Text, final Callback successCallback, Callback errorCallback) {
-        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
+    void showDialog(
+            final String title,
+            final String message,
+            final String button1Text,
+            final String button2Text,
+            final Callback successCallback,
+            final Callback errorCallback
+    ) {
+        Activity currentActivity = reactContext.getCurrentActivity();
         if (currentActivity == null || currentActivity.isFinishing()) {
-            // If getCurrentActivity is null, it could be because the app is backgrounded,
-            // so we show the dialog when the app resumes)
-            getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
+            reactContext.addLifecycleEventListener(new LifecycleEventListener() {
                 @Override
                 public void onHostResume() {
-                    Activity currentActivity = getReactApplicationContext().getCurrentActivity();
-                    if (currentActivity != null) {
-                        getReactApplicationContext().removeLifecycleEventListener(this);
-                        showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);
+                    Activity resumedActivity = reactContext.getCurrentActivity();
+                    if (resumedActivity != null && !resumedActivity.isFinishing()) {
+                        reactContext.removeLifecycleEventListener(this);
+                        showDialogInternal(title, message, button1Text, button2Text, successCallback, resumedActivity);
                     }
                 }
 
                 @Override
                 public void onHostPause() {
-
                 }
 
                 @Override
                 public void onHostDestroy() {
-
                 }
             });
         } else {
@@ -48,10 +48,15 @@ public class CodePushDialog extends BaseJavaModule {
         }
     }
 
-    private void showDialogInternal(String title, String message, String button1Text,
-                                    String button2Text, final Callback successCallback, Activity 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);
 
         DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
@@ -61,10 +66,10 @@ public class CodePushDialog extends BaseJavaModule {
                     dialog.cancel();
                     switch (which) {
                         case DialogInterface.BUTTON_POSITIVE:
-                            successCallback.invoke(0);
+                            if (successCallback != null) successCallback.invoke(0);
                             break;
                         case DialogInterface.BUTTON_NEGATIVE:
-                            successCallback.invoke(1);
+                            if (successCallback != null) successCallback.invoke(1);
                             break;
                         default:
                             throw new CodePushUnknownException("Unknown button ID pressed.");
@@ -94,9 +99,4 @@ public class CodePushDialog extends BaseJavaModule {
         AlertDialog dialog = builder.create();
         dialog.show();
     }
-
-    @Override
-    public String getName() {
-        return "CodePushDialog";
-    }
 }