public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Optimize loading "about:blank"

Browse Source
This commit is contained in:
Bryce Curtis 2012-05-16 23:27:19 -05:00
parent f74d8aaf2b
commit 5c48ccd92a
1 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
framework/src/org/apache/cordova/CordovaWebView.java Normal file → Executable file
View File

@ -291,15 +291,21 @@ public class CordovaWebView extends WebView {
*/ */
@Override @Override
public void loadUrl(String url) { public void loadUrl(String url) {
String initUrl = this.getProperty("url", null); if (url.equals("about:blank") || url.startsWith("javascript:")) {
this.loadUrlNow(url);
// If first page of app, then set URL to load to be the one passed in
if (initUrl == null || (this.urls.size() > 0)) {
this.loadUrlIntoView(url);
} }
// Otherwise use the URL specified in the activity's extras bundle
else { else {
this.loadUrlIntoView(initUrl);
String initUrl = this.getProperty("url", null);
// If first page of app, then set URL to load to be the one passed in
if (initUrl == null || (this.urls.size() > 0)) {
this.loadUrlIntoView(url);
}
// Otherwise use the URL specified in the activity's extras bundle
else {
this.loadUrlIntoView(initUrl);
}
} }
} }
@ -329,74 +335,67 @@ public class CordovaWebView extends WebView {
* @param url * @param url
*/ */
public void loadUrlIntoView(final String url) { public void loadUrlIntoView(final String url) {
if (!url.startsWith("javascript:")) { LOG.d(TAG, ">>> loadUrl(" + url + ")");
LOG.d(TAG, ">>> loadUrl(" + url + ")");
this.url = url; this.url = url;
if (this.baseUrl == null) { if (this.baseUrl == null) {
int i = url.lastIndexOf('/'); int i = url.lastIndexOf('/');
if (i > 0) { if (i > 0) {
this.baseUrl = url.substring(0, i + 1); this.baseUrl = url.substring(0, i + 1);
} }
else { else {
this.baseUrl = this.url + "/"; this.baseUrl = this.url + "/";
}
this.pluginManager.init();
if (!this.useBrowserHistory) {
this.urls.push(url);
}
} }
// Create a timeout timer for loadUrl this.pluginManager.init();
final CordovaWebView me = this;
final int currentLoadUrlTimeout = me.loadUrlTimeout;
final int loadUrlTimeoutValue = Integer.parseInt(this.getProperty("loadUrlTimeoutValue", "20000"));
// Timeout error method if (!this.useBrowserHistory) {
final Runnable loadError = new Runnable() { this.urls.push(url);
public void run() { }
me.stopLoading();
LOG.e(TAG, "CordovaWebView: TIMEOUT ERROR!");
if (viewClient != null) {
viewClient.onReceivedError(me, -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.mCtx.getActivity().runOnUiThread(loadError);
}
}
};
// Load url
this.mCtx.getActivity().runOnUiThread(new Runnable() {
public void run() {
Thread thread = new Thread(timeoutCheck);
thread.start();
me.loadUrlNow(url);
}
});
} }
// If Javascript, then just load it now // Create a timeout timer for loadUrl
else { final CordovaWebView me = this;
super.loadUrl(url); final int currentLoadUrlTimeout = me.loadUrlTimeout;
} final int loadUrlTimeoutValue = Integer.parseInt(this.getProperty("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(me, -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.mCtx.getActivity().runOnUiThread(loadError);
}
}
};
// Load url
this.mCtx.getActivity().runOnUiThread(new Runnable() {
public void run() {
Thread thread = new Thread(timeoutCheck);
thread.start();
me.loadUrlNow(url);
}
});
} }
/** /**