Reinstate verification of main navigation in case of navigationType other (#1023)

terje · web-flow · commit 8d7845a72dc0 · 2020-11-25T08:39:54.000-08:00
diff --git a/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m
@@ -108,9 +108,11 @@ - (CDVIntentAndNavigationFilterValue) filterUrl:(NSURL*)url
 
 + (BOOL)shouldOpenURLRequest:(NSURLRequest*)request navigationType:(CDVWebViewNavigationType)navigationType
 {
+    BOOL isMainNavigation = [[request.mainDocumentURL absoluteString] isEqualToString:[request.URL absoluteString]];
+
     return (
         navigationType == CDVWebViewNavigationTypeLinkClicked ||
-        navigationType == CDVWebViewNavigationTypeLinkOther
+        (navigationType == CDVWebViewNavigationTypeLinkOther && isMainNavigation)
     );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,11 @@ - (CDVIntentAndNavigationFilterValue) filterUrl:(NSURL*)url`
`108`	`108`
`109`	`109`	`+ (BOOL)shouldOpenURLRequest:(NSURLRequest*)request navigationType:(CDVWebViewNavigationType)navigationType`
`110`	`110`	`{`
	`111`	`+ BOOL isMainNavigation = [[request.mainDocumentURL absoluteString] isEqualToString:[request.URL absoluteString]];`
	`112`	`+`
`111`	`113`	`return (`
`112`	`114`	`navigationType == CDVWebViewNavigationTypeLinkClicked \|\|`
`113`		`- navigationType == CDVWebViewNavigationTypeLinkOther`
	`115`	`+ (navigationType == CDVWebViewNavigationTypeLinkOther && isMainNavigation)`
`114`	`116`	`);`
`115`	`117`	`}`
`116`	`118`