Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: agrieve@apache.org
To: commits@cordova.apache.org
Date: Wed, 25 Feb 2015 14:36:07 -0000
Message-Id: <1ba12620ce6d46dfbc8f412989a368b2@git.apache.org>
In-Reply-To: <3b2c16ceeb514642b0c54b78fe047cf1@git.apache.org>
References: <3b2c16ceeb514642b0c54b78fe047cf1@git.apache.org>
Subject: [2/2] android commit: CB-8510 Create a new abstraction for sharing
 common logic of WebView engines

CB-8510 Create a new abstraction for sharing common logic of WebView engines

Having CordovaWebViewImpl separate from CordovaWebViewEngine is helpful because
now each webview doesn't have to re-implement non-webview-specific
featrues. e.g.:
1. load timeout
2. keyboard events
3. showCustomView
4. lifecycle events

Moved AndroidWebView into its own package to ensure that it doesn't use
any package-private symbols (since plugins cannot use them).


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/087ec11e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/087ec11e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/087ec11e

Branch: refs/heads/master
Commit: 087ec11e6abc61acde4e2860f8ee363f3daba578
Parents: 00c0a84
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Feb 5 20:46:42 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Feb 19 12:21:30 2015 -0500

----------------------------------------------------------------------
 .../org/apache/cordova/AndroidChromeClient.java | 268 -------
 .../apache/cordova/AndroidCookieManager.java    |  60 --
 .../org/apache/cordova/AndroidExposedJsApi.java |  50 --
 .../src/org/apache/cordova/AndroidWebView.java  | 791 -------------------
 .../apache/cordova/AndroidWebViewClient.java    | 422 ----------
 .../src/org/apache/cordova/CordovaActivity.java |  25 +-
 .../org/apache/cordova/CordovaUriHelper.java    |  84 --
 .../src/org/apache/cordova/CordovaWebView.java  |  30 +-
 .../apache/cordova/CordovaWebViewEngine.java    |  82 ++
 .../org/apache/cordova/CordovaWebViewImpl.java  | 645 +++++++++++++++
 .../apache/cordova/NativeToJsMessageQueue.java  |   8 +-
 .../src/org/apache/cordova/PluginManager.java   |   4 +-
 .../cordova/engine/SystemCookieManager.java     |  63 ++
 .../cordova/engine/SystemExposedJsApi.java      |  53 ++
 .../cordova/engine/SystemWebChromeClient.java   | 272 +++++++
 .../apache/cordova/engine/SystemWebView.java    |  88 +++
 .../cordova/engine/SystemWebViewClient.java     | 374 +++++++++
 .../cordova/engine/SystemWebViewEngine.java     | 312 ++++++++
 .../cordova/test/CordovaActivityTest.java       |   6 +-
 .../apache/cordova/test/InflateLayoutTest.java  |   4 +-
 test/res/layout/main.xml                        |   2 +-
 .../test/CordovaWebViewTestActivity.java        |  13 +-
 .../org/apache/cordova/test/userwebview.java    |  25 +-
 23 files changed, 1957 insertions(+), 1724 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/AndroidChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidChromeClient.java b/framework/src/org/apache/cordova/AndroidChromeClient.java
deleted file mode 100755
index 2852a20..0000000
--- a/framework/src/org/apache/cordova/AndroidChromeClient.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.webkit.ConsoleMessage;
-import android.webkit.GeolocationPermissions.Callback;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebStorage;
-import android.webkit.WebView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-
-/**
- * This class is the WebChromeClient that implements callbacks for our web view.
- * The kind of callbacks that happen here are on the chrome outside the document,
- * such as onCreateWindow(), onConsoleMessage(), onProgressChanged(), etc. Related
- * to but different than CordovaWebViewClient.
- */
-public class AndroidChromeClient extends WebChromeClient {
-
-    public static final int FILECHOOSER_RESULTCODE = 5173;
-    private static final String LOG_TAG = "AndroidChromeClient";
-    private long MAX_QUOTA = 100 * 1024 * 1024;
-    protected final CordovaInterface cordova;
-    protected final AndroidWebView appView;
-
-    // the video progress view
-    private View mVideoProgressView;
-    
-    private CordovaDialogsHelper dialogsHelper;
-
-    public AndroidChromeClient(CordovaInterface ctx, AndroidWebView webView) {
-        this.cordova = ctx;
-        this.appView = webView;
-        dialogsHelper = new CordovaDialogsHelper(webView.getContext());
-    }
-
-    /**
-     * Tell the client to display a javascript alert dialog.
-     */
-    @Override
-    public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
-        dialogsHelper.showAlert(message, new CordovaDialogsHelper.Result() {
-            @Override public void gotResult(boolean success, String value) {
-                if (success) {
-                    result.confirm();
-                } else {
-                    result.cancel();
-                }
-            }
-        });
-        return true;
-    }
-
-    /**
-     * Tell the client to display a confirm dialog to the user.
-     */
-    @Override
-    public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
-        dialogsHelper.showConfirm(message, new CordovaDialogsHelper.Result() {
-            @Override
-            public void gotResult(boolean success, String value) {
-                if (success) {
-                    result.confirm();
-                } else {
-                    result.cancel();
-                }
-            }
-        });
-        return true;
-    }
-
-    /**
-     * Tell the client to display a prompt dialog to the user.
-     * If the client returns true, WebView will assume that the client will
-     * handle the prompt dialog and call the appropriate JsPromptResult method.
-     *
-     * Since we are hacking prompts for our own purposes, we should not be using them for
-     * this purpose, perhaps we should hack console.log to do this instead!
-     */
-    @Override
-    public boolean onJsPrompt(WebView view, String origin, String message, String defaultValue, final JsPromptResult result) {
-        // Unlike the @JavascriptInterface bridge, this method is always called on the UI thread.
-        String handledRet = appView.bridge.promptOnJsPrompt(origin, message, defaultValue);
-        if (handledRet != null) {
-            result.confirm(handledRet);
-        } else {
-            dialogsHelper.showPrompt(message, defaultValue, new CordovaDialogsHelper.Result() {
-                @Override
-                public void gotResult(boolean success, String value) {
-                    if (success) {
-                        result.confirm(value);
-                    } else {
-                        result.cancel();
-                    }
-                }
-            });
-        }
-        return true;
-    }
-
-    /**
-     * Handle database quota exceeded notification.
-     */
-    @Override
-    public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
-            long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater)
-    {
-        LOG.d(LOG_TAG, "onExceededDatabaseQuota estimatedSize: %d  currentQuota: %d  totalUsedQuota: %d", estimatedSize, currentQuota, totalUsedQuota);
-        quotaUpdater.updateQuota(MAX_QUOTA);
-    }
-
-    // console.log in api level 7: http://developer.android.com/guide/developing/debug-tasks.html
-    // Expect this to not compile in a future Android release!
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onConsoleMessage(String message, int lineNumber, String sourceID)
-    {
-        //This is only for Android 2.1
-        if(android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.ECLAIR_MR1)
-        {
-            LOG.d(LOG_TAG, "%s: Line %d : %s", sourceID, lineNumber, message);
-            super.onConsoleMessage(message, lineNumber, sourceID);
-        }
-    }
-
-    @TargetApi(8)
-    @Override
-    public boolean onConsoleMessage(ConsoleMessage consoleMessage)
-    {
-        if (consoleMessage.message() != null)
-            LOG.d(LOG_TAG, "%s: Line %d : %s" , consoleMessage.sourceId() , consoleMessage.lineNumber(), consoleMessage.message());
-         return super.onConsoleMessage(consoleMessage);
-    }
-
-    @Override
-    /**
-     * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin.
-     *
-     * @param origin
-     * @param callback
-     */
-    public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
-        super.onGeolocationPermissionsShowPrompt(origin, callback);
-        callback.invoke(origin, true, false);
-    }
-    
-    // API level 7 is required for this, see if we could lower this using something else
-    @Override
-    public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) {
-        this.appView.showCustomView(view, callback);
-    }
-
-    @Override
-    public void onHideCustomView() {
-        this.appView.hideCustomView();
-    }
-    
-    @Override
-    /**
-     * Ask the host application for a custom progress view to show while
-     * a <video> is loading.
-     * @return View The progress view.
-     */
-    public View getVideoLoadingProgressView() {
-
-        if (mVideoProgressView == null) {            
-            // Create a new Loading view programmatically.
-            
-            // create the linear layout
-            LinearLayout layout = new LinearLayout(this.appView.getContext());
-            layout.setOrientation(LinearLayout.VERTICAL);
-            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-            layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
-            layout.setLayoutParams(layoutParams);
-            // the proress bar
-            ProgressBar bar = new ProgressBar(this.appView.getContext());
-            LinearLayout.LayoutParams barLayoutParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-            barLayoutParams.gravity = Gravity.CENTER;
-            bar.setLayoutParams(barLayoutParams);   
-            layout.addView(bar);
-            
-            mVideoProgressView = layout;
-        }
-    return mVideoProgressView; 
-    }
-
-    // <input type=file> support:
-    // openFileChooser() is for pre KitKat and in KitKat mr1 (it's known broken in KitKat).
-    // For Lollipop, we use onShowFileChooser().
-    public void openFileChooser(ValueCallback<Uri> uploadMsg) {
-        this.openFileChooser(uploadMsg, "*/*");
-    }
-    
-    public void openFileChooser( ValueCallback<Uri> uploadMsg, String acceptType ) {
-        this.openFileChooser(uploadMsg, acceptType, null);
-    }
-    
-    public void openFileChooser(final ValueCallback<Uri> uploadMsg, String acceptType, String capture)
-    {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-        intent.setType("*/*");
-        cordova.startActivityForResult(new CordovaPlugin() {
-            @Override
-            public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-                Uri result = intent == null || resultCode != Activity.RESULT_OK ? null : intent.getData();
-                Log.d(LOG_TAG, "Receive file chooser URL: " + result);
-                uploadMsg.onReceiveValue(result);
-            }
-        }, intent, FILECHOOSER_RESULTCODE);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    @Override
-    public boolean onShowFileChooser(WebView webView, final ValueCallback<Uri[]> filePathsCallback, final WebChromeClient.FileChooserParams fileChooserParams) {
-        Intent intent = fileChooserParams.createIntent();
-        try {
-            cordova.startActivityForResult(new CordovaPlugin() {
-                @Override
-                public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-                    Uri[] result = WebChromeClient.FileChooserParams.parseResult(resultCode, intent);
-                    Log.d(LOG_TAG, "Receive file chooser URL: " + result);
-                    filePathsCallback.onReceiveValue(result);
-                }
-            }, intent, FILECHOOSER_RESULTCODE);
-        } catch (ActivityNotFoundException e) {
-            Log.w("No activity found to handle file chooser intent.", e);
-            filePathsCallback.onReceiveValue(null);
-        }
-        return true;
-    }
-
-    public void destroyLastDialog(){
-        dialogsHelper.destroyLastDialog();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/AndroidCookieManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidCookieManager.java b/framework/src/org/apache/cordova/AndroidCookieManager.java
deleted file mode 100644
index 16eaa7a..0000000
--- a/framework/src/org/apache/cordova/AndroidCookieManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova;
-
-import android.os.Build;
-import android.webkit.CookieManager;
-import android.webkit.WebView;
-
-class AndroidCookieManager implements ICordovaCookieManager {
-    protected final WebView webView;
-    private final CookieManager cookieManager;
-
-    public AndroidCookieManager(WebView webview) {
-        webView = webview;
-        cookieManager = CookieManager.getInstance();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.setAcceptThirdPartyCookies(webView, true);
-        }
-    }
-
-    public void setCookiesEnabled(boolean accept) {
-        cookieManager.setAcceptCookie(accept);
-    }
-
-    public void setCookie(final String url, final String value) {
-        cookieManager.setCookie(url, value);
-    }
-
-    public String getCookie(final String url) {
-        return cookieManager.getCookie(url);
-    }
-
-    public void clearCookies() {
-        cookieManager.removeAllCookie();
-    }
-
-    public void flush() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.flush();
-        }
-    }
-};

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/AndroidExposedJsApi.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidExposedJsApi.java b/framework/src/org/apache/cordova/AndroidExposedJsApi.java
deleted file mode 100755
index 5ed4d40..0000000
--- a/framework/src/org/apache/cordova/AndroidExposedJsApi.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova;
-
-import android.webkit.JavascriptInterface;
-import org.json.JSONException;
-
-/**
- * Contains APIs that the JS can call. All functions in here should also have
- * an equivalent entry in CordovaChromeClient.java, and be added to
- * cordova-js/lib/android/plugin/android/promptbasednativeapi.js
- */
-class AndroidExposedJsApi implements ExposedJsApi {
-    private final CordovaBridge bridge;
-
-    AndroidExposedJsApi(CordovaBridge bridge) {
-        this.bridge = bridge;
-    }
-
-    @JavascriptInterface
-    public String exec(int bridgeSecret, String service, String action, String callbackId, String arguments) throws JSONException, IllegalAccessException {
-        return bridge.jsExec(bridgeSecret, service, action, callbackId, arguments);
-    }
-
-    @JavascriptInterface
-    public void setNativeToJsBridgeMode(int bridgeSecret, int value) throws IllegalAccessException {
-        bridge.jsSetNativeToJsBridgeMode(bridgeSecret, value);
-    }
-
-    @JavascriptInterface
-    public String retrieveJsMessages(int bridgeSecret, boolean fromOnlineEvent) throws IllegalAccessException {
-        return bridge.jsRetrieveJsMessages(bridgeSecret, fromOnlineEvent);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/AndroidWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java
deleted file mode 100755
index 60296a9..0000000
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.webkit.WebBackForwardList;
-import android.webkit.WebHistoryItem;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebSettings.LayoutAlgorithm;
-import android.webkit.WebViewClient;
-import android.widget.FrameLayout;
-
-
-/*
- * This class is our web view.
- *
- * @see <a href="http://developer.android.com/guide/webapps/webview.html">WebView guide</a>
- * @see <a href="http://developer.android.com/reference/android/webkit/WebView.html">WebView</a>
- */
-public class AndroidWebView extends WebView implements CordovaWebView {
-
-    public static final String TAG = "AndroidWebView";
-
-    private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();
-
-    PluginManager pluginManager;
-    AndroidCookieManager cookieManager;
-
-    private BroadcastReceiver receiver;
-
-
-    /** Activities and other important classes **/
-    private CordovaInterface cordova;
-    AndroidWebViewClient viewClient;
-    private AndroidChromeClient chromeClient;
-
-    // Flag to track that a loadUrl timeout occurred
-    int loadUrlTimeout = 0;
-
-    private long lastMenuEventTime = 0;
-
-    private NativeToJsMessageQueue nativeToJsMessageQueue;
-    CordovaBridge bridge;
-
-    /** custom view created by the browser (a video player for example) */
-    private View mCustomView;
-    private WebChromeClient.CustomViewCallback mCustomViewCallback;
-
-    private CordovaResourceApi resourceApi;
-    private CordovaPreferences preferences;
-    private CoreAndroid appPlugin;
-    private CordovaUriHelper helper;
-    // The URL passed to loadUrl(), not necessarily the URL of the current page.
-    String loadedUrl;
-    
-    static final FrameLayout.LayoutParams COVER_SCREEN_GRAVITY_CENTER =
-            new FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            Gravity.CENTER);
-    
-    /** Used when created via reflection. */
-    public AndroidWebView(Context context) {
-        this(context, null);
-    }
-
-    /** Required to allow view to be used within XML layouts. */
-    public AndroidWebView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    // Use two-phase init so that the control will work with XML layouts.
-    @Override
-    public void init(final CordovaInterface cordova, List<PluginEntry> pluginEntries,
-            CordovaPreferences preferences) {
-        if (this.cordova != null) {
-            throw new IllegalStateException();
-        }
-        this.cordova = cordova;
-        this.preferences = preferences;
-        this.helper = new CordovaUriHelper(cordova, this);
-
-        pluginManager = new PluginManager(this, this.cordova, pluginEntries);
-        cookieManager = new AndroidCookieManager(this);
-        resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
-        nativeToJsMessageQueue = new NativeToJsMessageQueue();
-        nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode());
-        nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.LoadUrlBridgeMode(this, cordova));
-        nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode.OnlineEventsBridgeModeDelegate() {
-            @Override
-            public void setNetworkAvailable(boolean value) {
-                AndroidWebView.this.setNetworkAvailable(value);
-            }
-
-            @Override
-            public void runOnUiThread(Runnable r) {
-                cordova.getActivity().runOnUiThread(r);
-            }
-        }));
-        bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
-        initWebViewSettings();
-        pluginManager.addService(CoreAndroid.PLUGIN_NAME, CoreAndroid.class.getCanonicalName());
-        pluginManager.init();
-        
-        if (this.viewClient == null) {
-            setWebViewClient(new AndroidWebViewClient(cordova, this));
-        }
-
-        if (this.chromeClient == null) {
-            setWebChromeClient(new AndroidChromeClient(cordova, this));
-        }
-
-        exposeJsInterface();
-
-        if (preferences.getBoolean("DisallowOverscroll", false)) {
-            setOverScrollMode(View.OVER_SCROLL_NEVER);
-        }
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    @SuppressWarnings("deprecation")
-    private void initWebViewSettings() {
-        this.setInitialScale(0);
-        this.setVerticalScrollBarEnabled(false);
-        final WebSettings settings = this.getSettings();
-        settings.setJavaScriptEnabled(true);
-        settings.setJavaScriptCanOpenWindowsAutomatically(true);
-        settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
-        
-        // Set the nav dump for HTC 2.x devices (disabling for ICS, deprecated entirely for Jellybean 4.2)
-        try {
-            Method gingerbread_getMethod =  WebSettings.class.getMethod("setNavDump", new Class[] { boolean.class });
-            
-            String manufacturer = android.os.Build.MANUFACTURER;
-            Log.d(TAG, "CordovaWebView is running on device made by: " + manufacturer);
-            if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB &&
-                    android.os.Build.MANUFACTURER.contains("HTC"))
-            {
-                gingerbread_getMethod.invoke(settings, true);
-            }
-        } catch (NoSuchMethodException e) {
-            Log.d(TAG, "We are on a modern version of Android, we will deprecate HTC 2.3 devices in 2.8");
-        } catch (IllegalArgumentException e) {
-            Log.d(TAG, "Doing the NavDump failed with bad arguments");
-        } catch (IllegalAccessException e) {
-            Log.d(TAG, "This should never happen: IllegalAccessException means this isn't Android anymore");
-        } catch (InvocationTargetException e) {
-            Log.d(TAG, "This should never happen: InvocationTargetException means this isn't Android anymore.");
-        }
-
-        //We don't save any form data in the application
-        settings.setSaveFormData(false);
-        settings.setSavePassword(false);
-        
-        // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
-        // while we do this
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
-            Level16Apis.enableUniversalAccess(settings);
-        }
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            Level17Apis.setMediaPlaybackRequiresUserGesture(settings, false);
-        }
-        // Enable database
-        // We keep this disabled because we use or shim to get around DOM_EXCEPTION_ERROR_16
-        String databasePath = getContext().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
-        settings.setDatabaseEnabled(true);
-        settings.setDatabasePath(databasePath);
-        
-        
-        //Determine whether we're in debug or release mode, and turn on Debugging!
-        ApplicationInfo appInfo = getContext().getApplicationContext().getApplicationInfo();
-        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0 &&
-            android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-            enableRemoteDebugging();
-        }
-        
-        settings.setGeolocationDatabasePath(databasePath);
-
-        // Enable DOM storage
-        settings.setDomStorageEnabled(true);
-
-        // Enable built-in geolocation
-        settings.setGeolocationEnabled(true);
-        
-        // Enable AppCache
-        // Fix for CB-2282
-        settings.setAppCacheMaxSize(5 * 1048576);
-        settings.setAppCachePath(databasePath);
-        settings.setAppCacheEnabled(true);
-        
-        // Fix for CB-1405
-        // Google issue 4641
-        settings.getUserAgentString();
-        
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
-        if (this.receiver == null) {
-            this.receiver = new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, Intent intent) {
-                    settings.getUserAgentString();
-                }
-            };
-            getContext().registerReceiver(this.receiver, intentFilter);
-        }
-        // end CB-1405
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    private void enableRemoteDebugging() {
-        try {
-            WebView.setWebContentsDebuggingEnabled(true);
-        } catch (IllegalArgumentException e) {
-            Log.d(TAG, "You have one job! To turn on Remote Web Debugging! YOU HAVE FAILED! ");
-            e.printStackTrace();
-        }
-    }
-
-    private void exposeJsInterface() {
-        if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)) {
-            Log.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
-            // Bug being that Java Strings do not get converted to JS strings automatically.
-            // This isn't hard to work-around on the JS side, but it's easier to just
-            // use the prompt bridge instead.
-            return;            
-        } 
-        AndroidExposedJsApi exposedJsApi = new AndroidExposedJsApi(bridge);
-        this.addJavascriptInterface(exposedJsApi, "_cordovaNative");
-    }
-
-    @Override
-    public void setWebViewClient(WebViewClient client) {
-        this.viewClient = (AndroidWebViewClient)client;
-        super.setWebViewClient(client);
-    }
-
-    @Override
-    public void setWebChromeClient(WebChromeClient client) {
-        this.chromeClient = (AndroidChromeClient)client;
-        super.setWebChromeClient(client);
-    }
-
-    /**
-     * Load the url into the webview.
-     */
-    @Override
-    public void loadUrl(String url) {
-        this.loadUrlIntoView(url, true);
-    }
-
-    /**
-     * Load the url into the webview.
-     */
-    @Override
-    public void loadUrlIntoView(final String url, boolean recreatePlugins) {
-        if (url.equals("about:blank") || url.startsWith("javascript:")) {
-            this.loadUrlNow(url);
-            return;
-        }
-
-        LOG.d(TAG, ">>> loadUrl(" + url + ")");
-        recreatePlugins = recreatePlugins || (loadedUrl == null);
-
-        if (recreatePlugins) {
-            // Don't re-initialize on first load.
-            if (loadedUrl != null) {
-                this.pluginManager.init();
-            }
-            this.loadedUrl = url;
-        }
-
-        // Create a timeout timer for loadUrl
-        final AndroidWebView me = this;
-        final int currentLoadUrlTimeout = me.loadUrlTimeout;
-        final int loadUrlTimeoutValue = preferences.getInteger("LoadUrlTimeoutValue", 20000);
-
-        // Timeout error method
-        final Runnable loadError = new Runnable() {
-            public void run() {
-                me.stopLoading();
-                LOG.e(TAG, "CordovaWebView: TIMEOUT ERROR!");
-                if (viewClient != null) {
-                    viewClient.onReceivedError(AndroidWebView.this, -6, "The connection to the server was unsuccessful.", url);
-                }
-            }
-        };
-
-        // Timeout timer method
-        final Runnable timeoutCheck = new Runnable() {
-            public void run() {
-                try {
-                    synchronized (this) {
-                        wait(loadUrlTimeoutValue);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-
-                // If timeout, then stop loading and handle error
-                if (me.loadUrlTimeout == currentLoadUrlTimeout) {
-                    me.cordova.getActivity().runOnUiThread(loadError);
-                }
-            }
-        };
-
-        // Load url
-        this.cordova.getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                cordova.getThreadPool().execute(timeoutCheck);
-                me.loadUrlNow(url);
-            }
-        });
-    }
-
-    /**
-     * Load URL in webview.
-     */
-    private void loadUrlNow(String url) {
-        if (LOG.isLoggable(LOG.DEBUG) && !url.startsWith("javascript:")) {
-            LOG.d(TAG, ">>> loadUrlNow()");
-        }
-        if (url.startsWith("javascript:") || pluginManager.shouldAllowNavigation(url)) {
-            super.loadUrl(url);
-        }
-    }
-
-    @Override
-    public void stopLoading() {
-        //viewClient.isCurrentlyLoading = false;
-        super.stopLoading();
-    }
-    
-    public void onScrollChanged(int l, int t, int oldl, int oldt)
-    {
-        super.onScrollChanged(l, t, oldl, oldt);
-        //We should post a message that the scroll changed
-        ScrollEvent myEvent = new ScrollEvent(l, t, oldl, oldt, this);
-        pluginManager.postMessage("onScrollChanged", myEvent);
-    }
-    
-    /**
-     * Send JavaScript statement back to JavaScript.
-     * (This is a convenience method)
-     */
-    public void sendJavascript(String statement) {
-        nativeToJsMessageQueue.addJavaScript(statement);
-    }
-
-    /**
-     * Send a plugin result back to JavaScript.
-     */
-    public void sendPluginResult(PluginResult result, String callbackId) {
-        nativeToJsMessageQueue.addPluginResult(result, callbackId);
-    }
-
-    /**
-     * Go to previous page in history.  (We manage our own history)
-     *
-     * @return true if we went back, false if we are already at top
-     */
-    public boolean backHistory() {
-
-        // Check webview first to see if there is a history
-        // This is needed to support curPage#diffLink, since they are added to appView's history, but not our history url array (JQMobile behavior)
-        if (super.canGoBack()) {
-            printBackForwardList();
-            super.goBack();
-            
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * Load the specified URL in the Cordova webview or a new browser instance.
-     *
-     * NOTE: If openExternal is false, only URLs listed in whitelist can be loaded.
-     *
-     * @param url           The url to load.
-     * @param openExternal  Load url in browser instead of Cordova webview.
-     * @param clearHistory  Clear the history stack, so new page becomes top of history
-     * @param params        Parameters for new app
-     */
-    public void showWebPage(String url, boolean openExternal, boolean clearHistory, Map<String, Object> params) {
-        LOG.d(TAG, "showWebPage(%s, %b, %b, HashMap", url, openExternal, clearHistory);
-
-        // If clearing history
-        if (clearHistory) {
-            this.clearHistory();
-        }
-
-        // If loading into our webview
-        if (!openExternal) {
-
-            // Make sure url is in whitelist
-            if (pluginManager.shouldAllowNavigation(url)) {
-                // TODO: What about params?
-                // Load new URL
-                loadUrlIntoView(url, true);
-                return;
-            }
-            // Load in default viewer if not
-            LOG.w(TAG, "showWebPage: Cannot load URL into webview since it is not in white list.  Loading into browser instead. (URL=" + url + ")");
-        }
-        try {
-            // Omitting the MIME type for file: URLs causes "No Activity found to handle Intent".
-            // Adding the MIME type to http: URLs causes them to not be handled by the downloader.
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            Uri uri = Uri.parse(url);
-            if ("file".equals(uri.getScheme())) {
-                intent.setDataAndType(uri, resourceApi.getMimeType(uri));
-            } else {
-                intent.setData(uri);
-            }
-            cordova.getActivity().startActivity(intent);
-        } catch (android.content.ActivityNotFoundException e) {
-            LOG.e(TAG, "Error loading url " + url, e);
-        }
-    }
-
-    /*
-     * onKeyDown
-     */
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event)
-    {
-        if(boundKeyCodes.contains(keyCode))
-        {
-            if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-                    sendJavascriptEvent("volumedownbutton");
-                    return true;
-            }
-            else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-                    sendJavascriptEvent("volumeupbutton");
-                    return true;
-            }
-            else
-            {
-                return super.onKeyDown(keyCode, event);
-            }
-        }
-        else if(keyCode == KeyEvent.KEYCODE_BACK)
-        {
-            return !(this.startOfHistory()) || isButtonPlumbedToJs(KeyEvent.KEYCODE_BACK);
-
-        }
-        else if(keyCode == KeyEvent.KEYCODE_MENU)
-        {
-            //How did we get here?  Is there a childView?
-            View childView = this.getFocusedChild();
-            if(childView != null)
-            {
-                //Make sure we close the keyboard if it's present
-                InputMethodManager imm = (InputMethodManager) cordova.getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(childView.getWindowToken(), 0);
-                cordova.getActivity().openOptionsMenu();
-                return true;
-            } else {
-                return super.onKeyDown(keyCode, event);
-            }
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event)
-    {
-        // If back key
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            // A custom view is currently displayed  (e.g. playing a video)
-            if(mCustomView != null) {
-                this.hideCustomView();
-                return true;
-            } else {
-                // The webview is currently displayed
-                // If back key is bound, then send event to JavaScript
-                if (isButtonPlumbedToJs(KeyEvent.KEYCODE_BACK)) {
-                    sendJavascriptEvent("backbutton");
-                    return true;
-                } else {
-                    // If not bound
-                    // Go to previous page in webview if it is possible to go back
-                    if (this.backHistory()) {
-                        return true;
-                    }
-                    // If not, then invoke default behavior
-                }
-            }
-        }
-        // Legacy
-        else if (keyCode == KeyEvent.KEYCODE_MENU) {
-            if (this.lastMenuEventTime < event.getEventTime()) {
-                sendJavascriptEvent("menubutton");
-            }
-            this.lastMenuEventTime = event.getEventTime();
-            return super.onKeyUp(keyCode, event);
-        }
-        // If search key
-        else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-            sendJavascriptEvent("searchbutton");
-            return true;
-        }
-
-        //Does webkit change this behavior?
-        return super.onKeyUp(keyCode, event);
-    }
-
-    private void sendJavascriptEvent(String event) {
-        if (appPlugin == null) {
-            appPlugin = (CoreAndroid)this.pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME);
-        }
-
-        if (appPlugin == null) {
-            LOG.w(TAG, "Unable to fire event without existing plugin");
-            return;
-        }
-        appPlugin.fireJavascriptEvent(event);
-    }
-
-    @Override
-    public void setButtonPlumbedToJs(int keyCode, boolean override) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-            case KeyEvent.KEYCODE_VOLUME_UP:
-            case KeyEvent.KEYCODE_BACK:
-                // TODO: Why are search and menu buttons handled separately?
-                if (override) {
-                    boundKeyCodes.add(keyCode);
-                } else {
-                    boundKeyCodes.remove(keyCode);
-                }
-                return;
-            default:
-                throw new IllegalArgumentException("Unsupported keycode: " + keyCode);
-        }
-    }
-
-    @Override
-    public boolean isButtonPlumbedToJs(int keyCode)
-    {
-        return boundKeyCodes.contains(keyCode);
-    }
-
-    @Override
-    public void handlePause(boolean keepRunning)
-    {
-        LOG.d(TAG, "Handle the pause");
-        // Send pause event to JavaScript
-        sendJavascriptEvent("pause");
-
-        // Forward to plugins
-        if (this.pluginManager != null) {
-            this.pluginManager.onPause(keepRunning);
-        }
-
-        // If app doesn't want to run in background
-        if (!keepRunning) {
-            // Pause JavaScript timers. This affects all webviews within the app!
-            this.pauseTimers();
-        }
-    }
-    
-    @Override
-    public void handleResume(boolean keepRunning)
-    {
-        // Resume JavaScript timers. This affects all webviews within the app!
-        this.resumeTimers();
-
-        sendJavascriptEvent("resume");
-        
-        // Forward to plugins
-        if (this.pluginManager != null) {
-            this.pluginManager.onResume(keepRunning);
-        }
-    }
-    
-    public void handleDestroy()
-    {
-        // Cancel pending timeout timer.
-        loadUrlTimeout++;
-
-        // Load blank page so that JavaScript onunload is called
-        this.loadUrl("about:blank");
-        
-        //Remove last AlertDialog
-        this.chromeClient.destroyLastDialog();
-
-        // Forward to plugins
-        if (this.pluginManager != null) {
-            this.pluginManager.onDestroy();
-        }
-        
-        // unregister the receiver
-        if (this.receiver != null) {
-            try {
-                getContext().unregisterReceiver(this.receiver);
-            } catch (Exception e) {
-                Log.e(TAG, "Error unregistering configuration receiver: " + e.getMessage(), e);
-            }
-        }
-    }
-    
-    public void onNewIntent(Intent intent)
-    {
-        //Forward to plugins
-        if (this.pluginManager != null) {
-            this.pluginManager.onNewIntent(intent);
-        }
-    }
-    
-    // Wrapping these functions in their own class prevents warnings in adb like:
-    // VFY: unable to resolve virtual method 285: Landroid/webkit/WebSettings;.setAllowUniversalAccessFromFileURLs
-    @TargetApi(16)
-    private static class Level16Apis {
-        static void enableUniversalAccess(WebSettings settings) {
-            settings.setAllowUniversalAccessFromFileURLs(true);
-        }
-    }
-
-    @TargetApi(17)
-    private static final class Level17Apis {
-        static void setMediaPlaybackRequiresUserGesture(WebSettings settings, boolean value) {
-            settings.setMediaPlaybackRequiresUserGesture(value);
-        }
-    }
-    public void printBackForwardList() {
-        WebBackForwardList currentList = this.copyBackForwardList();
-        int currentSize = currentList.getSize();
-        for(int i = 0; i < currentSize; ++i)
-        {
-            WebHistoryItem item = currentList.getItemAtIndex(i);
-            String url = item.getUrl();
-            LOG.d(TAG, "The URL at index: " + Integer.toString(i) + " is " + url );
-        }
-    }
-    
-    
-    //Can Go Back is BROKEN!
-    public boolean startOfHistory()
-    {
-        WebBackForwardList currentList = this.copyBackForwardList();
-        WebHistoryItem item = currentList.getItemAtIndex(0);
-        if( item!=null){	// Null-fence in case they haven't called loadUrl yet (CB-2458)
-	        String url = item.getUrl();
-	        String currentUrl = this.getUrl();
-	        LOG.d(TAG, "The current URL is: " + currentUrl);
-	        LOG.d(TAG, "The URL at item 0 is: " + url);
-	        return currentUrl.equals(url);
-        }
-        return false;
-    }
-
-    public void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
-        // This code is adapted from the original Android Browser code, licensed under the Apache License, Version 2.0
-        Log.d(TAG, "showing Custom View");
-        // if a view already exists then immediately terminate the new one
-        if (mCustomView != null) {
-            callback.onCustomViewHidden();
-            return;
-        }
-        
-        // Store the view and its callback for later (to kill it properly)
-        mCustomView = view;
-        mCustomViewCallback = callback;
-        
-        // Add the custom view to its container.
-        ViewGroup parent = (ViewGroup) this.getParent();
-        parent.addView(view, COVER_SCREEN_GRAVITY_CENTER);
-        
-        // Hide the content view.
-        this.setVisibility(View.GONE);
-        
-        // Finally show the custom view container.
-        parent.setVisibility(View.VISIBLE);
-        parent.bringToFront();
-    }
-
-    public void hideCustomView() {
-        // This code is adapted from the original Android Browser code, licensed under the Apache License, Version 2.0
-        Log.d(TAG, "Hiding Custom View");
-        if (mCustomView == null) return;
-
-        // Hide the custom view.
-        mCustomView.setVisibility(View.GONE);
-        
-        // Remove the custom view from its container.
-        ViewGroup parent = (ViewGroup) this.getParent();
-        parent.removeView(mCustomView);
-        mCustomView = null;
-        mCustomViewCallback.onCustomViewHidden();
-        
-        // Show the content view.
-        this.setVisibility(View.VISIBLE);
-    }
-    
-    /**
-     * if the video overlay is showing then we need to know 
-     * as it effects back button handling
-     * 
-     * @return true if custom view is showing
-     */
-    public boolean isCustomViewShowing() {
-        return mCustomView != null;
-    }
-    
-    public WebBackForwardList restoreState(Bundle savedInstanceState)
-    {
-        WebBackForwardList myList = super.restoreState(savedInstanceState);
-        Log.d(TAG, "WebView restoration crew now restoring!");
-        //Initialize the plugin manager once more
-        this.pluginManager.init();
-        return myList;
-    }
-
-    public CordovaResourceApi getResourceApi() {
-        return resourceApi;
-    }
-
-    void onPageReset() {
-        boundKeyCodes.clear();
-        pluginManager.onReset();
-        bridge.reset();
-    }
-
-    @Override
-    public PluginManager getPluginManager() {
-        return this.pluginManager;
-    }
-
-    @Override
-    public View getView() {
-        return this;
-    }
-
-    @Override
-    public CordovaPreferences getPreferences() {
-        return preferences;
-    }
-
-    @Override
-    public ICordovaCookieManager getCookieManager() {
-        return cookieManager;
-    }
-
-    @Override
-    public Object postMessage(String id, Object data) {
-        return pluginManager.postMessage(id, data);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/AndroidWebViewClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidWebViewClient.java b/framework/src/org/apache/cordova/AndroidWebViewClient.java
deleted file mode 100755
index 06d0c2b..0000000
--- a/framework/src/org/apache/cordova/AndroidWebViewClient.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.annotation.TargetApi;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.net.http.SslError;
-import android.os.Build;
-import android.view.View;
-import android.webkit.ClientCertRequest;
-import android.webkit.HttpAuthHandler;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-
-/**
- * This class is the WebViewClient that implements callbacks for our web view.
- * The kind of callbacks that happen here are regarding the rendering of the
- * document instead of the chrome surrounding it, such as onPageStarted(), 
- * shouldOverrideUrlLoading(), etc. Related to but different than
- * CordovaChromeClient.
- *
- * @see <a href="http://developer.android.com/reference/android/webkit/WebViewClient.html">WebViewClient</a>
- * @see <a href="http://developer.android.com/guide/webapps/webview.html">WebView guide</a>
- * @see CordovaChromeClient
- * @see CordovaWebView
- */
-public class AndroidWebViewClient extends WebViewClient {
-
-    private static final String TAG = "AndroidWebViewClient";
-    protected final CordovaInterface cordova;
-    protected final AndroidWebView appView;
-    protected final CordovaUriHelper helper;
-    private boolean doClearHistory = false;
-    boolean isCurrentlyLoading;
-
-    /** The authorization tokens. */
-    private Hashtable<String, AuthenticationToken> authenticationTokens = new Hashtable<String, AuthenticationToken>();
-
-    public AndroidWebViewClient(CordovaInterface cordova, AndroidWebView view) {
-        this.cordova = cordova;
-        this.appView = view;
-        helper = new CordovaUriHelper(cordova, view);
-    }
-
-    /**
-     * Give the host application a chance to take over the control when a new url
-     * is about to be loaded in the current WebView.
-     *
-     * @param view          The WebView that is initiating the callback.
-     * @param url           The url to be loaded.
-     * @return              true to override, false for default behavior
-     */
-	@Override
-    public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        return helper.shouldOverrideUrlLoading(url);
-    }
-    
-    /**
-     * On received http auth request.
-     * The method reacts on all registered authentication tokens. There is one and only one authentication token for any host + realm combination
-     */
-    @Override
-    public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
-
-        // Get the authentication token (if specified)
-        AuthenticationToken token = this.getAuthenticationToken(host, realm);
-        if (token != null) {
-            handler.proceed(token.getUserName(), token.getPassword());
-            return;
-        }
-
-        // Check if there is some plugin which can resolve this auth challenge
-        PluginManager pluginManager = this.appView.pluginManager;
-        if (pluginManager != null && pluginManager.onReceivedHttpAuthRequest(this.appView, new CordovaHttpAuthHandler(handler), host, realm)) {
-            this.appView.loadUrlTimeout++;
-            return;
-        }
-
-        // By default handle 401 like we'd normally do!
-        super.onReceivedHttpAuthRequest(view, handler, host, realm);
-    }
-    
-    /**
-     * On received client cert request.
-     * The method forwards the request to any running plugins before using the default implementation.
-     *
-     * @param view
-     * @param request
-     */
-    @Override
-    @TargetApi(21)
-    public void onReceivedClientCertRequest (WebView view, ClientCertRequest request)
-    {
-
-        // Check if there is some plugin which can resolve this certificate request
-        PluginManager pluginManager = this.appView.pluginManager;
-        if (pluginManager != null && pluginManager.onReceivedClientCertRequest(this.appView, new CordovaClientCertRequest(request))) {
-            this.appView.loadUrlTimeout++;
-            return;
-        }
-
-        // By default pass to WebViewClient
-        super.onReceivedClientCertRequest(view, request);
-    }
-
-    /**
-     * Notify the host application that a page has started loading.
-     * This method is called once for each main frame load so a page with iframes or framesets will call onPageStarted
-     * one time for the main frame. This also means that onPageStarted will not be called when the contents of an
-     * embedded frame changes, i.e. clicking a link whose target is an iframe.
-     *
-     * @param view          The webview initiating the callback.
-     * @param url           The url of the page.
-     */
-    @Override
-    public void onPageStarted(WebView view, String url, Bitmap favicon) {
-        super.onPageStarted(view, url, favicon);
-        isCurrentlyLoading = true;
-        LOG.d(TAG, "onPageStarted(" + url + ")");
-        // Flush stale messages & reset plugins.
-        this.appView.onPageReset();
-
-        // Broadcast message that page has loaded
-        this.appView.getPluginManager().postMessage("onPageStarted", url);
-    }
-
-    /**
-     * Notify the host application that a page has finished loading.
-     * This method is called only for main frame. When onPageFinished() is called, the rendering picture may not be updated yet.
-     *
-     *
-     * @param view          The webview initiating the callback.
-     * @param url           The url of the page.
-     */
-    @Override
-    public void onPageFinished(WebView view, String url) {
-        super.onPageFinished(view, url);
-        // Ignore excessive calls, if url is not about:blank (CB-8317).
-        if (!isCurrentlyLoading && !url.startsWith("about:")) {
-            return;
-        }
-        isCurrentlyLoading = false;
-        LOG.d(TAG, "onPageFinished(" + url + ")");
-
-        /**
-         * Because of a timing issue we need to clear this history in onPageFinished as well as
-         * onPageStarted. However we only want to do this if the doClearHistory boolean is set to
-         * true. You see when you load a url with a # in it which is common in jQuery applications
-         * onPageStared is not called. Clearing the history at that point would break jQuery apps.
-         */
-        if (this.doClearHistory) {
-            view.clearHistory();
-            this.doClearHistory = false;
-        }
-
-        // Clear timeout flag
-        appView.loadUrlTimeout++;
-
-        // Broadcast message that page has loaded
-        this.appView.getPluginManager().postMessage("onPageFinished", url);
-
-        // Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
-        if (this.appView.getVisibility() == View.INVISIBLE) {
-            Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        Thread.sleep(2000);
-                        cordova.getActivity().runOnUiThread(new Runnable() {
-                            public void run() {
-                                appView.getPluginManager().postMessage("spinner", "stop");
-                            }
-                        });
-                    } catch (InterruptedException e) {
-                    }
-                }
-            });
-            t.start();
-        }
-
-        // Shutdown if blank loaded
-        if (url.equals("about:blank")) {
-            appView.getPluginManager().postMessage("exit", null);
-        }
-    }
-
-    /**
-     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable).
-     * The errorCode parameter corresponds to one of the ERROR_* constants.
-     *
-     * @param view          The WebView that is initiating the callback.
-     * @param errorCode     The error code corresponding to an ERROR_* value.
-     * @param description   A String describing the error.
-     * @param failingUrl    The url that failed to load.
-     */
-    @Override
-    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-        // Ignore error due to stopLoading().
-        if (!isCurrentlyLoading) {
-            return;
-        }
-        LOG.d(TAG, "CordovaWebViewClient.onReceivedError: Error code=%s Description=%s URL=%s", errorCode, description, failingUrl);
-
-        // Clear timeout flag
-        appView.loadUrlTimeout++;
-
-        // If this is a "Protocol Not Supported" error, then revert to the previous
-        // page. If there was no previous page, then punt. The application's config
-        // is likely incorrect (start page set to sms: or something like that)
-        if (errorCode == WebViewClient.ERROR_UNSUPPORTED_SCHEME) {
-            if (view.canGoBack()) {
-                view.goBack();
-                return;
-            } else {
-                super.onReceivedError(view, errorCode, description, failingUrl);
-            }
-        }
-
-        // Handle other errors by passing them to the webview in JS
-        JSONObject data = new JSONObject();
-        try {
-            data.put("errorCode", errorCode);
-            data.put("description", description);
-            data.put("url", failingUrl);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        this.appView.getPluginManager().postMessage("onReceivedError", data);
-    }
-
-    /**
-     * Notify the host application that an SSL error occurred while loading a resource.
-     * The host application must call either handler.cancel() or handler.proceed().
-     * Note that the decision may be retained for use in response to future SSL errors.
-     * The default behavior is to cancel the load.
-     *
-     * @param view          The WebView that is initiating the callback.
-     * @param handler       An SslErrorHandler object that will handle the user's response.
-     * @param error         The SSL error object.
-     */
-    @TargetApi(8)
-    @Override
-    public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-
-        final String packageName = this.cordova.getActivity().getPackageName();
-        final PackageManager pm = this.cordova.getActivity().getPackageManager();
-
-        ApplicationInfo appInfo;
-        try {
-            appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
-            if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
-                // debug = true
-                handler.proceed();
-                return;
-            } else {
-                // debug = false
-                super.onReceivedSslError(view, handler, error);
-            }
-        } catch (NameNotFoundException e) {
-            // When it doubt, lock it out!
-            super.onReceivedSslError(view, handler, error);
-        }
-    }
-
-
-    /**
-     * Sets the authentication token.
-     *
-     * @param authenticationToken
-     * @param host
-     * @param realm
-     */
-    public void setAuthenticationToken(AuthenticationToken authenticationToken, String host, String realm) {
-        if (host == null) {
-            host = "";
-        }
-        if (realm == null) {
-            realm = "";
-        }
-        this.authenticationTokens.put(host.concat(realm), authenticationToken);
-    }
-
-    /**
-     * Removes the authentication token.
-     *
-     * @param host
-     * @param realm
-     *
-     * @return the authentication token or null if did not exist
-     */
-    public AuthenticationToken removeAuthenticationToken(String host, String realm) {
-        return this.authenticationTokens.remove(host.concat(realm));
-    }
-
-    /**
-     * Gets the authentication token.
-     *
-     * In order it tries:
-     * 1- host + realm
-     * 2- host
-     * 3- realm
-     * 4- no host, no realm
-     *
-     * @param host
-     * @param realm
-     *
-     * @return the authentication token
-     */
-    public AuthenticationToken getAuthenticationToken(String host, String realm) {
-        AuthenticationToken token = null;
-        token = this.authenticationTokens.get(host.concat(realm));
-
-        if (token == null) {
-            // try with just the host
-            token = this.authenticationTokens.get(host);
-
-            // Try the realm
-            if (token == null) {
-                token = this.authenticationTokens.get(realm);
-            }
-
-            // if no host found, just query for default
-            if (token == null) {
-                token = this.authenticationTokens.get("");
-            }
-        }
-
-        return token;
-    }
-
-    /**
-     * Clear all authentication tokens.
-     */
-    public void clearAuthenticationTokens() {
-        this.authenticationTokens.clear();
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    @Override
-    public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
-        try {
-            // Check the against the whitelist and lock out access to the WebView directory
-            // Changing this will cause problems for your application
-            if (!appView.getPluginManager().shouldAllowRequest(url)) {
-                LOG.w(TAG, "URL blocked by whitelist: " + url);
-                // Results in a 404.
-                return new WebResourceResponse("text/plain", "UTF-8", null);
-            }
-
-            CordovaResourceApi resourceApi = appView.getResourceApi();
-            Uri origUri = Uri.parse(url);
-            // Allow plugins to intercept WebView requests.
-            Uri remappedUri = resourceApi.remapUri(origUri);
-
-            if (!origUri.equals(remappedUri) || needsSpecialsInAssetUrlFix(origUri) || needsKitKatContentUrlFix(origUri)) {
-                CordovaResourceApi.OpenForReadResult result = resourceApi.openForRead(remappedUri, true);
-                return new WebResourceResponse(result.mimeType, "UTF-8", result.inputStream);
-            }
-            // If we don't need to special-case the request, let the browser load it.
-            return null;
-        } catch (IOException e) {
-            if (!(e instanceof FileNotFoundException)) {
-                LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file (returning a 404).", e);
-            }
-            // Results in a 404.
-            return new WebResourceResponse("text/plain", "UTF-8", null);
-        }
-    }
-
-    private static boolean needsKitKatContentUrlFix(Uri uri) {
-        return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && "content".equals(uri.getScheme());
-    }
-
-    private static boolean needsSpecialsInAssetUrlFix(Uri uri) {
-        if (CordovaResourceApi.getUriType(uri) != CordovaResourceApi.URI_TYPE_ASSET) {
-            return false;
-        }
-        if (uri.getQuery() != null || uri.getFragment() != null) {
-            return true;
-        }
-
-        if (!uri.toString().contains("%")) {
-            return false;
-        }
-
-        switch(android.os.Build.VERSION.SDK_INT){
-            case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH:
-            case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1:
-                return true;
-        }
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 9aa5e1f..5f68333 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -18,16 +18,15 @@
 */
 package org.apache.cordova;
 
-import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Locale;
 
+import org.apache.cordova.engine.SystemWebViewEngine;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -97,7 +96,6 @@ public class CordovaActivity extends Activity {
     protected ArrayList<PluginEntry> pluginEntries;
     protected CordovaInterfaceImpl cordovaInterface;
 
-
     /**
      * Called when the activity is first created.
      */
@@ -138,8 +136,9 @@ public class CordovaActivity extends Activity {
     protected void init() {
         appView = makeWebView();
         createViews();
-        //TODO: Add null check against CordovaInterfaceImpl, since this can be fragile
-        appView.init(cordovaInterface, pluginEntries, preferences);
+        if (!appView.isInitialized()) {
+            appView.init(cordovaInterface, pluginEntries, preferences);
+        }
         cordovaInterface.setPluginManager(appView.getPluginManager());
 
         // Wire the hardware volume controls to control media if desired.
@@ -198,16 +197,12 @@ public class CordovaActivity extends Activity {
      * Override this to customize the webview that is used.
      */
     protected CordovaWebView makeWebView() {
-        String webViewClassName = preferences.getString("webView", AndroidWebView.class.getCanonicalName());
-        CordovaWebView ret;
-        try {
-            Class<?> webViewClass = Class.forName(webViewClassName);
-            Constructor<?> constructor = webViewClass.getConstructor(Context.class);
-            ret = (CordovaWebView) constructor.newInstance((Context)this);
-            return ret;
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to create webview. ", e);
-        }
+        return new CordovaWebViewImpl(this, makeWebViewEngine());
+    }
+
+    protected CordovaWebViewEngine makeWebViewEngine() {
+        String className = preferences.getString("webview", SystemWebViewEngine.class.getCanonicalName());
+        return CordovaWebViewImpl.createEngine(className, this, preferences);
     }
 
     protected CordovaInterfaceImpl makeCordovaInterface() {

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/CordovaUriHelper.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaUriHelper.java b/framework/src/org/apache/cordova/CordovaUriHelper.java
deleted file mode 100644
index 5685c70..0000000
--- a/framework/src/org/apache/cordova/CordovaUriHelper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-import android.webkit.WebView;
-
-public class CordovaUriHelper {
-    
-    private static final String TAG = "CordovaUriHelper";
-    
-    private CordovaWebView appView;
-    private CordovaInterface cordova;
-    
-    public CordovaUriHelper(CordovaInterface cdv, CordovaWebView webView)
-    {
-        appView = webView;
-        cordova = cdv;
-    }
-
-    /**
-     * Give the host application a chance to take over the control when a new url
-     * is about to be loaded in the current WebView.
-     *
-     * This method implements the default whitelist policy when no plugins override
-     * the whitelist methods:
-     *   Internal urls on file:// or data:// that do not contain "app_webview" are allowed for navigation
-     *   External urls are not allowed.
-     *
-     * @param url           The url to be loaded.
-     * @return              true to override, false for default behavior
-     */
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    public boolean shouldOverrideUrlLoading(String url) {
-        // Give plugins the chance to handle the url
-        if (appView.getPluginManager().shouldAllowNavigation(url)) {
-            // Allow internal navigation
-            return false;
-        }
-        if (appView.getPluginManager().shouldOpenExternalUrl(url)) {
-            // Do nothing other than what the plugins wanted.
-            // If any returned false, then the request was either blocked
-            // completely, or handled out-of-band by the plugin. If they all
-            // returned true, then we should open the URL here.
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(url));
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setComponent(null);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                    intent.setSelector(null);
-                }
-                this.cordova.getActivity().startActivity(intent);
-                return true;
-            } catch (android.content.ActivityNotFoundException e) {
-                Log.e(TAG, "Error loading url " + url, e);
-            }
-            return true;
-        }
-        // Block by default
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 2a27a33..d3071f4 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -16,19 +16,27 @@
 */
 package org.apache.cordova;
 
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;
 import android.webkit.WebChromeClient.CustomViewCallback;
 
+/**
+ * Main interface for interacting with a Cordova webview - implemented by CordovaWebViewImpl.
+ * This is an interface so that it can be easily mocked in tests.
+ * Methods may be added to this interface without a major version bump, as plugins & embedders
+ * are not expected to implement it.
+ */
 public interface CordovaWebView {
     public static final String CORDOVA_VERSION = "4.0.0-dev";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 
+    boolean isInitialized();
+
     View getView();
 
     void loadUrlIntoView(String url, boolean recreatePlugins);
@@ -37,6 +45,10 @@ public interface CordovaWebView {
 
     boolean canGoBack();
 
+    void clearCache();
+
+    /** Use parameter-less overload */
+    @Deprecated
     void clearCache(boolean b);
 
     void clearHistory();
@@ -75,7 +87,17 @@ public interface CordovaWebView {
     @Deprecated
     void sendJavascript(String statememt);
 
-    void showWebPage(String errorUrl, boolean b, boolean c, Map<String, Object> params);
+    /**
+     * Load the specified URL in the Cordova webview or a new browser instance.
+     *
+     * NOTE: If openExternal is false, only whitelisted URLs can be loaded.
+     *
+     * @param url           The url to load.
+     * @param openExternal  Load url in browser instead of Cordova webview.
+     * @param clearHistory  Clear the history stack, so new page becomes top of history
+     * @param params        Parameters for new app
+     */
+    void showWebPage(String url, boolean openExternal, boolean clearHistory, Map<String, Object> params);
 
     /**
      * Deprecated in 4.0.0. Use your own View-toggling logic.
@@ -103,12 +125,10 @@ public interface CordovaWebView {
     void sendPluginResult(PluginResult cr, String callbackId);
 
     PluginManager getPluginManager();
-
+    CordovaWebViewEngine getEngine();
     CordovaPreferences getPreferences();
     ICordovaCookieManager getCookieManager();
 
-    void setNetworkAvailable(boolean online);
-    
     String getUrl();
 
     // TODO: Work on deleting these by removing refs from plugins.

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/087ec11e/framework/src/org/apache/cordova/CordovaWebViewEngine.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebViewEngine.java b/framework/src/org/apache/cordova/CordovaWebViewEngine.java
new file mode 100644
index 0000000..03f697c
--- /dev/null
+++ b/framework/src/org/apache/cordova/CordovaWebViewEngine.java
@@ -0,0 +1,82 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+import android.view.KeyEvent;
+import android.view.View;
+
+/**
+ * Interfcae for all Cordova engines.
+ * No methods will be added to this class (in order to be compatible with existing engines).
+ * Instead, we will create a new interface: e.g. CordovaWebViewEngineV2
+ */
+public interface CordovaWebViewEngine {
+    void init(CordovaWebView parentWebView, CordovaInterface cordova, Client client,
+              CordovaResourceApi resourceApi, PluginManager pluginManager,
+              NativeToJsMessageQueue nativeToJsMessageQueue);
+
+    CordovaWebView getCordovaWebView();
+    ICordovaCookieManager getCookieManager();
+    View getView();
+
+    void loadUrl(String url, boolean clearNavigationStack);
+
+    void stopLoading();
+
+    /** Return the currently loaded URL */
+    String getUrl();
+
+    void clearCache();
+
+    /** After calling clearHistory(), canGoBack() should be false. */
+    void clearHistory();
+
+    boolean canGoBack();
+
+    /** Returns whether a navigation occurred */
+    boolean goBack();
+
+    /** Pauses / resumes the WebView's event loop. */
+    void setPaused(boolean value);
+
+    /** Clean up all resources associated with the WebView. */
+    void destroy();
+
+    /**
+     * Used to retrieve the associated CordovaWebView given a View without knowing the type of Engine.
+     * E.g. ((CordovaWebView.EngineView)activity.findViewById(android.R.id.webView)).getCordovaWebView();
+     */
+    public interface EngineView {
+        CordovaWebView getCordovaWebView();
+    }
+
+    /**
+     * Contains methods that an engine uses to communicate with the parent CordovaWebView.
+     * Methods may be added in future cordova versions, but never removed.
+     */
+    public interface Client {
+        Boolean onKeyDown(int keyCode, KeyEvent event);
+        Boolean onKeyUp(int keyCode, KeyEvent event);
+        boolean shouldOverrideUrlLoading(String url);
+        void clearLoadTimeoutTimer();
+        void onPageStarted(String newUrl);
+        void onReceivedError(int errorCode, String description, String failingUrl);
+        void onPageFinishedLoading(String url);
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org