Merge pull request #36 from leonardo-fernandes/outsystems-fix-before-load

Fix beforeLoad not being called in some requests

Author: nflsilva

src/android/InAppBrowser.java

@@ -273,12 +273,6 @@ else if (action.equals("loadAfterBeforeload")) {
                 @SuppressLint("NewApi")
                 @Override
                 public void run() {
-                    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
-                        currentClient.waitForBeforeload = false;
-                        inAppWebView.setWebViewClient(currentClient);
-                    } else {
-                        ((InAppBrowserClient)inAppWebView.getWebViewClient()).waitForBeforeload = false;
-                    }
                     inAppWebView.loadUrl(url);
                 }
             });
@@ -722,6 +716,8 @@ public String showWebPage(final String url, HashMap<String, String> features) {
             }
             if (features.get(BEFORELOAD) != null) {
                 beforeload = features.get(BEFORELOAD);
+            } else {
+                beforeload = "";
             }
             String fullscreenSet = features.get(FULLSCREEN);
             if (fullscreenSet != null) {
@@ -1173,7 +1169,6 @@ public class InAppBrowserClient extends WebViewClient {
         EditText edittext;
         CordovaWebView webView;
         String beforeload;
-        boolean waitForBeforeload;
 
         /**
          * Constructor.
@@ -1185,7 +1180,6 @@ public InAppBrowserClient(CordovaWebView webView, EditText mEditText, String bef
             this.webView = webView;
             this.edittext = mEditText;
             this.beforeload = beforeload;
-            this.waitForBeforeload = beforeload != null;
         }
 
         /**
@@ -1246,7 +1240,7 @@ public boolean shouldOverrideUrlLoading(String url, String method) {
             }
 
             // On first URL change, initiate JS callback. Only after the beforeload event, continue.
-            if (useBeforeload && this.waitForBeforeload) {
+            if (useBeforeload) {
                 if(sendBeforeLoad(url, method)) {
                     return true;
                 }
@@ -1341,9 +1335,6 @@ else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^
                 }
             }
 
-            if (useBeforeload) {
-                this.waitForBeforeload = true;
-            }
             return override;
         }
 

www/inappbrowser.js

@@ -41,7 +41,7 @@
         _eventHandler: function (event) {
             if (event && (event.type in this.channels)) {
                 if (event.type === 'beforeload') {
-                    this.channels[event.type].fire(event, this._loadAfterBeforeload);
+                    this.channels[event.type].fire(event, this._loadAfterBeforeload.bind(this));
                 } else {
                     this.channels[event.type].fire(event);
                 }