[android] Move isLiveReloadEnabled

Author: Minishlink

android/app/src/main/java/com/appzung/codepush/react/CodePush.java

@@ -8,8 +8,6 @@
 import com.facebook.react.ReactPackage;
 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;
@@ -18,7 +16,6 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.lang.reflect.Method;
 
 public class CodePush implements ReactPackage {
 
@@ -93,7 +90,7 @@ public CodePush(Context context) {
             mServerUrl = serverUrlFromStrings;
         }
 
-        clearDebugCacheIfNeeded(null);
+        clearDebugCacheIfNeeded(false);
         initializeUpdateAfterRestart();
     }
 
@@ -116,31 +113,9 @@ private String getCustomPropertyFromStringsIfExist(String propertyName) {
         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;
-    }
-
-    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()) {

android/app/src/main/java/com/appzung/codepush/react/CodePushNativeModule.java

@@ -5,7 +5,6 @@
 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,16 +19,19 @@
 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;
 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 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
     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 {
@@ -179,6 +188,26 @@ public void run() {
         }
     }
 
+    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