@appzung/react-native-code-push 9.0.2 → 10.0.0

package/android/app/.gradle/config.properties

@@ -0,0 +1,2 @@
+#Wed Jan 22 01:48:35 CET 2025
+java.home=/Users/louislagrange/Applications/Android Studio.app/Contents/jbr/Contents/Home

package/android/app/build.gradle

@@ -1,33 +1,77 @@
 apply plugin: "com.android.library"
 
-def DEFAULT_COMPILE_SDK_VERSION = 26
-def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 26
-def DEFAULT_MIN_SDK_VERSION = 16
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["CodePush_" + name]
+}
 
-android {
-    namespace "com.microsoft.codepush.react"
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["CodePush_" + name]).toInteger()
+}
 
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
 
-    defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
-    }
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+android {
+  if (supportsNamespace()) {
+    namespace "com.appzung.codepush.react"
 
-    lintOptions {
-        abortOnError false
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+    consumerProguardFiles 'proguard-rules.pro'
+  }
+
+  buildFeatures {
+    buildConfig true
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+repositories {
+  mavenCentral()
+  google()
 }
 
+def isInDevelopment = project.hasProperty('CodePush_development') && project.property('CodePush_development') == "true"
+
 dependencies {
+  if (isInDevelopment) {
+    implementation("com.facebook.react:react-android:0.71.+")
+  } else {
+    // For < 0.71, this will be from the local maven repo
+    // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
+  }
+  implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
 }

package/android/app/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Jan 22 01:48:35 CET 2025
+sdk.dir=/Users/louislagrange/Library/Android/sdk

package/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.appzung.codepush.react">
     <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>

package/android/app/src/main/AndroidManifestNew.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePush.java

@@ -1,17 +1,13 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.uimanager.ViewManager;
 
 import org.json.JSONException;
@@ -20,7 +16,6 @@ import org.json.JSONObject;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.lang.reflect.Method;
 
 public class CodePush implements ReactPackage {
 
@@ -39,34 +34,39 @@ public class CodePush implements ReactPackage {
     private SettingsManager mSettingsManager;
 
     // Config properties.
-    private String mDeploymentKey;
+    private String mReleaseChannelPublicId;
     private static String mServerUrl = "https://codepush.appzung.com/";
 
     private Context mContext;
-    private final boolean mIsDebugMode;
+    private final boolean mIsDebugMode = BuildConfig.DEBUG;
 
     private static String mPublicKey;
 
     private static ReactInstanceHolder mReactInstanceHolder;
     private static CodePush mCurrentInstance;
 
-    public CodePush(String deploymentKey, Context context) {
-        this(deploymentKey, context, false);
-    }
-
     public static String getServiceUrl() {
         return mServerUrl;
     }
 
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode) {
+    public CodePush(Context context) {
         mContext = context.getApplicationContext();
 
+        String releaseChannelPublicIdFromStrings = getCustomPropertyFromStringsIfExist("ReleaseChannelPublicId");
+        if (releaseChannelPublicIdFromStrings == null) {
+            throw new CodePushUnknownException("Missing release channel public ID in strings resource");
+        }
+
+        mReleaseChannelPublicId = releaseChannelPublicIdFromStrings;
+
         mUpdateManager = new CodePushUpdateManager(context.getFilesDir().getAbsolutePath());
         mTelemetryManager = new CodePushTelemetryManager(mContext);
-        mDeploymentKey = deploymentKey;
-        mIsDebugMode = isDebugMode;
         mSettingsManager = new SettingsManager(mContext);
 
+        if (mIsDebugMode) {
+            CodePushUtils.log("Running in DEBUG mode");
+        }
+
         if (sAppVersion == null) {
             try {
                 PackageInfo pInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
@@ -78,61 +78,28 @@ public class CodePush implements ReactPackage {
 
         mCurrentInstance = this;
 
-        String publicKeyFromStrings = getCustomPropertyFromStringsIfExist("PublicKey");
-        if (publicKeyFromStrings != null) mPublicKey = publicKeyFromStrings;
-
-        String serverUrlFromStrings = getCustomPropertyFromStringsIfExist("ServerUrl");
-        if (serverUrlFromStrings != null) mServerUrl = serverUrlFromStrings;
-
-        clearDebugCacheIfNeeded(null);
-        initializeUpdateAfterRestart();
-    }
-
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl) {
-        this(deploymentKey, context, isDebugMode);
-        mServerUrl = serverUrl;
-    }
-
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, int publicKeyResourceDescriptor) {
-        this(deploymentKey, context, isDebugMode);
-
-        mPublicKey = getPublicKeyByResourceDescriptor(publicKeyResourceDescriptor);
-    }
-
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl, Integer publicKeyResourceDescriptor) {
-        this(deploymentKey, context, isDebugMode);
-
-        if (publicKeyResourceDescriptor != null) {
-            mPublicKey = getPublicKeyByResourceDescriptor(publicKeyResourceDescriptor);
+        String publicKeyFromStrings = getCustomPropertyFromStringsIfExist("SigningPublicKey");
+        if (publicKeyFromStrings != null) {
+            CodePushUtils.log("Executing CodePush with a signing public key.");
+            mPublicKey = publicKeyFromStrings;
         }
 
-        mServerUrl = serverUrl;
-    }
-
-    private String getPublicKeyByResourceDescriptor(int publicKeyResourceDescriptor){
-        String publicKey;
-        try {
-            publicKey = mContext.getString(publicKeyResourceDescriptor);
-        } catch (Resources.NotFoundException e) {
-            throw new CodePushInvalidPublicKeyException(
-                    "Unable to get public key, related resource descriptor " +
-                            publicKeyResourceDescriptor +
-                            " can not be found", e
-            );
+        String serverUrlFromStrings = getCustomPropertyFromStringsIfExist("ServerUrl");
+        if (serverUrlFromStrings != null) {
+            CodePushUtils.log("Executing CodePush with a custom server URL.");
+            mServerUrl = serverUrlFromStrings;
         }
 
-        if (publicKey.isEmpty()) {
-            throw new CodePushInvalidPublicKeyException("Specified public key is empty");
-        }
-        return publicKey;
+        clearDebugCacheIfNeeded(false);
+        initializeUpdateAfterRestart();
     }
 
     private String getCustomPropertyFromStringsIfExist(String propertyName) {
         String property;
-      
+
         String packageName = mContext.getPackageName();
         int resId = mContext.getResources().getIdentifier("CodePush" + propertyName, "string", packageName);
-        
+
         if (resId != 0) {
             property = mContext.getString(resId);
 
@@ -140,37 +107,15 @@ public class CodePush implements ReactPackage {
                 return property;
             } else {
                 CodePushUtils.log("Specified " + propertyName + " is empty");
-            } 
-        }
-
-        return null;
-    }
-
-    private boolean isLiveReloadEnabled(ReactInstanceManager instanceManager) {
-        // Use instanceManager for checking if we use LiveReload mode. In this case we should not remove ReactNativeDevBundle.js file
-        // because we get error with trying to get this after reloading. Issue: https://github.com/microsoft/react-native-code-push/issues/1272
-        if (instanceManager != null) {
-            DevSupportManager devSupportManager = instanceManager.getDevSupportManager();
-            if (devSupportManager != null) {
-                DeveloperSettings devSettings = devSupportManager.getDevSettings();
-                Method[] methods = devSettings.getClass().getMethods();
-                for (Method m : methods) {
-                    if (m.getName().equals("isReloadOnJSChangeEnabled")) {
-                        try {
-                            return (boolean) m.invoke(devSettings);
-                        } catch (Exception x) {
-                            return false;
-                        }
-                    }
-                }
             }
         }
 
-        return false;
+        return null;
     }
 
-    public void clearDebugCacheIfNeeded(ReactInstanceManager instanceManager) {
-        if (mIsDebugMode && mSettingsManager.isPendingUpdate(null) && !isLiveReloadEnabled(instanceManager)) {
+    public void clearDebugCacheIfNeeded(boolean isLiveReloadEnabled) {
+        // Issue: https://github.com/microsoft/react-native-code-push/issues/1272
+        if (mIsDebugMode && mSettingsManager.isPendingUpdate(null) && !isLiveReloadEnabled) {
             // This needs to be kept in sync with https://github.com/facebook/react-native/blob/master/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java#L78
             File cachedDevBundle = new File(mContext.getFilesDir(), "ReactNativeDevBundle.js");
             if (cachedDevBundle.exists()) {
@@ -230,8 +175,8 @@ public class CodePush implements ReactPackage {
         return mContext;
     }
 
-    public String getDeploymentKey() {
-        return mDeploymentKey;
+    public String getReleaseChannelPublicId() {
+        return mReleaseChannelPublicId;
     }
 
     public static String getJSBundleFile() {
@@ -393,8 +338,8 @@ public class CodePush implements ReactPackage {
         return sTestConfigurationFlag;
     }
 
-    public void setDeploymentKey(String deploymentKey) {
-        mDeploymentKey = deploymentKey;
+    public void setReleaseChannelPublicId(String releaseChannelPublicId) {
+        mReleaseChannelPublicId = releaseChannelPublicId;
     }
 
     public static void setUsingTestConfiguration(boolean shouldUseTestConfiguration) {
@@ -421,19 +366,12 @@ 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;
     }
 
-    // Deprecated in RN v0.47.
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return new ArrayList<>();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return new ArrayList<>();

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushConstants.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 public class CodePushConstants {
     public static final String ASSETS_BUNDLE_PREFIX = "assets://";

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushInstallMode.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 public enum CodePushInstallMode {
     IMMEDIATE(0),
@@ -13,4 +13,4 @@ public enum CodePushInstallMode {
     public int getValue() {
         return this.value;
     }
-}
+}

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushInvalidPublicKeyException.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 class CodePushInvalidPublicKeyException extends RuntimeException {
 
@@ -9,4 +9,4 @@ class CodePushInvalidPublicKeyException extends RuntimeException {
     public CodePushInvalidPublicKeyException(String message) {
         super(message);
     }
-}
+}

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushInvalidUpdateException.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 public class CodePushInvalidUpdateException extends RuntimeException {
     public CodePushInvalidUpdateException(String message) {

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushMalformedDataException.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 import java.net.MalformedURLException;
 
@@ -9,4 +9,4 @@ public class CodePushMalformedDataException extends RuntimeException {
     public CodePushMalformedDataException(String url, MalformedURLException cause) {
         super("The package has an invalid downloadUrl: " + url, cause);
     }
-}
+}

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushNativeModule.java

@@ -1,11 +1,10 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import android.view.View;
 
 import com.facebook.react.ReactApplication;
@@ -20,9 +19,11 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.modules.core.ChoreographerCompat;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -30,6 +31,7 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -132,10 +134,17 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     private void loadBundle() {
         clearLifecycleEventListener();
         try {
-            mCodePush.clearDebugCacheIfNeeded(resolveInstanceManager());
+            DevSupportManager devSupportManager = null;
+            ReactInstanceManager reactInstanceManager = resolveInstanceManager();
+            if (reactInstanceManager != null) {
+                devSupportManager = reactInstanceManager.getDevSupportManager();
+            }
+            boolean isLiveReloadEnabled = isLiveReloadEnabled(devSupportManager);
+
+            mCodePush.clearDebugCacheIfNeeded(isLiveReloadEnabled);
         } catch(Exception e) {
             // If we got error in out reflection we should clear debug cache anyway.
-            mCodePush.clearDebugCacheIfNeeded(null);
+            mCodePush.clearDebugCacheIfNeeded(false);
         }
 
         try {
@@ -156,7 +165,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
                 @Override
                 public void run() {
                     try {
-                        // We don't need to resetReactRootViews anymore 
+                        // We don't need to resetReactRootViews anymore
                         // due the issue https://github.com/facebook/react-native/issues/14533
                         // has been fixed in RN 0.46.0
                         //resetReactRootViews(instanceManager);
@@ -179,6 +188,26 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
+    private boolean isLiveReloadEnabled(DevSupportManager devSupportManager) {
+        if (devSupportManager == null) {
+            return false;
+        }
+
+        DeveloperSettings devSettings = devSupportManager.getDevSettings();
+        Method[] methods = devSettings.getClass().getMethods();
+        for (Method m : methods) {
+            if (m.getName().equals("isReloadOnJSChangeEnabled")) {
+                try {
+                    return (boolean) m.invoke(devSettings);
+                } catch (Exception x) {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
     // This workaround has been implemented in order to fix https://github.com/facebook/react-native/issues/14533
     // resetReactRootViews allows to call recreateReactContextInBackground without any exceptions
     // This fix also relates to https://github.com/microsoft/react-native-code-push/issues/878
@@ -365,7 +394,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
             WritableMap configMap =  Arguments.createMap();
             configMap.putString("appVersion", mCodePush.getAppVersion());
             configMap.putString("clientUniqueId", mClientUniqueId);
-            configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
+            configMap.putString("releaseChannelPublicId", mCodePush.getReleaseChannelPublicId());
             configMap.putString("serverUrl", mCodePush.getServerUrl());
 
             // The binary hash may be null in debug builds
@@ -492,7 +521,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
                             return null;
                         }
                     }
-                    
+
                     promise.resolve("");
                 } catch(CodePushUnknownException e) {
                     CodePushUtils.log(e);
@@ -691,7 +720,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
 
     /**
      * This method clears CodePush's downloaded updates.
-     * It is needed to switch to a different deployment if the current deployment is more recent.
+     * It is needed to switch to a different release channel if the current release channel is more recent.
      * Note: we don’t recommend to use this method in scenarios other than that (CodePush will call
      * this method automatically when needed in other cases) as it could lead to unpredictable
      * behavior.

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushNotInitializedException.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 public final class CodePushNotInitializedException extends RuntimeException {
 
@@ -9,4 +9,4 @@ public final class CodePushNotInitializedException extends RuntimeException {
     public CodePushNotInitializedException(String message) {
         super(message);
     }
-}
+}

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushTelemetryManager.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -14,12 +14,12 @@ public class CodePushTelemetryManager {
     private SharedPreferences mSettings;
     private final String APP_VERSION_KEY = "appVersion";
     private final String DEPLOYMENT_FAILED_STATUS = "DeploymentFailed";
-    private final String DEPLOYMENT_KEY_KEY = "deploymentKey";
+    private final String RELEASE_CHANNEL_PUBLIC_ID_KEY = "releaseChannelPublicId";
     private final String DEPLOYMENT_SUCCEEDED_STATUS = "DeploymentSucceeded";
     private final String LABEL_KEY = "label";
     private final String LAST_DEPLOYMENT_REPORT_KEY = "CODE_PUSH_LAST_DEPLOYMENT_REPORT";
     private final String PACKAGE_KEY = "package";
-    private final String PREVIOUS_DEPLOYMENT_KEY_KEY = "previousDeploymentKey";
+    private final String PREVIOUS_RELEASE_CHANNEL_PUBLIC_ID_KEY = "previousReleaseChannelPublicId";
     private final String PREVIOUS_LABEL_OR_APP_VERSION_KEY = "previousLabelOrAppVersion";
     private final String RETRY_DEPLOYMENT_REPORT_KEY = "CODE_PUSH_RETRY_DEPLOYMENT_REPORT";
     private final String STATUS_KEY = "status";
@@ -39,10 +39,10 @@ public class CodePushTelemetryManager {
             this.clearRetryStatusReport();
             reportMap = Arguments.createMap();
             if (this.isStatusReportIdentifierCodePushLabel(previousStatusReportIdentifier)) {
-                String previousDeploymentKey = this.getDeploymentKeyFromStatusReportIdentifier(previousStatusReportIdentifier);
+                String previousReleaseChannelPublicId = this.getReleaseChannelPublicIdFromStatusReportIdentifier(previousStatusReportIdentifier);
                 String previousLabel = this.getVersionLabelFromStatusReportIdentifier(previousStatusReportIdentifier);
                 reportMap.putString(APP_VERSION_KEY, appVersion);
-                reportMap.putString(PREVIOUS_DEPLOYMENT_KEY_KEY, previousDeploymentKey);
+                reportMap.putString(PREVIOUS_RELEASE_CHANNEL_PUBLIC_ID_KEY, previousReleaseChannelPublicId);
                 reportMap.putString(PREVIOUS_LABEL_OR_APP_VERSION_KEY, previousLabel);
             } else {
                 // Previous status report was with a binary app version.
@@ -90,11 +90,11 @@ public class CodePushTelemetryManager {
                 this.clearRetryStatusReport();
                 reportMap = Arguments.createMap();
                 if (this.isStatusReportIdentifierCodePushLabel(previousStatusReportIdentifier)) {
-                    String previousDeploymentKey = this.getDeploymentKeyFromStatusReportIdentifier(previousStatusReportIdentifier);
+                    String previousReleaseChannelPublicId = this.getReleaseChannelPublicIdFromStatusReportIdentifier(previousStatusReportIdentifier);
                     String previousLabel = this.getVersionLabelFromStatusReportIdentifier(previousStatusReportIdentifier);
                     reportMap.putMap(PACKAGE_KEY, currentPackage);
                     reportMap.putString(STATUS_KEY, DEPLOYMENT_SUCCEEDED_STATUS);
-                    reportMap.putString(PREVIOUS_DEPLOYMENT_KEY_KEY, previousDeploymentKey);
+                    reportMap.putString(PREVIOUS_RELEASE_CHANNEL_PUBLIC_ID_KEY, previousReleaseChannelPublicId);
                     reportMap.putString(PREVIOUS_LABEL_OR_APP_VERSION_KEY, previousLabel);
                 } else {
                     // Previous status report was with a binary app version.
@@ -113,7 +113,7 @@ public class CodePushTelemetryManager {
         if (statusReport.hasKey(STATUS_KEY) && DEPLOYMENT_FAILED_STATUS.equals(statusReport.getString(STATUS_KEY))) {
             return;
         }
-        
+
         if (statusReport.hasKey(APP_VERSION_KEY)) {
             saveStatusReportedForIdentifier(statusReport.getString(APP_VERSION_KEY));
         } else if (statusReport.hasKey(PACKAGE_KEY)) {
@@ -131,7 +131,7 @@ public class CodePushTelemetryManager {
         mSettings.edit().remove(RETRY_DEPLOYMENT_REPORT_KEY).commit();
     }
 
-    private String getDeploymentKeyFromStatusReportIdentifier(String statusReportIdentifier) {
+    private String getReleaseChannelPublicIdFromStatusReportIdentifier(String statusReportIdentifier) {
         String[] parsedIdentifier = statusReportIdentifier.split(":");
         if (parsedIdentifier.length > 0) {
             return parsedIdentifier[0];
@@ -141,12 +141,12 @@ public class CodePushTelemetryManager {
     }
 
     private String getPackageStatusReportIdentifier(ReadableMap updatePackage) {
-        // Because deploymentKeys can be dynamically switched, we use a
-        // combination of the deploymentKey and label as the packageIdentifier.
-        String deploymentKey = CodePushUtils.tryGetString(updatePackage, DEPLOYMENT_KEY_KEY);
+        // Because release channels can be dynamically switched, we use a
+        // combination of the releaseChannelPublicId and label as the packageIdentifier.
+        String releaseChannelPublicId = CodePushUtils.tryGetString(updatePackage, RELEASE_CHANNEL_PUBLIC_ID_KEY);
         String label = CodePushUtils.tryGetString(updatePackage, LABEL_KEY);
-        if (deploymentKey != null && label != null) {
-            return deploymentKey + ":" + label;
+        if (releaseChannelPublicId != null && label != null) {
+            return releaseChannelPublicId + ":" + label;
         } else {
             return null;
         }

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushUnknownException.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 class CodePushUnknownException extends RuntimeException {
 
@@ -9,4 +9,4 @@ class CodePushUnknownException extends RuntimeException {
     public CodePushUnknownException(String message) {
         super(message);
     }
-}
+}

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushUpdateManager.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 import android.os.Build;
 
@@ -278,8 +278,8 @@ public class CodePushUpdateManager {
                         throw new CodePushInvalidUpdateException(
                                 "Error! Public key was provided but there is no JWT signature within app bundle to verify. " +
                                 "Possible reasons, why that might happen: \n" +
-                                "1. You've been released CodePush bundle update using version of CodePush CLI that is not support code signing.\n" +
-                                "2. You've been released CodePush bundle update without providing --privateKeyPath option."
+                                "1. You released a CodePush bundle update using version of CodePush CLI that does not support code signing.\n" +
+                                "2. You released a CodePush bundle update without providing --privateKeyPath option."
                         );
                     }
                 } else {

package/android/app/src/main/java/com/{microsoft → appzung}/codepush/react/CodePushUpdateState.java

@@ -1,4 +1,4 @@
-package com.microsoft.codepush.react;
+package com.appzung.codepush.react;
 
 public enum CodePushUpdateState {
     RUNNING(0),
@@ -12,4 +12,4 @@ public enum CodePushUpdateState {
     public int getValue() {
         return this.value;
     }
-}
+}