Cherry picked changes from bug-686 branch to fix inappbrowser issue apache#686 (PR apache#755)

Author: Alessandro Basso

src/android/InAppBrowser.java

@@ -271,12 +271,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);
                 }
             });
@@ -1197,7 +1191,6 @@ public class InAppBrowserClient extends WebViewClient {
         EditText edittext;
         CordovaWebView webView;
         String beforeload;
-        boolean waitForBeforeload;
 
         /**
          * Constructor.
@@ -1209,7 +1202,6 @@ public InAppBrowserClient(CordovaWebView webView, EditText mEditText, String bef
             this.webView = webView;
             this.edittext = mEditText;
             this.beforeload = beforeload;
-            this.waitForBeforeload = beforeload != null;
         }
 
         /**
@@ -1270,7 +1262,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;
                 }
@@ -1365,9 +1357,6 @@ else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^
                 }
             }
 
-            if (useBeforeload) {
-                this.waitForBeforeload = true;
-            }
             return override;
         }