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

Merge branch 'master' of git://github.com/phonegap/phonegap-android

Browse Source
This commit is contained in:
macdonst 2011-08-22 13:27:18 -04:00
commit 5180340f18
2 changed files with 3 additions and 2864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2861
framework/assets/www/phonegap.js
View File

File diff suppressed because it is too large Load Diff

6
framework/src/com/phonegap/DroidGap.java
View File

@ -914,13 +914,13 @@ public class DroidGap extends PhonegapActivity {
}
// Polling for JavaScript messages
else if (reqOk && defaultValue.equals("gap_poll:")) {
else if (reqOk && defaultValue != null && defaultValue.equals("gap_poll:")) {
String r = callbackServer.getJavascript();
result.confirm(r);
}
// Calling into CallbackServer
else if (reqOk && defaultValue.equals("gap_callbackServer:")) {
else if (reqOk && defaultValue != null && defaultValue.equals("gap_callbackServer:")) {
String r = "";
if (message.equals("usePolling")) {
r = ""+callbackServer.usePolling();
@ -939,7 +939,7 @@ public class DroidGap extends PhonegapActivity {
// PhoneGap JS has initialized, so show webview
// (This solves white flash seen when rendering HTML)
else if (reqOk && defaultValue.equals("gap_init:")) {
else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
appView.setVisibility(View.VISIBLE);
ctx.spinnerStop();
result.confirm("OK");