cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [12/13] android commit: Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)
Date Sat, 04 Oct 2014 19:32:20 GMT
Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)

Conflicts:
	framework/src/org/apache/cordova/AndroidChromeClient.java
	framework/src/org/apache/cordova/CordovaActivity.java
	framework/src/org/apache/cordova/CordovaWebView.java
	test/src/org/apache/cordova/test/menus.java

closes #123


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

Branch: refs/heads/4.0.x
Commit: 7f4d5aeb0e1417ba0ed0b102bed3321c1802b53d
Parents: e5efc91 890e12c
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Sat Oct 4 15:01:40 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Sat Oct 4 15:30:25 2014 -0400

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 RELEASENOTES.md                                 | 11 +++
 framework/assets/www/cordova.js                 | 27 ++++++-
 .../org/apache/cordova/AndroidChromeClient.java | 16 +++-
 .../src/org/apache/cordova/AndroidWebView.java  |  3 +
 .../src/org/apache/cordova/CordovaActivity.java | 30 +++++---
 test/res/xml/config.xml                         |  1 +
 .../test/junit/IntentUriOverrideTest.java       |  1 +
 test/src/org/apache/cordova/test/menus.java     | 81 ++++++++++++++++++++
 9 files changed, 155 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7f4d5aeb/framework/src/org/apache/cordova/AndroidChromeClient.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/AndroidChromeClient.java
index e4ebe96,0000000..ad6c414
mode 100755,000000..100755
--- a/framework/src/org/apache/cordova/AndroidChromeClient.java
+++ b/framework/src/org/apache/cordova/AndroidChromeClient.java
@@@ -1,317 -1,0 +1,327 @@@
 +/*
 +       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 org.apache.cordova.CordovaInterface;
 +import org.apache.cordova.LOG;
 +
 +import android.annotation.TargetApi;
 +import android.app.AlertDialog;
 +import android.content.DialogInterface;
 +import android.content.Intent;
 +import android.net.Uri;
 +import android.view.Gravity;
 +import android.view.KeyEvent;
 +import android.view.View;
 +import android.view.ViewGroup.LayoutParams;
 +import android.webkit.ConsoleMessage;
 +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.webkit.GeolocationPermissions.Callback;
 +import android.widget.EditText;
 +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.
 + *
 + * @see <a href="http://developer.android.com/reference/android/webkit/WebChromeClient.html">WebChromeClient</a>
 + * @see <a href="http://developer.android.com/guide/webapps/webview.html">WebView
guide</a>
 + * @see CordovaWebViewClient
 + * @see CordovaWebView
 + */
 +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;
 +    
++    //Keep track of last AlertDialog showed
++    private AlertDialog lastHandledDialog;
++
 +    // File Chooser
 +    protected ValueCallback<Uri> mUploadMessage;
 +    
 +    public AndroidChromeClient(CordovaInterface ctx, AndroidWebView app) {
 +        this.cordova = ctx;
 +        this.appView = app;
 +    }
 +
 +    /**
 +     * Tell the client to display a javascript alert dialog.
 +     *
 +     * @param view
 +     * @param url
 +     * @param message
 +     * @param result
 +     * @see Other implementation in the Dialogs plugin.
 +     */
 +    @Override
 +    public boolean onJsAlert(WebView view, String url, String message, final JsResult result)
{
 +        AlertDialog.Builder dlg = new AlertDialog.Builder(this.cordova.getActivity());
 +        dlg.setMessage(message);
 +        dlg.setTitle("Alert");
 +        //Don't let alerts break the back button
 +        dlg.setCancelable(true);
 +        dlg.setPositiveButton(android.R.string.ok,
 +                new AlertDialog.OnClickListener() {
 +                    public void onClick(DialogInterface dialog, int which) {
 +                        result.confirm();
 +                    }
 +                });
 +        dlg.setOnCancelListener(
 +                new DialogInterface.OnCancelListener() {
 +                    public void onCancel(DialogInterface dialog) {
 +                        result.cancel();
 +                    }
 +                });
 +        dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
 +            //DO NOTHING
 +            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
 +                if (keyCode == KeyEvent.KEYCODE_BACK)
 +                {
 +                    result.confirm();
 +                    return false;
 +                }
 +                else
 +                    return true;
 +            }
 +        });
-         dlg.show();
++        lastHandledDialog = dlg.show();
 +        return true;
 +    }
 +
 +    /**
 +     * Tell the client to display a confirm dialog to the user.
 +     *
 +     * @param view
 +     * @param url
 +     * @param message
 +     * @param result
 +     * @see Other implementation in the Dialogs plugin.
 +     */
 +    @Override
 +    public boolean onJsConfirm(WebView view, String url, String message, final JsResult
result) {
 +        AlertDialog.Builder dlg = new AlertDialog.Builder(this.cordova.getActivity());
 +        dlg.setMessage(message);
 +        dlg.setTitle("Confirm");
 +        dlg.setCancelable(true);
 +        dlg.setPositiveButton(android.R.string.ok,
 +                new DialogInterface.OnClickListener() {
 +                    public void onClick(DialogInterface dialog, int which) {
 +                        result.confirm();
 +                    }
 +                });
 +        dlg.setNegativeButton(android.R.string.cancel,
 +                new DialogInterface.OnClickListener() {
 +                    public void onClick(DialogInterface dialog, int which) {
 +                        result.cancel();
 +                    }
 +                });
 +        dlg.setOnCancelListener(
 +                new DialogInterface.OnCancelListener() {
 +                    public void onCancel(DialogInterface dialog) {
 +                        result.cancel();
 +                    }
 +                });
 +        dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
 +            //DO NOTHING
 +            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
 +                if (keyCode == KeyEvent.KEYCODE_BACK)
 +                {
 +                    result.cancel();
 +                    return false;
 +                }
 +                else
 +                    return true;
 +            }
 +        });
-         dlg.show();
++        lastHandledDialog = dlg.show();
 +        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!
 +     *
 +     * @see Other implementation in the Dialogs plugin.
 +     */
 +    @Override
 +    public boolean onJsPrompt(WebView view, String origin, String message, String defaultValue,
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 {
 +            // Returning false would also show a dialog, but the default one shows the origin
(ugly).
 +            final JsPromptResult res = result;
 +            AlertDialog.Builder dlg = new AlertDialog.Builder(this.cordova.getActivity());
 +            dlg.setMessage(message);
 +            final EditText input = new EditText(this.cordova.getActivity());
 +            if (defaultValue != null) {
 +                input.setText(defaultValue);
 +            }
 +            dlg.setView(input);
 +            dlg.setCancelable(false);
 +            dlg.setPositiveButton(android.R.string.ok,
 +                    new DialogInterface.OnClickListener() {
 +                        public void onClick(DialogInterface dialog, int which) {
 +                            String usertext = input.getText().toString();
 +                            res.confirm(usertext);
 +                        }
 +                    });
 +            dlg.setNegativeButton(android.R.string.cancel,
 +                    new DialogInterface.OnClickListener() {
 +                        public void onClick(DialogInterface dialog, int which) {
 +                            res.cancel();
 +                        }
 +                    });
-             dlg.show();
++            lastHandledDialog = dlg.show();
 +        }
 +        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; 
 +    }
 +    
 +    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(ValueCallback<Uri> uploadMsg, String acceptType, String
capture)
 +    {
 +        mUploadMessage = uploadMsg;
 +        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
 +        i.addCategory(Intent.CATEGORY_OPENABLE);
 +        i.setType("*/*");
 +        this.cordova.getActivity().startActivityForResult(Intent.createChooser(i, "File
Browser"),
 +                FILECHOOSER_RESULTCODE);
 +    }
++
++    public void destroyLastDialog(){
++        if(lastHandledDialog != null){
++                lastHandledDialog.cancel();
++        }
++    }
++
 +}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7f4d5aeb/framework/src/org/apache/cordova/AndroidWebView.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/AndroidWebView.java
index 8986d58,0000000..9817476
mode 100755,000000..100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@@ -1,775 -1,0 +1,778 @@@
 +/*
 +       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.HashMap;
 +import java.util.HashSet;
 +import java.util.List;
 +
 +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;
 +
 +    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;
 +
 +    CordovaBridge bridge;
 +
 +    /** custom view created by the browser (a video player for example) */
 +    private View mCustomView;
 +    private WebChromeClient.CustomViewCallback mCustomViewCallback;
 +
 +    private CordovaResourceApi resourceApi;
 +    private Whitelist internalWhitelist;
 +    private Whitelist externalWhitelist;
 +    private CordovaPreferences preferences;
 +    // 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(CordovaInterface cordova, List<PluginEntry> pluginEntries,
 +            Whitelist internalWhitelist, Whitelist externalWhitelist,
 +            CordovaPreferences preferences) {
 +        if (this.cordova != null) {
 +            throw new IllegalStateException();
 +        }
 +        this.cordova = cordova;
 +        this.internalWhitelist = internalWhitelist;
 +        this.externalWhitelist = externalWhitelist;
 +        this.preferences = preferences;
 +
 +        pluginManager = new PluginManager(this, this.cordova, pluginEntries);
 +        resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
 +        bridge = new CordovaBridge(pluginManager, new NativeToJsMessageQueue(this, cordova));
 +        pluginManager.addService("App", "org.apache.cordova.CoreAndroid");
 +        initWebViewSettings();
 +        
 +        if (this.viewClient == null) {
 +            setWebViewClient(Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH
?
 +                new AndroidWebViewClient(cordova, this) :
 +                new IceCreamCordovaWebViewClient(cordova, this));
 +        }
 +        if (this.chromeClient == null) {
 +            setWebChromeClient(new AndroidChromeClient(cordova, this));
 +        }
 +
 +        exposeJsInterface();
 +    }
 +
 +    @SuppressLint("SetJavaScriptEnabled")
 +    @SuppressWarnings("deprecation")
 +    private void initWebViewSettings() {
 +        this.setInitialScale(0);
 +        this.setVerticalScrollBarEnabled(false);
 +        // TODO: The Activity is the one that should call requestFocus().
 +        if (shouldRequestFocusOnInit()) {
 +            this.requestFocusFromTouch();
 +        }
 +        this.setInitialScale(0);
 +        this.setVerticalScrollBarEnabled(false);
 +        if (shouldRequestFocusOnInit()) {
 +            this.requestFocusFromTouch();
 +        }
 +        // Enable JavaScript
 +        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.ICE_CREAM_SANDWICH_MR1)
 +            Level16Apis.enableUniversalAccess(settings);
 +        // 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();
 +        }
 +    }
 +
 +	/**
 +	 * Override this method to decide whether or not you need to request the
 +	 * focus when your application start
 +	 * 
 +	 * @return true unless this method is overriden to return a different value
 +	 */
 +    protected boolean shouldRequestFocusOnInit() {
 +		return true;
 +	}
 +
 +    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) {
 +            this.loadedUrl = url;
 +            this.pluginManager.init();
 +        }
 +
 +        // 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("file://") || url.startsWith("javascript:") || internalWhitelist.isUrlWhiteListed(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) {
 +        bridge.getMessageQueue().addJavaScript(statement);
 +    }
 +
 +    /**
 +     * Send a plugin result back to JavaScript.
 +     */
 +    public void sendPluginResult(PluginResult result, String callbackId) {
 +        bridge.getMessageQueue().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, HashMap<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 (url.startsWith("file://") || internalWhitelist.isUrlWhiteListed(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) {
 +                    this.loadUrl("javascript:cordova.fireDocumentEvent('volumedownbutton');");
 +                    return true;
 +            }
 +            else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
 +                    this.loadUrl("javascript:cordova.fireDocumentEvent('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)) {
 +                    this.loadUrl("javascript:cordova.fireDocumentEvent('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()) {
 +                this.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
 +            }
 +            this.lastMenuEventTime = event.getEventTime();
 +            return super.onKeyUp(keyCode, event);
 +        }
 +        // If search key
 +        else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
 +            this.loadUrl("javascript:cordova.fireDocumentEvent('searchbutton');");
 +            return true;
 +        }
 +
 +        //Does webkit change this behavior?
 +        return super.onKeyUp(keyCode, 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);
 +    }
 +
 +    public void handlePause(boolean keepRunning)
 +    {
 +        LOG.d(TAG, "Handle the pause");
 +        // Send pause event to JavaScript
 +        this.loadUrl("javascript:try{cordova.fireDocumentEvent('pause');}catch(e){console.log('exception
firing pause event from native');};");
 +
 +        // 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 (including setInterval)
 +            this.pauseTimers();
 +        }
 +    }
 +    
 +    public void handleResume(boolean keepRunning, boolean activityResultKeepRunning)
 +    {
 +        this.loadUrl("javascript:try{cordova.fireDocumentEvent('resume');}catch(e){console.log('exception
firing resume event from native');};");
 +        
 +        // Forward to plugins
 +        if (this.pluginManager != null) {
 +            this.pluginManager.onResume(keepRunning);
 +        }
 +
 +        // Resume JavaScript timers (including setInterval)
 +        this.resumeTimers();
 +    }
 +    
 +    public void handleDestroy()
 +    {
 +        // Send destroy event to JavaScript
 +        this.loadUrl("javascript:try{cordova.require('cordova/channel').onDestroy.fire();}catch(e){console.log('exception
firing destroy event from native');};");
 +
 +        // 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);
 +        }
 +    }
 +    
 +    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(loadedUrl);
 +    }
 +
 +    @Override
 +    public PluginManager getPluginManager() {
 +        return this.pluginManager;
 +    }
 +
 +    @Override
 +    public View getView() {
 +        return this;
 +    }
 +
 +    @Override
 +    public Whitelist getWhitelist() {
 +        return this.internalWhitelist;
 +    }
 +
 +    @Override
 +    public Whitelist getExternalWhitelist() {
 +        return this.externalWhitelist;
 +    }
 +
 +    @Override
 +    public CordovaPreferences getPreferences() {
 +        return preferences;
 +    }
 +
 +    @Override
 +    public void onFilePickerResult(Uri uri) {
 +        if (null == chromeClient.mUploadMessage)
 +            return;
 +        chromeClient.mUploadMessage.onReceiveValue(uri);
 +        chromeClient.mUploadMessage = null;
 +    }
 +    
 +    @Override
 +    public Object postMessage(String id, Object data) {
 +        return pluginManager.postMessage(id, data);
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7f4d5aeb/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/CordovaActivity.java
index 6ec6791,3c12a97..e065a9b
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@@ -48,8 -49,10 +48,9 @@@ import android.view.Menu
  import android.view.MenuItem;
  import android.view.View;
  import android.view.ViewGroup;
+ import android.view.ViewParent;
  import android.view.Window;
  import android.view.WindowManager;
 -import android.webkit.ValueCallback;
  import android.webkit.WebViewClient;
  import android.widget.LinearLayout;
  
@@@ -162,18 -223,13 +156,27 @@@ public class CordovaActivity extends Ac
                      WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
          }
  
+         super.onCreate(savedInstanceState);
+ 
+         if(savedInstanceState != null)
+         {
+             initCallbackClass = savedInstanceState.getString("callbackClass");
+         }
+     }
++    
++    protected void init() {
 +        appView = makeWebView();
 +
 +        // TODO: Have the views set this themselves.
 +        if (preferences.getBoolean("DisallowOverscroll", false)) {
 +            appView.getView().setOverScrollMode(View.OVER_SCROLL_NEVER);
 +        }
 +        createViews();
 +
 +        // TODO: Make this a preference (CB-6153)
 +        // Setup the hardware volume controls to handle volume control
 +        setVolumeControlStream(AudioManager.STREAM_MUSIC);
 +    }
  
      @SuppressWarnings("deprecation")
      protected void loadConfig() {
@@@ -208,8 -267,16 +211,15 @@@
                  1.0F));
  
          // Add web view but make it invisible while loading URL
 -        appView.setVisibility(View.INVISIBLE);
 -        
 +        appView.getView().setVisibility(View.INVISIBLE);
+         // need to remove appView from any existing parent before invoking root.addView(appView)
 -        ViewParent parent = appView.getParent();
++        ViewParent parent = appView.getView().getParent();
+         if ((parent != null) && (parent != root)) {
+             LOG.d(TAG, "removing appView from existing parent");
+             ViewGroup parentGroup = (ViewGroup) parent;
 -            parentGroup.removeView(appView);
++            parentGroup.removeView(appView.getView());
+         }
 -        root.addView((View) appView);
 +        root.addView(appView.getView());
          setContentView(root);
  
          int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);


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


Mime
View raw message