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

Throwing code over the fence for CB-1128, We need a Samsung Galaxy S running 2.3.5 to confirm this fix

Browse Source
This commit is contained in:
Joe Bowser 2012-07-25 12:54:03 -07:00
parent b234b0bded
commit 401584dbd8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -740,10 +740,10 @@ public class DroidGap extends Activity implements CordovaInterface {
} }
/** /**
* Stop spinner. * Stop spinner - Must be called from UI thread
*/ */
public void spinnerStop() { public void spinnerStop() {
if (this.spinnerDialog != null) { if (this.spinnerDialog != null && this.spinnerDialog.isShowing()) {
this.spinnerDialog.dismiss(); this.spinnerDialog.dismiss();
this.spinnerDialog = null; this.spinnerDialog = null;
} }
@ -811,10 +811,7 @@ public class DroidGap extends Activity implements CordovaInterface {
*/ */
public void onReceivedError(final int errorCode, final String description, final String failingUrl) { public void onReceivedError(final int errorCode, final String description, final String failingUrl) {
final DroidGap me = this; final DroidGap me = this;
// Stop "app loading" spinner if showing
this.spinnerStop();
// If errorUrl specified, then load it // If errorUrl specified, then load it
final String errorUrl = me.getStringProperty("errorUrl", null); final String errorUrl = me.getStringProperty("errorUrl", null);
if ((errorUrl != null) && (errorUrl.startsWith("file://") || errorUrl.indexOf(me.baseUrl) == 0 || this.appView.isUrlWhiteListed(errorUrl)) && (!failingUrl.equals(errorUrl))) { if ((errorUrl != null) && (errorUrl.startsWith("file://") || errorUrl.indexOf(me.baseUrl) == 0 || this.appView.isUrlWhiteListed(errorUrl)) && (!failingUrl.equals(errorUrl))) {
@ -822,6 +819,8 @@ public class DroidGap extends Activity implements CordovaInterface {
// Load URL on UI thread // Load URL on UI thread
me.runOnUiThread(new Runnable() { me.runOnUiThread(new Runnable() {
public void run() { public void run() {
// Stop "app loading" spinner if showing
me.spinnerStop();
me.appView.showWebPage(errorUrl, false, true, null); me.appView.showWebPage(errorUrl, false, true, null);
} }
}); });