From 8a5dec8d8b8610fc09c351be44d70a77cefb3d7e Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Mon, 22 Aug 2011 16:22:22 -0500
Subject: [PATCH] Re-checkin commit for "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 fc210341..0b6b4d50 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");