Merge pull request #450 from crmo/fix447

UIWebView call loadRequest multiple times lead to deadlock in iOS12. Fixes #447.
apache · Mar 6, 2019 · 83e5929 · 83e5929
2 parents f8b99a9 + 6d9bf0c
commit 83e5929
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewDelegate.m b/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewDelegate.m
@@ -329,9 +329,14 @@ - (void)webViewDidFinishLoad:(UIWebView*)webView
             break;
 
         case STATE_WAITING_FOR_LOAD_FINISH:
-            if (_loadCount == 1) {
+            // fix call loadRequest multiple times just callback webViewDidFinishLoad once time in iOS 12
+            if (@available(iOS 12.0, *)) {
                 fireCallback = YES;
-                _state = STATE_IDLE;
+            } else {
+                if (_loadCount == 1) {
+                    fireCallback = YES;
+                    _state = STATE_IDLE;
+                }
             }
             _loadCount -= 1;
             break;