chore: applied feedback suggestions

apache · May 27, 2020 · 653cbf9 · 653cbf9
1 parent c682728
commit 653cbf9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/...vaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m b/...vaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m
@@ -45,10 +45,16 @@ - (void)parser:(NSXMLParser*)parser didStartElement:(NSString*)elementName names
 
 - (void)parserDidStartDocument:(NSXMLParser*)parser
 {
-    NSString* scheme = [NSString stringWithFormat:@"%@://",((CDVViewController*)self.viewController).appScheme];
     // file: url <allow-navigations> are added by default
     // navigation to the scheme used by the app is also allowed
-    self.allowNavigations = [[NSMutableArray alloc] initWithArray:@[ @"file://", scheme ]];
+    self.allowNavigations = [[NSMutableArray alloc] initWithArray:@[ @"file://"]];
+
+    // If the custom app scheme is defined, append it to the allow navigation as default
+    NSString* scheme = ((CDVViewController*)self.viewController).appScheme;
+    if (scheme) {
+        [self.allowNavigations addObject: [NSString stringWithFormat:@"%@://", scheme]];
+    }
+
     // no intents are added by default
     self.allowIntents = [[NSMutableArray alloc] init];
 }

diff --git a/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m b/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m
@@ -160,21 +160,24 @@ - (void)pluginInitialize
         if(hostname == nil){
             hostname = @"localhost";
         }
-    }
 
-    self.CDV_ASSETS_URL = [NSString stringWithFormat:@"%@://%@", scheme, hostname];
+        self.CDV_ASSETS_URL = [NSString stringWithFormat:@"%@://%@", scheme, hostname];
+    }
 
     self.uiDelegate = [[CDVWebViewUIDelegate alloc] initWithTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]];
 
     CDVWebViewWeakScriptMessageHandler *weakScriptMessageHandler = [[CDVWebViewWeakScriptMessageHandler alloc] initWithScriptMessageHandler:self];
 
     WKUserContentController* userContentController = [[WKUserContentController alloc] init];
     [userContentController addScriptMessageHandler:weakScriptMessageHandler name:CDV_BRIDGE_NAME];
-    NSString * scriptCode = [NSString stringWithFormat:@"window.CDV_ASSETS_URL = '%@';", self.CDV_ASSETS_URL];
-    WKUserScript *wkScript =
-    [[WKUserScript alloc] initWithSource:scriptCode injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
-    if (wkScript) {
-        [userContentController addUserScript:wkScript];
+
+    if(self.CDV_ASSETS_URL) {
+        NSString *scriptCode = [NSString stringWithFormat:@"window.CDV_ASSETS_URL = '%@';", self.CDV_ASSETS_URL];
+        WKUserScript *wkScript = [[WKUserScript alloc] initWithSource:scriptCode injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
+
+        if (wkScript) {
+            [userContentController addUserScript:wkScript];
+        }
     }
 
     WKWebViewConfiguration* configuration = [self createConfigurationFromSettings:settings];

diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
@@ -1771,7 +1771,7 @@ var WkWebKit = {
         exec(null, null, 'CDVWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]);
     },
     convertFilePath: function (path) {
-        if (!path) {
+        if (!path || !window.CDV_ASSETS_URL) {
             return path;
         }
         if (path.startsWith('/')) {

diff --git a/cordova-js-src/plugin/ios/wkwebkit.js b/cordova-js-src/plugin/ios/wkwebkit.js
@@ -26,7 +26,7 @@ var WkWebKit = {
         exec(null, null, 'CDVWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]);
     },
     convertFilePath: function (path) {
-        if (!path) {
+        if (!path || !window.CDV_ASSETS_URL) {
             return path;
         }
         if (path.startsWith('/')) {