github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-07 10:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up merge commit

Browse Source 
Reinstate fix for github issue #96 (b715d20)
Re-remove extra calls to set up client objects (8e31ef7b)
Reinstate license header in CordovaChromeClient.java
This commit is contained in:
Ian Clelland 2014-05-02 10:22:38 -04:00
parent 04b3fc0268
commit 955da2e360
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/org/apache/cordova/AndroidChromeClient.java
View File

@ -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;

3
framework/src/org/apache/cordova/AndroidWebView.java
View File

@ -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();
}

3
framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -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();
}
/**

18
framework/src/org/apache/cordova/CordovaChromeClient.java
View File

@ -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;