From c750109bd76e13f70499a380df450394ba573a9a Mon Sep 17 00:00:00 2001
From: Brock Whitten <brock@sintaxi.com>
Date: Wed, 3 Mar 2010 17:07:15 -0800
Subject: [PATCH] Fixes to make it work with the cancer that is Android 1.5

---
 framework/AndroidManifest.xml                  | 2 +-
 framework/src/com/phonegap/DroidGap.java       | 8 ++++----
 framework/src/com/phonegap/NetworkManager.java | 3 +--
 framework/src/com/phonegap/WebViewReflect.java | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/AndroidManifest.xml b/framework/AndroidManifest.xml
index e4d33ba4..3bedc80a 100644
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -38,6 +38,6 @@
         		<action android:name="android.intent.action.PICK" />        		
         </activity>
     </application>
-	<uses-sdk android:minSdkVersion="5" />
+	<uses-sdk android:minSdkVersion="3" />
 
 </manifest> 
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 5764e1a4..5a8bc47d 100644
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -86,9 +86,8 @@ public class DroidGap extends Activity {
         appView.setLayoutParams(webviewParams);
         
         WebViewReflect.checkCompatibility();
-        
-        /* This changes the setWebChromeClient to log alerts to LogCat!  Important for Javascript Debugging */       
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ECLAIR)
+                
+        if (android.os.Build.VERSION.RELEASE.startsWith("2."))
         	appView.setWebChromeClient(new EclairClient(this));        	
         else
         {        
@@ -150,7 +149,8 @@ public class DroidGap extends Activity {
     	appView.addJavascriptInterface(mCompass, "CompassHook");
     	appView.addJavascriptInterface(crypto, "GapCrypto");
     	
-    	if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.DONUT)
+    	
+    	if (android.os.Build.VERSION.RELEASE.startsWith("1."))
     	{
     		cupcakeStorage = new Storage(appView);
     		appView.addJavascriptInterface(cupcakeStorage, "droidStorage");
diff --git a/framework/src/com/phonegap/NetworkManager.java b/framework/src/com/phonegap/NetworkManager.java
index c04c312f..ef578301 100644
--- a/framework/src/com/phonegap/NetworkManager.java
+++ b/framework/src/com/phonegap/NetworkManager.java
@@ -37,8 +37,7 @@ public class NetworkManager {
 			String type = info.getTypeName();
 			return type.equals("WIFI");
 		}
-		else
-			return false;
+		return false;
 	}
 	
 	public boolean isReachable(String uri)
diff --git a/framework/src/com/phonegap/WebViewReflect.java b/framework/src/com/phonegap/WebViewReflect.java
index 2a69cc8f..2d747234 100644
--- a/framework/src/com/phonegap/WebViewReflect.java
+++ b/framework/src/com/phonegap/WebViewReflect.java
@@ -103,4 +103,5 @@ public class WebViewReflect {
 	       }
 			   
 	   }
+	   
 }