github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

A quick stab at CB-510

Browse Source
This commit is contained in:
Joe Bowser 2012-05-10 16:42:37 -07:00
parent a705b72740
commit f3e70c79eb
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
framework/src/org/apache/cordova/DroidGap.java
View File

@ -336,41 +336,20 @@ public class DroidGap extends Activity implements CordovaInterface {
} }
} }
/** /*
* Load the url into the webview. * Load the spinner
* *
* @param url
*/ */
private void loadUrlIntoView(final String url) { void loadSpinner()
if (!url.startsWith("javascript:")) { {
LOG.d(TAG, "DroidGap.loadUrl(%s)", url);
}
if (!url.startsWith("javascript:")) {
LOG.d(TAG, "DroidGap: url=%s baseUrl=%s", url, baseUrl);
}
// Load URL on UI thread
final DroidGap me = this;
this.runOnUiThread(new Runnable() {
public void run() {
// Init web view if not already done
if (me.appView == null) {
me.init();
}
// Handle activity parameters (TODO: Somehow abstract this)
me.handleActivityParameters();
// If loadingDialog property, then show the App loading dialog for first page of app // If loadingDialog property, then show the App loading dialog for first page of app
// (This doesn't seem to actually do anything here) // (This doesn't seem to actually do anything here)
String loading = null; String loading = null;
if (me.urls.size() == 1) { if (this.urls.size() == 1) {
loading = me.getStringProperty("loadingDialog", null); loading = this.getStringProperty("loadingDialog", null);
} }
else { else {
loading = me.getStringProperty("loadingPageDialog", null); loading = this.getStringProperty("loadingPageDialog", null);
} }
if (loading != null) { if (loading != null) {
@ -388,8 +367,48 @@ public class DroidGap extends Activity implements CordovaInterface {
message = loading; message = loading;
} }
} }
me.spinnerStart(title, message); this.spinnerStart(title, message);
} }
}
/**
* Load the url into the webview.
*
* @param url
*/
private void loadUrlIntoView(final String url) {
if (!url.startsWith("javascript:")) {
LOG.d(TAG, "DroidGap.loadUrl(%s)", url);
}
if (!url.startsWith("javascript:")) {
LOG.d(TAG, "DroidGap: url=%s baseUrl=%s", url, baseUrl);
}
// Load URL on UI thread
final DroidGap me = this;
final Runnable loadError = new Runnable() {
public void run() {
me.appView.stopLoading();
LOG.e(TAG, "DroidGap: TIMEOUT ERROR! - calling webViewClient");
appView.viewClient.onReceivedError(me.appView, -6, "The connection to the server was unsuccessful.", url);
}
};
this.runOnUiThread(new Runnable() {
public void run() {
// Init web view if not already done
if (me.appView == null) {
me.init();
}
// Handle activity parameters (TODO: Somehow abstract this)
me.handleActivityParameters();
// Then load the spinner
me.loadSpinner();
// Create a timeout timer for loadUrl // Create a timeout timer for loadUrl
final int currentLoadUrlTimeout = me.loadUrlTimeout; final int currentLoadUrlTimeout = me.loadUrlTimeout;
@ -405,15 +424,7 @@ public class DroidGap extends Activity implements CordovaInterface {
// If timeout, then stop loading and handle error // If timeout, then stop loading and handle error
if (me.loadUrlTimeout == currentLoadUrlTimeout) { if (me.loadUrlTimeout == currentLoadUrlTimeout) {
me.runOnUiThread(loadError);
//TURTLES, TURTLES ALL THE WAY DOWN!!!!!
me.runOnUiThread(new Runnable() {
public void run() {
me.appView.stopLoading();
LOG.e(TAG, "DroidGap: TIMEOUT ERROR! - calling webViewClient");
appView.viewClient.onReceivedError(me.appView, -6, "The connection to the server was unsuccessful.", url);
};
});
} }
} }