You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/05/02 16:25:07 UTC
android commit: Clean up merge commit
Repository: cordova-android
Updated Branches:
refs/heads/pluggable_webview 04b3fc026 -> 955da2e36
Clean up merge commit
Reinstate fix for github issue #96 (b715d20)
Re-remove extra calls to set up client objects (8e31ef7b)
Reinstate license header in CordovaChromeClient.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/955da2e3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/955da2e3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/955da2e3
Branch: refs/heads/pluggable_webview
Commit: 955da2e36048e2d73370478d3bf5102126b6a886
Parents: 04b3fc0
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri May 2 10:22:38 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri May 2 10:22:38 2014 -0400
----------------------------------------------------------------------
.../org/apache/cordova/AndroidChromeClient.java | 3 ---
.../src/org/apache/cordova/AndroidWebView.java | 3 ---
.../src/org/apache/cordova/CordovaActivity.java | 3 ++-
.../org/apache/cordova/CordovaChromeClient.java | 18 ++++++++++++++++++
4 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/955da2e3/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
index edf94b9..1297a6c 100755
--- a/framework/src/org/apache/cordova/AndroidChromeClient.java
+++ b/framework/src/org/apache/cordova/AndroidChromeClient.java
@@ -139,7 +139,6 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
return true;
}
});
- dlg.create();
dlg.show();
return true;
}
@@ -188,7 +187,6 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
return true;
}
});
- dlg.create();
dlg.show();
return true;
}
@@ -284,7 +282,6 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
res.cancel();
}
});
- dlg.create();
dlg.show();
}
return true;
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/955da2e3/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
index 9033162..6a0ac30 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -166,7 +166,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{
Log.d(TAG, "Your activity must implement CordovaInterface to work");
}
- this.setWebChromeClient(this.makeWebChromeClient());
this.loadConfiguration();
this.setup();
}
@@ -189,7 +188,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{
Log.d(TAG, "Your activity must implement CordovaInterface to work");
}
- this.setWebChromeClient(this.makeWebChromeClient());
this.loadConfiguration();
this.setup();
}
@@ -213,7 +211,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{
Log.d(TAG, "Your activity must implement CordovaInterface to work");
}
- this.setWebChromeClient(this.makeWebChromeClient());
this.loadConfiguration();
this.setup();
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/955da2e3/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 eccb094..2278800 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -219,6 +219,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
try {
Class webViewClass = Class.forName(r);
Constructor<CordovaWebView> [] webViewConstructors = webViewClass.getConstructors();
+
if(CordovaWebView.class.isAssignableFrom(webViewClass)) {
for (Constructor<CordovaWebView> constructor : webViewConstructors) {
try {
@@ -269,7 +270,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
* @param webView the default constructed web view object
*/
protected CordovaChromeClient makeChromeClient(CordovaWebView webView) {
- return webView.makeWebChromeClient();
+ return webView.makeWebChromeClient();
}
/**
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/955da2e3/framework/src/org/apache/cordova/CordovaChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java
index c8f38c1..847a466 100644
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -1,3 +1,21 @@
+/*
+ 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.net.Uri;