Allow to disable deploy updates with DisableDeploy preference (#172)

ionic-team · Sep 13, 2018 · a1664d8 · a1664d8
1 parent 17b5de5
commit a1664d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/android/com/ionicframework/cordova/webview/IonicWebViewEngine.java b/src/android/com/ionicframework/cordova/webview/IonicWebViewEngine.java
@@ -69,7 +69,7 @@ public void init(CordovaWebView parentWebView, CordovaInterface cordova, final C
     super.init(parentWebView, cordova, client, resourceApi, pluginManager, nativeToJsMessageQueue);
     SharedPreferences prefs = cordova.getActivity().getApplicationContext().getSharedPreferences(IonicWebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);
     String path = prefs.getString(IonicWebView.CDV_SERVER_PATH, null);
-    if (!isNewBinary() && path != null && !path.isEmpty()) {
+    if (!isDeployDisabled() && !isNewBinary() && path != null && !path.isEmpty()) {
       setServerBasePath(path);
     }
   }
@@ -100,6 +100,9 @@ private boolean isNewBinary() {
     return false;
   }
 
+  private boolean isDeployDisabled() {
+    return preferences.getBoolean("DisableDeploy", false);
+  }
   private class ServerClient extends SystemWebViewClient {
     private ConfigXmlParser parser;
 

diff --git a/src/ios/CDVWKWebViewEngine.m b/src/ios/CDVWKWebViewEngine.m
@@ -151,7 +151,7 @@ - (void)initWebServer
 
     NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
     NSString * persistedPath = [userDefaults objectForKey:CDV_SERVER_PATH];
-    if (![self isNewBinary] && persistedPath && ![persistedPath isEqualToString:@""]) {
+    if (![self isDeployDisabled] && ![self isNewBinary] && persistedPath && ![persistedPath isEqualToString:@""]) {
         NSString *libPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0];
         NSString * cordovaDataDirectory = [libPath stringByAppendingPathComponent:@"NoCloud"];
         NSString * snapshots = [cordovaDataDirectory stringByAppendingPathComponent:@"ionic_built_snapshots"];
@@ -181,6 +181,10 @@ -(BOOL) isNewBinary
     return NO;
 }
 
+-(BOOL) isDeployDisabled {
+    return [[self.commandDelegate.settings objectForKey:[@"DisableDeploy" lowercaseString]] boolValue];
+}
+
 -(void)updateBindPath
 {
     NSDictionary * settings = self.commandDelegate.settings;