From 0e316321f92714de03a2558f181a9c8b1f733c0a Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Sun, 21 Aug 2011 20:50:57 -0500 Subject: [PATCH] Fix Issue #203: Prompt crashes on Android 3.2 tablet. --- framework/src/com/phonegap/DroidGap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index 1ceb52fc..559be52e 100755 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -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");