@srcpush/react-native-code-push 1.0.3-develop.5 → 1.0.3-feat-new-arch.1

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/CodePush.js

@@ -5,7 +5,22 @@ import { AppState, Platform } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
-let NativeCodePush = 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/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,27 +26,38 @@ 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()
+        consumerProguardFiles 'proguard-rules.pro'
     }
 
-    lintOptions {
-        abortOnError false
+    sourceSets {
+        main {
+            if (IS_NEW_ARCHITECTURE_ENABLED) {
+                java.srcDirs += ["src/newarch/java"]
+            } else {
+                java.srcDirs += ["src/oldarch/java"]
+            }
+        }
     }
 
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
+    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";
-    }
 }