Fix for #93 .

nordnet · Jan 20, 2016 · a35e9d0 · a35e9d0
1 parent 51f7d5a
commit a35e9d0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/android/src/com/nordnetab/chcp/main/HotCodePushPlugin.java b/src/android/src/com/nordnetab/chcp/main/HotCodePushPlugin.java
@@ -72,6 +72,7 @@ public class HotCodePushPlugin extends CordovaPlugin {
 
     private Handler handler;
     private boolean isPluginReadyForWork;
+    private boolean dontReloadOnStart;
 
     // region Plugin lifecycle
 
@@ -103,7 +104,7 @@ public void initialize(final CordovaInterface cordova, final CordovaWebView webV
     public void onStart() {
         super.onStart();
 
-        EventBus eventBus = EventBus.getDefault();
+        final EventBus eventBus = EventBus.getDefault();
         if (!eventBus.isRegistered(this)) {
             eventBus.register(this);
         }
@@ -112,11 +113,15 @@ public void onStart() {
         // if not - install it
         isPluginReadyForWork = isPluginReadyForWork();
         if (!isPluginReadyForWork) {
+            dontReloadOnStart = true;
             installWwwFolder();
             return;
         }
 
-        redirectToLocalStorageIndexPage();
+        // reload only if we on local storage
+        if (!dontReloadOnStart && webView.getUrl().startsWith(LOCAL_ASSETS_FOLDER)) {
+            redirectToLocalStorageIndexPage();
+        }
 
         // install update if there is anything to install
         if (chcpXmlConfig.isAutoInstallIsAllowed() &&