github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Managed to get this building minus Jail Activity, still a long way to go

Browse Source
This commit is contained in:
Joe Bowser
2012-04-10 17:34:34 -07:00
parent 95013e87dd
commit 87238f26f6
12 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/org/apache/cordova/CordovaWebViewClient.java
+39 -25
View File
@@ -20,6 +20,7 @@ package org.apache.cordova;
import org.apache.cordova.api.LOG;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -41,7 +42,8 @@ import android.webkit.WebViewClient;
public class CordovaWebViewClient extends WebViewClient {
private static final String TAG = "Cordova";
DroidGap ctx;
Context ctx;
DroidGap droidGap;
CordovaWebView appView;
private boolean doClearHistory = false;
@@ -50,14 +52,16 @@ public class CordovaWebViewClient extends WebViewClient {
*
* @param ctx
*/
public CordovaWebViewClient(DroidGap ctx) {
public CordovaWebViewClient(Context ctx) {
this.ctx = ctx;
appView = ctx.appView;
//appView = ctx.appView;
}
public CordovaWebViewClient(Context ctx, CordovaWebView view)
{
this.ctx = (DroidGap) ctx;
this.ctx = ctx;
if(ctx.getClass().equals(DroidGap.class))
this.droidGap = (DroidGap) ctx;
appView = view;
}
@@ -146,8 +150,9 @@ public class CordovaWebViewClient extends WebViewClient {
// If our app or file:, then load into a new Cordova webview container by starting a new instance of our activity.
// Our app continues to run. When BACK is pressed, our app is redisplayed.
if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || ctx.isUrlWhiteListed(url)) {
this.ctx.loadUrl(url);
//if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || ctx.isUrlWhiteListed(url)) {
if (url.startsWith("file://") || appView.isUrlWhiteListed(url)) {
appView.loadUrl(url);
}
// If not our application, let default viewer handle
@@ -221,31 +226,35 @@ public class CordovaWebViewClient extends WebViewClient {
}
// Clear timeout flag
this.ctx.loadUrlTimeout++;
//this.ctx.loadUrlTimeout++;
// Try firing the onNativeReady event in JS. If it fails because the JS is
// not loaded yet then just set a flag so that the onNativeReady can be fired
// from the JS side when the JS gets to that code.
if (!url.equals("about:blank")) {
ctx.appView.loadUrl("javascript:try{ cordova.require('cordova/channel').onNativeReady.fire();}catch(e){_nativeReady = true;}");
this.ctx.postMessage("onNativeReady", null);
appView.loadUrl("javascript:try{ cordova.require('cordova/channel').onNativeReady.fire();}catch(e){_nativeReady = true;}");
//appView.postMessage("onNativeReady", null);
}
// Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
if (ctx.appView.getVisibility() == View.INVISIBLE) {
if (appView.getVisibility() == View.INVISIBLE) {
Thread t = new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(2000);
ctx.runOnUiThread(new Runnable() {
((Activity) ctx).runOnUiThread(new Runnable() {
public void run() {
if (ctx.splashscreen != 0) {
ctx.root.setBackgroundResource(0);
if(droidGap != null)
{
if (droidGap.splashscreen != 0) {
droidGap.root.setBackgroundResource(0);
}
appView.setVisibility(View.VISIBLE);
}
ctx.appView.setVisibility(View.VISIBLE);
ctx.spinnerStop();
}
});
});
} catch (InterruptedException e) {
}
}
@@ -259,7 +268,8 @@ public class CordovaWebViewClient extends WebViewClient {
if (appView.callbackServer != null) {
appView.callbackServer.destroy();
}
this.ctx.endActivity();
if(droidGap != null)
droidGap.endActivity();
}
}
@@ -276,14 +286,17 @@ public class CordovaWebViewClient extends WebViewClient {
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
LOG.d(TAG, "DroidGap: GapViewClient.onReceivedError: Error code=%s Description=%s URL=%s", errorCode, description, failingUrl);
// Clear timeout flag
this.ctx.loadUrlTimeout++;
if(droidGap != null)
{
// Clear timeout flag
this.droidGap.loadUrlTimeout++;
// Stop "app loading" spinner if showing
this.ctx.spinnerStop();
// Stop "app loading" spinner if showing
this.droidGap.spinnerStop();
// Handle error
this.ctx.onReceivedError(errorCode, description, failingUrl);
// Handle error
this.droidGap.onReceivedError(errorCode, description, failingUrl);
}
}
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
@@ -313,8 +326,9 @@ public class CordovaWebViewClient extends WebViewClient {
* If you do a document.location.href the url does not get pushed on the stack
* so we do a check here to see if the url should be pushed.
*/
if (!this.ctx.peekAtUrlStack().equals(url)) {
this.ctx.pushUrl(url);
if (this.droidGap != null && !this.droidGap.peekAtUrlStack().equals(url)) {
droidGap.pushUrl(url);
}
}
}