Tagging 1.4.1

Device.overrideBackButton
Device.exitApp
Device.resetBackButton

.gitignore

@@ -7,9 +7,10 @@ framework/proguard.cfg
 framework/phonegap.jar
 framework/phonegap-*.jar
 framework/bin
+framework/test/com/phonegap/*.class
 framework/assets/www/.DS_Store
 framework/assets/www/phonegap-*.js
 example
-test
+./test
 tmp
-*.tmp
+*.tmp

LICENSE

@@ -200,3 +200,227 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+   SUBCOMPONENTS
+
+   Apache Callback includes software components under different license terms.
+   Your use of these subcomponents is subject to the terms and conditions of
+   the following licenses.
+
+   For the framework/libs/junit-4.10.jar component:
+
+   Common Public License - v 1.0
+
+   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+   LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+   CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+   1. DEFINITIONS
+
+   "Contribution" means:
+
+         a) in the case of the initial Contributor, the initial code and
+            documentation distributed under this Agreement, and
+         b) in the case of each subsequent Contributor:
+
+         i) changes to the Program, and
+
+         ii) additions to the Program;
+
+         where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+   2. GRANT OF RIGHTS
+
+         a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+         b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder. 
+
+         c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are provided by
+any Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+         d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement. 
+
+   3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+         a) it complies with the terms and conditions of this Agreement; and
+
+         b) its license agreement:
+
+         i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; 
+
+         ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits; 
+
+         iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+         iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+         a) it must be made available under this Agreement; and 
+
+         b) a copy of this Agreement must be included with each copy of the
+Program. 
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such
+Recipient under this Agreement shall terminate as of the date such litigation
+is filed. In addition, if Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation. 

NOTICE

@@ -4,3 +4,9 @@ Copyright 2011 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org)
 
+This product also includes the following third-party components:
+
+  * Junit (framework/libs/junit-4.10.jar) (http://junit.sourceforge.net)
+  
+    Licensed under the Common Public License
+    http://junit.sourceforge.net/cpl-v10.html

README.md

@@ -1,7 +1,16 @@
-PhoneGap Android
+Cordova Android
 ===
 
-PhoneGap Android is an Android application library that allows for PhoneGap based projects to be built for the Android Platform. PhoneGap based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript. 
+Cordova Android is an Android application library that allows for Cordova based projects to be built for the Android Platform. Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript. 
+
+Apache Cordova is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Apache Incubator project.
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other
+successful ASF projects. While incubation status is not necessarily
+a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
 
 Requires
 ---
@@ -10,21 +19,31 @@ Requires
 - Apache ANT
 - Android SDK [http://developer.android.com](http://developer.android.com)
 
-PhoneGap Android Developer Tools
+
+Building
 ---
 
-The PhoneGap developer tooling is split between general tooling and project level tooling. 
+To create your phonegap.jar, run in the framework directory:
+
+    android update project -p . -t android-15
+    ant jar
+
+
+Cordova Android Developer Tools
+---
+
+The Cordova developer tooling is split between general tooling and project level tooling. 
 
 General Commands
 
-    ./bin/create [path package activity] ... create the ./example app or a phonegap android project
+    ./bin/create [path package activity] ... create the ./example app or a cordova android project
     ./bin/bench ............................ generate a bench proj
     ./bin/autotest ......................... test the cli tools
     ./bin/test ............................. run mobile-spec
 
 Project Commands
 
-These commands live in a generated PhoneGap Android project.
+These commands live in a generated Cordova Android project.
 
     ./phonegap/debug [path] ..................... install to first device
     ./phonegap/emulate .......................... start avd (emulator) named default
@@ -52,12 +71,12 @@ Running the [callback/callback-test](http://github.com/callback/callback-test) t
 
     ./bin/test
 
-Creating a new PhoneGap Android Project
+Creating a new Cordova Android Project
 ---
 
     ./bin/create ~/Desktop/myapp com.phonegap.special MyApp
 
-Importing a PhoneGap Android Project into Eclipse
+Importing a Cordova Android Project into Eclipse
 ----
 
 1. File > New > Project...

VERSION

@@ -1 +1 @@
-1.3.0rc2
+1.4.1

bin/templates/project/phonegap/templates/project/assets/www/index.html

@@ -4,8 +4,8 @@
     <meta name="viewport" content="width=320; user-scalable=no" />
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
-	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
-	  <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0rc2.js"></script>
+	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
+	  <script type="text/javascript" charset="utf-8" src="phonegap-1.4.1.js"></script>
 	  <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>
@@ -29,8 +29,12 @@
     <a href="#" class="btn large" onclick="beep();">Beep</a>
     <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
     <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
-    <a href="#" class="btn large" onclick="get_contacts();">Get Phone's Contacts</a>
-    <a href="#" class="btn large" onclick="check_network();">Check Network</a>
+    <a href="#" class="btn large" onclick="get_contacts();return false;">Get Phone's Contacts</a>
+    <a href="#" class="btn large" onclick="check_network();return false;">Check Network</a>
+    <dl>
+	<dt>Compass Heading:</dt><dd id="h">Off</dd>
+    </dl>
+    <a href="#" class="btn large" onclick="toggleCompass();return false;">Toggle Compass</a>
     <div id="viewport" class="viewport" style="display: none;">
       <img style="width:60px;height:60px" id="test_img" src="" />
     </div>

bin/templates/project/phonegap/templates/project/assets/www/main.js

@@ -119,6 +119,25 @@ function check_network() {
     confirm('Connection type:\n ' + states[networkState]);
 }
 
+var watchID = null;
+
+function updateHeading(h) {
+    document.getElementById('h').innerHTML = h.magneticHeading;
+}
+
+function toggleCompass() {
+    if (watchID !== null) {
+        navigator.compass.clearWatch(watchID);
+        watchID = null;
+        updateHeading({ magneticHeading : "Off"});
+    } else {        
+        var options = { frequency: 1000 };
+        watchID = navigator.compass.watchHeading(updateHeading, function(e) {
+            alert('Compass Error: ' + e.code);
+        }, options);
+    }
+}
+
 function init() {
     // the next line makes it impossible to see Contacts on the HTC Evo since it
     // doesn't have a scroll button

framework/assets/js/app.js

@@ -75,19 +75,6 @@ App.prototype.backHistory = function() {
     PhoneGap.exec(null, null, "App", "backHistory", []);
 };
 
-/**
- * Override the default behavior of the Android back button.
- * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
- *
- * Note: The user should not have to call this method.  Instead, when the user
- *       registers for the "backbutton" event, this is automatically done.
- *
- * @param override		T=override, F=cancel override
- */
-App.prototype.overrideBackbutton = function(override) {
-    PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
-};
-
 /**
  * Exit and terminate the application.
  */

framework/assets/js/camera.js

@@ -127,7 +127,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
         options.maxResolution = 0;
     }
     if (options.destinationType === null || typeof options.destinationType === "undefined") {
-        options.destinationType = Camera.DestinationType.DATA_URL;
+        options.destinationType = Camera.DestinationType.FILE_URI;
     }
     if (options.sourceType === null || typeof options.sourceType === "undefined") {
         options.sourceType = Camera.PictureSourceType.CAMERA;

framework/assets/js/device.js

@@ -75,39 +75,6 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
     PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
 };
 
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * You must explicitly override the back button.
- */
-Device.prototype.overrideBackButton = function() {
-	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
-	navigator.app.overrideBackbutton(true);
-};
-
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * This resets the back button to the default behaviour
- */
-Device.prototype.resetBackButton = function() {
-	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
-	navigator.app.overrideBackbutton(false);
-};
-
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * This terminates the activity!
- */
-Device.prototype.exitApp = function() {
-	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
-	navigator.app.exitApp();
-};
-
 PhoneGap.addConstructor(function() {
     if (typeof navigator.device === "undefined") {
         navigator.device = window.device = new Device();

framework/assets/js/file.js

@@ -928,11 +928,9 @@ LocalFileSystem.prototype._castFS = function(pluginResult) {
 LocalFileSystem.prototype._castEntry = function(pluginResult) {
     var entry = null;
     if (pluginResult.message.isDirectory) {
-        console.log("This is a dir");
         entry = new DirectoryEntry();
     }
     else if (pluginResult.message.isFile) {
-        console.log("This is a file");
         entry = new FileEntry();
     }
     entry.isDirectory = pluginResult.message.isDirectory;
@@ -956,11 +954,9 @@ LocalFileSystem.prototype._castEntries = function(pluginResult) {
 LocalFileSystem.prototype._createEntry = function(castMe) {
     var entry = null;
     if (castMe.isDirectory) {
-        console.log("This is a dir");
         entry = new DirectoryEntry();
     }
     else if (castMe.isFile) {
-        console.log("This is a file");
         entry = new FileEntry();
     }
     entry.isDirectory = castMe.isDirectory;

framework/assets/www/index.html

@@ -1,7 +1,7 @@
 <html>
   <head>
     <title></title>
-    <script src="phonegap-1.3.0rc2.js"></script>
+    <script src="phonegap-1.4.1.js"></script>
   </head>
   <body>
 

framework/build.xml

@@ -155,6 +155,35 @@
       <jar jarfile="phonegap-${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
     </target>
 
+    <!-- tests for Java files -->
+    <property name="test.dir" location="test/com/phonegap" />
+
+    <path id="test.classpath">
+        <!-- requires both junit and phonegap -->
+        <pathelement location="libs/junit-4.10.jar" />
+        <pathelement location="phonegap-${version}.jar" />
+        <pathelement location="${test.dir}" />
+    </path>
+
+    <target name="compile-test">
+        <javac srcdir="${test.dir}" >
+            <classpath refid="test.classpath" />
+        </javac>
+    </target>
+
+    <target name="test" depends="jar, compile-test">
+        <junit showoutput="true">
+            <classpath refid="test.classpath" />
+            <formatter type="brief" usefile="false" />
+            <batchtest fork="yes">
+                <fileset dir="${test.dir}">
+                    <include name="*Test.java" />
+                    <include name="**/*Test.java" />
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
     <target name="phonegap_debug" depends="build-javascript, debug">
     </target>
 

framework/res/xml/phonegap.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phonegap>
-    <access origin="http://127.0.0.1*"/>
+	<!--  
+	access elements control the Android whitelist.  
+	Domains are assumed blocked unless set otherwise
+	 -->
+
+    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+
+	<!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
+	<!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
+	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+
     <log level="DEBUG"/>
+    <preference name="classicRender" value="true" />
 </phonegap>
+
+
+

framework/src/com/phonegap/AuthenticationToken.java

@@ -0,0 +1,51 @@
+package com.phonegap;
+
+/**
+ * The Class AuthenticationToken defines the userName and password to be used for authenticating a web resource
+ */
+public class AuthenticationToken {
+    private String userName;
+    private String password;
+    
+    /**
+     * Gets the user name.
+     * 
+     * @return the user name
+     */
+    public String getUserName() {
+        return userName;
+    }
+    
+    /**
+     * Sets the user name.
+     * 
+     * @param userName
+     *            the new user name
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    
+    /**
+     * Gets the password.
+     * 
+     * @return the password
+     */
+    public String getPassword() {
+        return password;
+    }
+    
+    /**
+     * Sets the password.
+     * 
+     * @param password
+     *            the new password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+    
+    
+    
+}

framework/src/com/phonegap/CallbackServer.java

@@ -314,9 +314,10 @@ public class CallbackServer implements Runnable {
 	 * @return int
 	 */
 	public int getSize() {
-		int size = this.javascript.size();
-		//System.out.println("getSize() = " + size);
-		return size;
+	    synchronized(this) {
+	        int size = this.javascript.size();
+	        return size;
+	    }
 	}
 	
 	/**
@@ -325,17 +326,16 @@ public class CallbackServer implements Runnable {
 	 * @return String
 	 */
 	public String getJavascript() {
-		if (this.javascript.size() == 0) {
-			return null;
-		}
-		String statement = this.javascript.remove(0);
-		//System.out.println("CallbackServer.getJavascript() = " + statement);
-		if (this.javascript.size() == 0) {
-			synchronized (this) { 
-				this.empty = true;
-			}
-		}
-		return statement;
+	    synchronized(this) {
+	        if (this.javascript.size() == 0) {
+	            return null;
+	        }
+	        String statement = this.javascript.remove(0);
+	        if (this.javascript.size() == 0) { 
+	            this.empty = true;
+	        }
+	        return statement;
+	    }
 	}
 	
 	/**
@@ -344,12 +344,11 @@ public class CallbackServer implements Runnable {
 	 * @param statement
 	 */
 	public void sendJavascript(String statement) {
-		//System.out.println("CallbackServer.sendJavascript("+statement+")");
-		this.javascript.add(statement);
-		synchronized (this) { 
-			this.empty = false;
-			this.notify();
-		}
+	    synchronized (this) { 
+	        this.javascript.add(statement);
+	        this.empty = false;
+	        this.notify();
+	    }
 	}
 	
 	/* The Following code has been modified from original implementation of URLEncoder */

framework/src/com/phonegap/CameraLauncher.java

@@ -101,7 +101,7 @@ public class CameraLauncher extends Plugin {
         try {
             if (action.equals("takePicture")) {
                 int srcType = CAMERA;
-                int destType = DATA_URL;
+                int destType = FILE_URI;
                 this.targetHeight = 0;
                 this.targetWidth = 0;
                 this.encodingType = JPEG;

framework/src/com/phonegap/ContactAccessorSdk5.java

@@ -819,50 +819,49 @@ public class ContactAccessorSdk5 extends ContactAccessor {
   public String save(JSONObject contact) {
     AccountManager mgr = AccountManager.get(mApp);
     Account[] accounts = mgr.getAccounts();
-    Account account = null;
+    String accountName = null;
+    String accountType = null;
 
-    if (accounts.length == 1)
-      account = accounts[0];
-    else if (accounts.length > 1) {
-      for(Account a : accounts){
-        if(a.type.contains("eas")&& a.name.matches(EMAIL_REGEXP)) /*Exchange ActiveSync*/
-        {
-          account = a;
-          break;
-        }
-      } 
-      if(account == null){
-        for(Account a : accounts){
-          if(a.type.contains("com.google") && a.name.matches(EMAIL_REGEXP)) /*Google sync provider*/
-          {
-            account = a;
-            break;
-          }
-        }
-      }
-      if(account == null){
-        for(Account a : accounts){
-          if(a.name.matches(EMAIL_REGEXP)) /*Last resort, just look for an email address...*/
-          {
-            account = a;
-            break;
-          }
-        } 
-      }
+    if (accounts.length == 1) {
+        accountName = accounts[0].name;
+        accountType = accounts[0].type;
     }
-    
-    if(account == null) {
-      return null;
+    else if (accounts.length > 1) {
+        for(Account a : accounts) {
+            if(a.type.contains("eas")&& a.name.matches(EMAIL_REGEXP)) /*Exchange ActiveSync*/ {
+                accountName = a.name;
+                accountType = a.type;
+                break;
+            }
+        } 
+        if(accountName == null){
+            for(Account a : accounts){
+                if(a.type.contains("com.google") && a.name.matches(EMAIL_REGEXP)) /*Google sync provider*/ {
+                    accountName = a.name;
+                    accountType = a.type;
+                    break;
+                }
+            }
+        }
+        if(accountName == null){
+            for(Account a : accounts){
+                if(a.name.matches(EMAIL_REGEXP)) /*Last resort, just look for an email address...*/ {
+                    accountName = a.name;
+                    accountType = a.type;
+                    break;
+                }
+            }
+        }
     }
 
     String id = getJsonString(contact, "id");
     // Create new contact
     if (id == null) {
-      return createNewContact(contact, account);
+      return createNewContact(contact, accountType, accountName);
     }
     // Modify existing contact
     else {
-      return modifyContact(id, contact, account);
+      return modifyContact(id, contact, accountType, accountName);
     }
   }
 
@@ -873,7 +872,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    * @param contact the contact to be saved
    * @param account the account to be saved under
    */
-  private String modifyContact(String id, JSONObject contact, Account account) {
+  private String modifyContact(String id, JSONObject contact, String accountType, String accountName) {
     // Get the RAW_CONTACT_ID which is needed to insert new values in an already existing contact.
     // But not needed to update existing values.
     int rawId = (new Integer(getJsonString(contact,"rawId"))).intValue();
@@ -883,8 +882,8 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     
     //Add contact type
     ops.add(ContentProviderOperation.newUpdate(ContactsContract.RawContacts.CONTENT_URI)
-            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
-            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, accountType)
+            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, accountName)
             .build());
     
     // Modify name
@@ -1427,14 +1426,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    * @param contact the contact to be saved
    * @param account the account to be saved under
    */
-  private String createNewContact(JSONObject contact, Account account) {
+  private String createNewContact(JSONObject contact, String accountType, String accountName) {
     // Create a list of attributes to add to the contact database
     ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
 
     //Add contact type
     ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
-            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
-            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, accountType)
+            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, accountName)
             .build());
 
     // Add name

framework/src/com/phonegap/CordovaChromeClient.java

@@ -0,0 +1,314 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package com.phonegap;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import com.phonegap.api.LOG;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.KeyEvent;
+import android.view.View;
+import android.webkit.ConsoleMessage;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
+import android.webkit.WebChromeClient;
+import android.webkit.WebStorage;
+import android.webkit.WebView;
+import android.webkit.GeolocationPermissions.Callback;
+import android.widget.EditText;
+
+/**
+ * This class is the WebChromeClient that implements callbacks for our web view.
+ */
+public class CordovaChromeClient extends WebChromeClient {
+    
+
+    private String TAG = "PhoneGapLog";
+    private long MAX_QUOTA = 100 * 1024 * 1024;
+    private DroidGap ctx;
+    
+    /**
+     * Constructor.
+     * 
+     * @param ctx
+     */
+    public CordovaChromeClient(Context ctx) {
+        this.ctx = (DroidGap) ctx;
+    }
+
+    /**
+     * Tell the client to display a javascript alert dialog.
+     * 
+     * @param view
+     * @param url
+     * @param message
+     * @param result
+     */
+    @Override
+    public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
+        AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
+        dlg.setMessage(message);
+        dlg.setTitle("Alert");
+        //Don't let alerts break the back button
+        dlg.setCancelable(true);
+        dlg.setPositiveButton(android.R.string.ok,
+            new AlertDialog.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    result.confirm();
+                }
+            });
+        dlg.setOnCancelListener(
+           new DialogInterface.OnCancelListener() {
+               public void onCancel(DialogInterface dialog) {
+                   result.confirm();
+                   }
+               });
+        dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            //DO NOTHING
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if(keyCode == KeyEvent.KEYCODE_BACK)
+                {
+                    result.confirm();
+                    return false;
+                }
+                else
+                    return true;
+                }
+            });
+        dlg.create();
+        dlg.show();
+        return true;
+    }       
+
+    /**
+     * Tell the client to display a confirm dialog to the user.
+     * 
+     * @param view
+     * @param url
+     * @param message
+     * @param result
+     */
+    @Override
+    public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
+        AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
+        dlg.setMessage(message);
+        dlg.setTitle("Confirm");
+        dlg.setCancelable(true);
+        dlg.setPositiveButton(android.R.string.ok, 
+            new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    result.confirm();
+                }
+            });
+        dlg.setNegativeButton(android.R.string.cancel, 
+            new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    result.cancel();
+                }
+            });
+        dlg.setOnCancelListener(
+            new DialogInterface.OnCancelListener() {
+                public void onCancel(DialogInterface dialog) {
+                    result.cancel();
+                    }
+                });
+        dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            //DO NOTHING
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if(keyCode == KeyEvent.KEYCODE_BACK)
+                {
+                    result.cancel();
+                    return false;
+                }
+                else
+                    return true;
+                }
+            });
+        dlg.create();
+        dlg.show();
+        return true;
+    }
+
+    /**
+     * Tell the client to display a prompt dialog to the user. 
+     * If the client returns true, WebView will assume that the client will 
+     * handle the prompt dialog and call the appropriate JsPromptResult method.
+     * 
+     * Since we are hacking prompts for our own purposes, we should not be using them for 
+     * this purpose, perhaps we should hack console.log to do this instead!
+     * 
+     * @param view
+     * @param url
+     * @param message
+     * @param defaultValue
+     * @param result
+     */
+    @Override
+    public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+        
+        // Security check to make sure any requests are coming from the page initially
+        // loaded in webview and not another loaded in an iframe.
+        boolean reqOk = false;
+        if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || ctx.isUrlWhiteListed(url)) {
+            reqOk = true;
+        }
+        
+        // Calling PluginManager.exec() to call a native service using 
+        // prompt(this.stringify(args), "gap:"+this.stringify([service, action, callbackId, true]));
+        if (reqOk && defaultValue != null && defaultValue.length() > 3 && defaultValue.substring(0, 4).equals("gap:")) {
+            JSONArray array;
+            try {
+                array = new JSONArray(defaultValue.substring(4));
+                String service = array.getString(0);
+                String action = array.getString(1);
+                String callbackId = array.getString(2);
+                boolean async = array.getBoolean(3);
+                String r = ctx.pluginManager.exec(service, action, callbackId, message, async);
+                result.confirm(r);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        
+        // Polling for JavaScript messages 
+        else if (reqOk && defaultValue != null && defaultValue.equals("gap_poll:")) {
+            String r = ctx.callbackServer.getJavascript();
+            result.confirm(r);
+        }
+        
+        // Calling into CallbackServer
+        else if (reqOk && defaultValue != null && defaultValue.equals("gap_callbackServer:")) {
+            String r = "";
+            if (message.equals("usePolling")) {
+                r = ""+ ctx.callbackServer.usePolling();
+            }
+            else if (message.equals("restartServer")) {
+                ctx.callbackServer.restartServer();
+            }
+            else if (message.equals("getPort")) {
+                r = Integer.toString(ctx.callbackServer.getPort());
+            }
+            else if (message.equals("getToken")) {
+                r = ctx.callbackServer.getToken();
+            }
+            result.confirm(r);
+        }
+        
+        // PhoneGap JS has initialized, so show webview
+        // (This solves white flash seen when rendering HTML)
+        else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
+            ctx.appView.setVisibility(View.VISIBLE);
+            ctx.spinnerStop();
+            result.confirm("OK");
+        }
+
+        // Show dialog
+        else {
+            final JsPromptResult res = result;
+            AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
+            dlg.setMessage(message);
+            final EditText input = new EditText(this.ctx);
+            if (defaultValue != null) {
+                input.setText(defaultValue);
+            }
+            dlg.setView(input);
+            dlg.setCancelable(false);
+            dlg.setPositiveButton(android.R.string.ok, 
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                    String usertext = input.getText().toString();
+                    res.confirm(usertext);
+                }
+            });
+            dlg.setNegativeButton(android.R.string.cancel, 
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                    res.cancel();
+                }
+            });
+            dlg.create();
+            dlg.show();
+        }
+        return true;
+    }
+    
+    /**
+     * Handle database quota exceeded notification.
+     *
+     * @param url
+     * @param databaseIdentifier
+     * @param currentQuota
+     * @param estimatedSize
+     * @param totalUsedQuota
+     * @param quotaUpdater
+     */
+    @Override
+    public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
+            long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater)
+    {
+        LOG.d(TAG, "DroidGap:  onExceededDatabaseQuota estimatedSize: %d  currentQuota: %d  totalUsedQuota: %d", estimatedSize, currentQuota, totalUsedQuota);
+
+        if( estimatedSize < MAX_QUOTA)
+        {
+            //increase for 1Mb
+            long newQuota = estimatedSize;
+            LOG.d(TAG, "calling quotaUpdater.updateQuota newQuota: %d", newQuota);
+            quotaUpdater.updateQuota(newQuota);
+        }
+        else
+        {
+            // Set the quota to whatever it is and force an error
+            // TODO: get docs on how to handle this properly
+            quotaUpdater.updateQuota(currentQuota);
+        }
+    }
+
+    // console.log in api level 7: http://developer.android.com/guide/developing/debug-tasks.html
+    @Override
+    public void onConsoleMessage(String message, int lineNumber, String sourceID)
+    {       
+        LOG.d(TAG, "%s: Line %d : %s", sourceID, lineNumber, message);
+        super.onConsoleMessage(message, lineNumber, sourceID);
+    }
+    
+    @Override
+    public boolean onConsoleMessage(ConsoleMessage consoleMessage)
+    {       
+        if(consoleMessage.message() != null)
+            LOG.d(TAG, consoleMessage.message());
+        return super.onConsoleMessage(consoleMessage);
+    }
+
+    @Override
+    /**
+     * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin. 
+     * 
+     * @param origin
+     * @param callback
+     */
+    public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
+        super.onGeolocationPermissionsShowPrompt(origin, callback);
+        callback.invoke(origin, true, false);
+    }
+
+
+}

framework/src/com/phonegap/CordovaWebViewClient.java

@@ -0,0 +1,296 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package com.phonegap;
+
+import com.phonegap.api.LOG;
+
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.net.http.SslError;
+import android.util.Log;
+import android.view.View;
+import android.webkit.HttpAuthHandler;
+import android.webkit.SslErrorHandler;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+/**
+ * This class is the WebViewClient that implements callbacks for our web view.
+ */
+public class CordovaWebViewClient extends WebViewClient {
+    
+    private static final String TAG = "Cordova";
+    DroidGap ctx;
+    private boolean doClearHistory = false;
+
+    /**
+     * Constructor.
+     * 
+     * @param ctx
+     */
+    public CordovaWebViewClient(DroidGap ctx) {
+        this.ctx = ctx;
+    }
+    
+    /**
+     * Give the host application a chance to take over the control when a new url 
+     * is about to be loaded in the current WebView.
+     * 
+     * @param view          The WebView that is initiating the callback.
+     * @param url           The url to be loaded.
+     * @return              true to override, false for default behavior
+     */
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        
+        // First give any plugins the chance to handle the url themselves
+        if (this.ctx.pluginManager.onOverrideUrlLoading(url)) {
+        }
+        
+        // If dialing phone (tel:5551212)
+        else if (url.startsWith(WebView.SCHEME_TEL)) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_DIAL);
+                intent.setData(Uri.parse(url));
+                ctx.startActivity(intent);
+            } catch (android.content.ActivityNotFoundException e) {
+                LOG.e(TAG, "Error dialing "+url+": "+ e.toString());
+            }
+        }
+
+        // If displaying map (geo:0,0?q=address)
+        else if (url.startsWith("geo:")) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(url));
+                ctx.startActivity(intent);
+            } catch (android.content.ActivityNotFoundException e) {
+                LOG.e(TAG, "Error showing map "+url+": "+ e.toString());
+            }
+        }
+
+        // If sending email (mailto:abc@corp.com)
+        else if (url.startsWith(WebView.SCHEME_MAILTO)) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(url));
+                ctx.startActivity(intent);
+            } catch (android.content.ActivityNotFoundException e) {
+                LOG.e(TAG, "Error sending email "+url+": "+ e.toString());
+            }
+        }
+
+        // If sms:5551212?body=This is the message
+        else if (url.startsWith("sms:")) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+
+                // Get address
+                String address = null;
+                int parmIndex = url.indexOf('?');
+                if (parmIndex == -1) {
+                    address = url.substring(4);
+                }
+                else {
+                    address = url.substring(4, parmIndex);
+
+                    // If body, then set sms body
+                    Uri uri = Uri.parse(url);
+                    String query = uri.getQuery();
+                    if (query != null) {
+                        if (query.startsWith("body=")) {
+                            intent.putExtra("sms_body", query.substring(5));
+                        }
+                    }
+                }
+                intent.setData(Uri.parse("sms:"+address));
+                intent.putExtra("address", address);
+                intent.setType("vnd.android-dir/mms-sms");
+                ctx.startActivity(intent);
+            } catch (android.content.ActivityNotFoundException e) {
+                LOG.e(TAG, "Error sending sms "+url+":"+ e.toString());
+            }
+        }
+
+        // All else
+        else {
+
+            // If our app or file:, then load into a new phonegap webview container by starting a new instance of our activity.
+            // Our app continues to run.  When BACK is pressed, our app is redisplayed.
+            if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || ctx.isUrlWhiteListed(url)) {
+                this.ctx.loadUrl(url);
+            }
+
+            // If not our application, let default viewer handle
+            else {
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(url));
+                    ctx.startActivity(intent);
+                } catch (android.content.ActivityNotFoundException e) {
+                    LOG.e(TAG, "Error loading url "+url, e);
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * On received http auth request.
+     * The method reacts on all registered authentication tokens. There is one and only one authentication token for any host + realm combination 
+     * 
+     * @param view
+     *            the view
+     * @param handler
+     *            the handler
+     * @param host
+     *            the host
+     * @param realm
+     *            the realm
+     */
+    @Override
+    public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host,
+            String realm) {
+       
+        // get the authentication token
+        AuthenticationToken token = ctx.getAuthenticationToken(host,realm);
+        
+        if(token != null) {
+            handler.proceed(token.getUserName(), token.getPassword());
+        }
+    }
+
+    
+    @Override
+    public void onPageStarted(WebView view, String url, Bitmap favicon) {
+
+        // Clear history so history.back() doesn't do anything.  
+        // So we can reinit() native side CallbackServer & PluginManager.
+        view.clearHistory(); 
+        this.doClearHistory = true;
+    }
+    
+    /**
+     * Notify the host application that a page has finished loading.
+     * 
+     * @param view          The webview initiating the callback.
+     * @param url           The url of the page.
+     */
+    @Override
+    public void onPageFinished(WebView view, String url) {
+        super.onPageFinished(view, url);
+
+        /**
+         * Because of a timing issue we need to clear this history in onPageFinished as well as 
+         * onPageStarted. However we only want to do this if the doClearHistory boolean is set to 
+         * true. You see when you load a url with a # in it which is common in jQuery applications
+         * onPageStared is not called. Clearing the history at that point would break jQuery apps.
+         */
+        if (this.doClearHistory) {
+            view.clearHistory();
+            this.doClearHistory = false;
+        }
+
+        // Clear timeout flag
+        this.ctx.loadUrlTimeout++;
+
+        // Try firing the onNativeReady event in JS. If it fails because the JS is
+        // not loaded yet then just set a flag so that the onNativeReady can be fired
+        // from the JS side when the JS gets to that code.
+        if (!url.equals("about:blank")) {
+            ctx.appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        }
+
+        // Make app visible after 2 sec in case there was a JS error and PhoneGap JS never initialized correctly
+        if (ctx.appView.getVisibility() == View.INVISIBLE) {
+            Thread t = new Thread(new Runnable() {
+                public void run() {
+                    try {
+                        Thread.sleep(2000);
+                        ctx.runOnUiThread(new Runnable() {
+                            public void run() {
+                                ctx.appView.setVisibility(View.VISIBLE);
+                                ctx.spinnerStop();
+                            }
+                        });
+                    } catch (InterruptedException e) {
+                    }
+                }
+            });
+            t.start();
+        }
+
+
+        // Shutdown if blank loaded
+        if (url.equals("about:blank")) {
+            if (this.ctx.callbackServer != null) {
+                this.ctx.callbackServer.destroy();
+            }
+            this.ctx.endActivity();
+        }
+    }
+    
+    /**
+     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
+     * The errorCode parameter corresponds to one of the ERROR_* constants.
+     *
+     * @param view          The WebView that is initiating the callback.
+     * @param errorCode     The error code corresponding to an ERROR_* value.
+     * @param description   A String describing the error.
+     * @param failingUrl    The url that failed to load. 
+     */
+    @Override
+    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+        LOG.d(TAG, "DroidGap: GapViewClient.onReceivedError: Error code=%s Description=%s URL=%s", errorCode, description, failingUrl);
+
+        // Clear timeout flag
+        this.ctx.loadUrlTimeout++;
+
+        // Stop "app loading" spinner if showing
+        this.ctx.spinnerStop();
+
+        // Handle error
+        this.ctx.onReceivedError(errorCode, description, failingUrl);
+    }
+    
+    public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+        
+        final String packageName = this.ctx.getPackageName();
+        final PackageManager pm = this.ctx.getPackageManager();
+        ApplicationInfo appInfo;
+        try {
+            appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
+            if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
+                // debug = true
+                handler.proceed();
+                return;
+            } else {
+                // debug = false
+                super.onReceivedSslError(view, handler, error);    
+            }
+        } catch (NameNotFoundException e) {
+            // When it doubt, lock it out!
+            super.onReceivedSslError(view, handler, error);
+        }
+    }
+}

framework/src/com/phonegap/Device.java

@@ -37,7 +37,7 @@ import android.telephony.TelephonyManager;
 public class Device extends Plugin {
     public static final String TAG = "Device";
 
-    public static String phonegapVersion = "1.3.0rc2";             // PhoneGap version
+    public static String phonegapVersion = "1.4.1";             // PhoneGap version
 	public static String platform = "Android";					// Device OS
 	public static String uuid;									// Device UUID
     

framework/src/com/phonegap/DirectoryManager.java

@@ -57,33 +57,41 @@ public class DirectoryManager {
 	}
 	
 	/**
-	 * Get the free disk space on the SD card
+	 * Get the free disk space
 	 * 
 	 * @return 		Size in KB or -1 if not available
 	 */
-	protected static long getFreeDiskSpace() {
+	protected static long getFreeDiskSpace(boolean checkInternal) {
 		String status = Environment.getExternalStorageState();
 		long freeSpace = 0;
 		
 		// If SD card exists
 		if (status.equals(Environment.MEDIA_MOUNTED)) {
-			try {
-				File path = Environment.getExternalStorageDirectory();
-				StatFs stat = new StatFs(path.getPath());
-				long blockSize = stat.getBlockSize();
-				long availableBlocks = stat.getAvailableBlocks();
-				freeSpace = availableBlocks*blockSize/1024;
-			} catch (Exception e) {e.printStackTrace(); }
+			freeSpace = freeSpaceCalculation(Environment.getExternalStorageDirectory().getPath());
 		} 
-		
-		// If no SD card, then return -1
+		else if (checkInternal) {
+		    freeSpace = freeSpaceCalculation("/");
+		}		
+		// If no SD card and we haven't been asked to check the internal directory then return -1
 		else { 
 			return -1; 
 		}
 		
-		return (freeSpace);
+		return freeSpace;
 	}	
 	
+	/**
+	 * Given a path return the number of free KB
+	 * 
+	 * @param path to the file system
+	 * @return free space in KB
+	 */
+	private static long freeSpaceCalculation(String path) {
+        StatFs stat = new StatFs(path);
+        long blockSize = stat.getBlockSize();
+        long availableBlocks = stat.getAvailableBlocks();
+        return availableBlocks*blockSize/1024;
+	}
 	
 	/**
 	 * Determine if SD card exists.

framework/src/com/phonegap/DroidGap.java

@@ -18,16 +18,18 @@
 */
 package com.phonegap;
 
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Stack;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.Iterator;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -55,6 +57,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions.Callback;
+import android.webkit.HttpAuthHandler;
 import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
 import android.webkit.SslErrorHandler;
@@ -67,11 +70,13 @@ import android.webkit.WebViewClient;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
+import com.phonegap.api.IPlugin;
 import com.phonegap.api.LOG;
 import com.phonegap.api.PhonegapActivity;
-import com.phonegap.api.IPlugin;
 import com.phonegap.api.PluginManager;
-import 	org.xmlpull.v1.XmlPullParserException;
+
+import com.phonegap.PreferenceNode;
+import com.phonegap.PreferenceSet;
 
 /**
  * This class is the main Android activity that represents the PhoneGap
@@ -186,19 +191,22 @@ public class DroidGap extends PhonegapActivity {
     // The base of the initial URL for our app.
     // Does not include file name.  Ends with /
     // ie http://server/path/
-    private String baseUrl = null;
+    String baseUrl = null;
 
     // Plugin to call when activity result is received
     protected IPlugin activityResultCallback = null;
     protected boolean activityResultKeepRunning;
 
     // Flag indicates that a loadUrl timeout occurred
-    private int loadUrlTimeout = 0;
+    int loadUrlTimeout = 0;
     
     // Default background color for activity 
     // (this is not the color for the webview, which is set in HTML)
     private int backgroundColor = Color.BLACK;
     
+    /** The authorization tokens. */
+    private Hashtable<String, AuthenticationToken> authenticationTokens = new Hashtable<String, AuthenticationToken>();
+    
     /*
      * The variables below are used to cache some of the activity properties.
      */
@@ -215,6 +223,93 @@ public class DroidGap extends PhonegapActivity {
     // when another application (activity) is started.
     protected boolean keepRunning = true;
 
+    // preferences read from phonegap.xml
+    protected PreferenceSet preferences;
+
+    private boolean classicRender;
+
+    /**
+     * Sets the authentication token.
+     * 
+     * @param authenticationToken
+     *            the authentication token
+     * @param host
+     *            the host
+     * @param realm
+     *            the realm
+     */
+    public void setAuthenticationToken(AuthenticationToken authenticationToken, String host, String realm) {
+        
+        if(host == null) {
+            host = "";
+        }
+        
+        if(realm == null) {
+            realm = "";
+        }
+        
+        authenticationTokens.put(host.concat(realm), authenticationToken);
+    }
+    
+    /**
+     * Removes the authentication token.
+     * 
+     * @param host
+     *            the host
+     * @param realm
+     *            the realm
+     * @return the authentication token or null if did not exist
+     */
+    public AuthenticationToken removeAuthenticationToken(String host, String realm) {
+        return authenticationTokens.remove(host.concat(realm));
+    }
+    
+    /**
+     * Gets the authentication token.
+     * 
+     * In order it tries:
+     * 1- host + realm
+     * 2- host
+     * 3- realm
+     * 4- no host, no realm
+     * 
+     * @param host
+     *            the host
+     * @param realm
+     *            the realm
+     * @return the authentication token
+     */
+    public AuthenticationToken getAuthenticationToken(String host, String realm) {
+        AuthenticationToken token = null;
+        
+        token = authenticationTokens.get(host.concat(realm));
+        
+        if(token == null) {
+            // try with just the host
+            token = authenticationTokens.get(host);
+            
+            // Try the realm
+            if(token == null) {
+                token = authenticationTokens.get(realm);
+            }
+            
+            // if no host found, just query for default
+            if(token == null) {      
+                token = authenticationTokens.get("");
+            }
+        }
+        
+        return token;
+    }
+    
+    /**
+     * Clear all authentication tokens.
+     */
+    public void clearAuthenticationTokens() {
+        authenticationTokens.clear();
+    }
+    
+    
     /** 
      * Called when the activity is first created. 
      * 
@@ -222,13 +317,27 @@ public class DroidGap extends PhonegapActivity {
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        preferences = new PreferenceSet();
+
+        // Load PhoneGap configuration:
+        //      white list of allowed URLs
+        //      debug setting
+        this.loadConfiguration();
+
         LOG.d(TAG, "DroidGap.onCreate()");
         super.onCreate(savedInstanceState);
-        getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-        // This builds the view.  We could probably get away with NOT having a LinearLayout, but I like having a bucket!
 
+        getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+
+        if (preferences.prefMatches("fullscreen","true")) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+        }
+
+        // This builds the view.  We could probably get away with NOT having a LinearLayout, but I like having a bucket!
         Display display = getWindowManager().getDefaultDisplay(); 
         int width = display.getWidth();
         int height = display.getHeight();
@@ -238,11 +347,6 @@ public class DroidGap extends PhonegapActivity {
         root.setBackgroundColor(this.backgroundColor);
         root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
                 ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
-        
-        // Load PhoneGap configuration:
-        //      white list of allowed URLs
-        //      debug setting
-        this.loadConfiguration();
 
         // If url was passed in to intent, then init webview, which will load the url
         Bundle bundle = this.getIntent().getExtras();
@@ -271,8 +375,8 @@ public class DroidGap extends PhonegapActivity {
                 ViewGroup.LayoutParams.FILL_PARENT, 
                 1.0F));
 
-        this.appView.setWebChromeClient(new GapClient(DroidGap.this));
-        this.setWebViewClient(this.appView, new GapViewClient(this));
+        this.appView.setWebChromeClient(new CordovaChromeClient(DroidGap.this));
+        this.setWebViewClient(this.appView, new CordovaWebViewClient(this));
 
         this.appView.setInitialScale(0);
         this.appView.setVerticalScrollBarEnabled(false);
@@ -350,15 +454,15 @@ public class DroidGap extends PhonegapActivity {
      * @param url
      */
     public void loadUrl(String url) {
-    	
-    	// If first page of app, then set URL to load to be the one passed in
-    	if (this.initUrl == null || (this.urls.size() > 0)) {
-    		this.loadUrlIntoView(url);
-    	}
-    	// Otherwise use the URL specified in the activity's extras bundle
-    	else {
-    		this.loadUrlIntoView(this.initUrl);
-    	}
+        
+        // If first page of app, then set URL to load to be the one passed in
+        if (this.initUrl == null || (this.urls.size() > 0)) {
+            this.loadUrlIntoView(url);
+        }
+        // Otherwise use the URL specified in the activity's extras bundle
+        else {
+            this.loadUrlIntoView(this.initUrl);
+        }
     }
     
     /**
@@ -420,10 +524,10 @@ public class DroidGap extends PhonegapActivity {
                 // If loadingDialog property, then show the App loading dialog for first page of app
                 String loading = null;
                 if (me.urls.size() == 1) {
-                	loading = me.getStringProperty("loadingDialog", null);
+                    loading = me.getStringProperty("loadingDialog", null);
                 }
                 else {
-                	loading = me.getStringProperty("loadingPageDialog", null);                	
+                    loading = me.getStringProperty("loadingPageDialog", null);                  
                 }
                 if (loading != null) {
 
@@ -479,15 +583,15 @@ public class DroidGap extends PhonegapActivity {
      * @param time              The number of ms to wait before loading webview
      */
     public void loadUrl(final String url, int time) {
-    	
-    	// If first page of app, then set URL to load to be the one passed in
-    	if (this.initUrl == null || (this.urls.size() > 0)) {
-    		this.loadUrlIntoView(url, time);
-    	}
-    	// Otherwise use the URL specified in the activity's extras bundle
-    	else {
-    		this.loadUrlIntoView(this.initUrl);
-    	}
+        
+        // If first page of app, then set URL to load to be the one passed in
+        if (this.initUrl == null || (this.urls.size() > 0)) {
+            this.loadUrlIntoView(url, time);
+        }
+        // Otherwise use the URL specified in the activity's extras bundle
+        else {
+            this.loadUrlIntoView(this.initUrl);
+        }
     }
 
     /**
@@ -501,14 +605,14 @@ public class DroidGap extends PhonegapActivity {
 
         // Clear cancel flag
         this.cancelLoadUrl = false;
-    	
-    	// If not first page of app, then load immediately
-        if (this.urls.size() > 0) {
-    		this.loadUrlIntoView(url);
-    	}
         
-    	if (!url.startsWith("javascript:")) {
-    	    LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time);
+        // If not first page of app, then load immediately
+        if (this.urls.size() > 0) {
+            this.loadUrlIntoView(url);
+        }
+        
+        if (!url.startsWith("javascript:")) {
+            LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time);
         }
         final DroidGap me = this;
 
@@ -950,501 +1054,6 @@ public class DroidGap extends PhonegapActivity {
             this.spinnerDialog = null;
         }
     }
-
-    /**
-     * Set the chrome handler.
-     */
-    public class GapClient extends WebChromeClient {
-
-        private String TAG = "PhoneGapLog";
-        private long MAX_QUOTA = 100 * 1024 * 1024;
-        private DroidGap ctx;
-        
-        /**
-         * Constructor.
-         * 
-         * @param ctx
-         */
-        public GapClient(Context ctx) {
-            this.ctx = (DroidGap)ctx;
-        }
-
-        /**
-         * Tell the client to display a javascript alert dialog.
-         * 
-         * @param view
-         * @param url
-         * @param message
-         * @param result
-         */
-        @Override
-        public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
-            AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
-            dlg.setMessage(message);
-            dlg.setTitle("Alert");
-            //Don't let alerts break the back button
-            dlg.setCancelable(true);
-            dlg.setPositiveButton(android.R.string.ok,
-                new AlertDialog.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        result.confirm();
-                    }
-                });
-            dlg.setOnCancelListener(
-               new DialogInterface.OnCancelListener() {
-                   public void onCancel(DialogInterface dialog) {
-                       result.confirm();
-                       }
-                   });
-            dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
-                //DO NOTHING
-                public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                    if(keyCode == KeyEvent.KEYCODE_BACK)
-                    {
-                        result.confirm();
-                        return false;
-                    }
-                    else
-                        return true;
-                    }
-                });
-            dlg.create();
-            dlg.show();
-            return true;
-        }       
-
-        /**
-         * Tell the client to display a confirm dialog to the user.
-         * 
-         * @param view
-         * @param url
-         * @param message
-         * @param result
-         */
-        @Override
-        public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
-            AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
-            dlg.setMessage(message);
-            dlg.setTitle("Confirm");
-            dlg.setCancelable(true);
-            dlg.setPositiveButton(android.R.string.ok, 
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        result.confirm();
-                    }
-                });
-            dlg.setNegativeButton(android.R.string.cancel, 
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        result.cancel();
-                    }
-                });
-            dlg.setOnCancelListener(
-                new DialogInterface.OnCancelListener() {
-                    public void onCancel(DialogInterface dialog) {
-                        result.cancel();
-                        }
-                    });
-            dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
-                //DO NOTHING
-                public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                    if(keyCode == KeyEvent.KEYCODE_BACK)
-                    {
-                        result.cancel();
-                        return false;
-                    }
-                    else
-                        return true;
-                    }
-                });
-            dlg.create();
-            dlg.show();
-            return true;
-        }
-
-        /**
-         * Tell the client to display a prompt dialog to the user. 
-         * If the client returns true, WebView will assume that the client will 
-         * handle the prompt dialog and call the appropriate JsPromptResult method.
-         * 
-         * Since we are hacking prompts for our own purposes, we should not be using them for 
-         * this purpose, perhaps we should hack console.log to do this instead!
-         * 
-         * @param view
-         * @param url
-         * @param message
-         * @param defaultValue
-         * @param result
-         */
-        @Override
-        public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
-            
-            // Security check to make sure any requests are coming from the page initially
-            // loaded in webview and not another loaded in an iframe.
-            boolean reqOk = false;
-            if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || isUrlWhiteListed(url)) {
-                reqOk = true;
-            }
-            
-            // Calling PluginManager.exec() to call a native service using 
-            // prompt(this.stringify(args), "gap:"+this.stringify([service, action, callbackId, true]));
-            if (reqOk && defaultValue != null && defaultValue.length() > 3 && defaultValue.substring(0, 4).equals("gap:")) {
-                JSONArray array;
-                try {
-                    array = new JSONArray(defaultValue.substring(4));
-                    String service = array.getString(0);
-                    String action = array.getString(1);
-                    String callbackId = array.getString(2);
-                    boolean async = array.getBoolean(3);
-                    String r = pluginManager.exec(service, action, callbackId, message, async);
-                    result.confirm(r);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-            
-            // Polling for JavaScript messages 
-            else if (reqOk && defaultValue != null && defaultValue.equals("gap_poll:")) {
-                String r = callbackServer.getJavascript();
-                result.confirm(r);
-            }
-            
-            // Calling into CallbackServer
-            else if (reqOk && defaultValue != null && defaultValue.equals("gap_callbackServer:")) {
-                String r = "";
-                if (message.equals("usePolling")) {
-                    r = ""+callbackServer.usePolling();
-                }
-                else if (message.equals("restartServer")) {
-                    callbackServer.restartServer();
-                }
-                else if (message.equals("getPort")) {
-                    r = Integer.toString(callbackServer.getPort());
-                }
-                else if (message.equals("getToken")) {
-                    r = callbackServer.getToken();
-                }
-                result.confirm(r);
-            }
-            
-            // PhoneGap JS has initialized, so show webview
-            // (This solves white flash seen when rendering HTML)
-            else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
-                appView.setVisibility(View.VISIBLE);
-                ctx.spinnerStop();
-                result.confirm("OK");
-            }
-
-            // Show dialog
-            else {
-                final JsPromptResult res = result;
-                AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
-                dlg.setMessage(message);
-                final EditText input = new EditText(this.ctx);
-                if (defaultValue != null) {
-                    input.setText(defaultValue);
-                }
-                dlg.setView(input);
-                dlg.setCancelable(false);
-                dlg.setPositiveButton(android.R.string.ok, 
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                        String usertext = input.getText().toString();
-                        res.confirm(usertext);
-                    }
-                });
-                dlg.setNegativeButton(android.R.string.cancel, 
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                        res.cancel();
-                    }
-                });
-                dlg.create();
-                dlg.show();
-            }
-            return true;
-        }
-        
-        /**
-         * Handle database quota exceeded notification.
-         *
-         * @param url
-         * @param databaseIdentifier
-         * @param currentQuota
-         * @param estimatedSize
-         * @param totalUsedQuota
-         * @param quotaUpdater
-         */
-        @Override
-        public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
-                long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater)
-        {
-            LOG.d(TAG, "DroidGap:  onExceededDatabaseQuota estimatedSize: %d  currentQuota: %d  totalUsedQuota: %d", estimatedSize, currentQuota, totalUsedQuota);
-
-            if( estimatedSize < MAX_QUOTA)
-            {
-                //increase for 1Mb
-                long newQuota = estimatedSize;
-                LOG.d(TAG, "calling quotaUpdater.updateQuota newQuota: %d", newQuota);
-                quotaUpdater.updateQuota(newQuota);
-            }
-            else
-            {
-                // Set the quota to whatever it is and force an error
-                // TODO: get docs on how to handle this properly
-                quotaUpdater.updateQuota(currentQuota);
-            }
-        }
-
-        // console.log in api level 7: http://developer.android.com/guide/developing/debug-tasks.html
-        @Override
-        public void onConsoleMessage(String message, int lineNumber, String sourceID)
-        {       
-            LOG.d(TAG, "%s: Line %d : %s", sourceID, lineNumber, message);
-            super.onConsoleMessage(message, lineNumber, sourceID);
-        }
-        
-        @Override
-        public boolean onConsoleMessage(ConsoleMessage consoleMessage)
-        {       
-            LOG.d(TAG, consoleMessage.message());
-            return super.onConsoleMessage(consoleMessage);
-        }
-
-        @Override
-        /**
-         * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin. 
-         * 
-         * @param origin
-         * @param callback
-         */
-        public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
-            super.onGeolocationPermissionsShowPrompt(origin, callback);
-            callback.invoke(origin, true, false);
-        }
-
-    }
-
-    /**
-     * The webview client receives notifications about appView
-     */
-    public class GapViewClient extends WebViewClient {
-
-        DroidGap ctx;
-
-        /**
-         * Constructor.
-         * 
-         * @param ctx
-         */
-        public GapViewClient(DroidGap ctx) {
-            this.ctx = ctx;
-        }
-        
-        /**
-         * Give the host application a chance to take over the control when a new url 
-         * is about to be loaded in the current WebView.
-         * 
-         * @param view          The WebView that is initiating the callback.
-         * @param url           The url to be loaded.
-         * @return              true to override, false for default behavior
-         */
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            
-            // First give any plugins the chance to handle the url themselves
-            if (this.ctx.pluginManager.onOverrideUrlLoading(url)) {
-            }
-            
-            // If dialing phone (tel:5551212)
-            else if (url.startsWith(WebView.SCHEME_TEL)) {
-                try {
-                    Intent intent = new Intent(Intent.ACTION_DIAL);
-                    intent.setData(Uri.parse(url));
-                    startActivity(intent);
-                } catch (android.content.ActivityNotFoundException e) {
-                    LOG.e(TAG, "Error dialing "+url+": "+ e.toString());
-                }
-            }
-
-            // If displaying map (geo:0,0?q=address)
-            else if (url.startsWith("geo:")) {
-                try {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setData(Uri.parse(url));
-                    startActivity(intent);
-                } catch (android.content.ActivityNotFoundException e) {
-                    LOG.e(TAG, "Error showing map "+url+": "+ e.toString());
-                }
-            }
-
-            // If sending email (mailto:abc@corp.com)
-            else if (url.startsWith(WebView.SCHEME_MAILTO)) {
-                try {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setData(Uri.parse(url));
-                    startActivity(intent);
-                } catch (android.content.ActivityNotFoundException e) {
-                    LOG.e(TAG, "Error sending email "+url+": "+ e.toString());
-                }
-            }
-
-            // If sms:5551212?body=This is the message
-            else if (url.startsWith("sms:")) {
-                try {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-
-                    // Get address
-                    String address = null;
-                    int parmIndex = url.indexOf('?');
-                    if (parmIndex == -1) {
-                        address = url.substring(4);
-                    }
-                    else {
-                        address = url.substring(4, parmIndex);
-
-                        // If body, then set sms body
-                        Uri uri = Uri.parse(url);
-                        String query = uri.getQuery();
-                        if (query != null) {
-                            if (query.startsWith("body=")) {
-                                intent.putExtra("sms_body", query.substring(5));
-                            }
-                        }
-                    }
-                    intent.setData(Uri.parse("sms:"+address));
-                    intent.putExtra("address", address);
-                    intent.setType("vnd.android-dir/mms-sms");
-                    startActivity(intent);
-                } catch (android.content.ActivityNotFoundException e) {
-                    LOG.e(TAG, "Error sending sms "+url+":"+ e.toString());
-                }
-            }
-
-            // All else
-            else {
-
-                // If our app or file:, then load into a new phonegap webview container by starting a new instance of our activity.
-                // Our app continues to run.  When BACK is pressed, our app is redisplayed.
-                if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || isUrlWhiteListed(url)) {
-                    this.ctx.loadUrl(url);
-                }
-
-                // If not our application, let default viewer handle
-                else {
-                    try {
-                        Intent intent = new Intent(Intent.ACTION_VIEW);
-                        intent.setData(Uri.parse(url));
-                        startActivity(intent);
-                    } catch (android.content.ActivityNotFoundException e) {
-                        LOG.e(TAG, "Error loading url "+url, e);
-                    }
-                }
-            }
-            return true;
-        }
-        
-        @Override
-        public void onPageStarted(WebView view, String url, Bitmap favicon) {
-
-            // Clear history so history.back() doesn't do anything.  
-            // So we can reinit() native side CallbackServer & PluginManager.
-            view.clearHistory(); 
-        }
-        
-        /**
-         * Notify the host application that a page has finished loading.
-         * 
-         * @param view          The webview initiating the callback.
-         * @param url           The url of the page.
-         */
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            super.onPageFinished(view, url);
-
-            // Clear timeout flag
-            this.ctx.loadUrlTimeout++;
-
-            // Try firing the onNativeReady event in JS. If it fails because the JS is
-            // not loaded yet then just set a flag so that the onNativeReady can be fired
-            // from the JS side when the JS gets to that code.
-            if (!url.equals("about:blank")) {
-                appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
-            }
-
-            // Make app visible after 2 sec in case there was a JS error and PhoneGap JS never initialized correctly
-            if (appView.getVisibility() == View.INVISIBLE) {
-                Thread t = new Thread(new Runnable() {
-                    public void run() {
-                        try {
-                            Thread.sleep(2000);
-                            ctx.runOnUiThread(new Runnable() {
-                                public void run() {
-                                    appView.setVisibility(View.VISIBLE);
-                                    ctx.spinnerStop();
-                                }
-                            });
-                        } catch (InterruptedException e) {
-                        }
-                    }
-                });
-                t.start();
-            }
-
-
-            // Shutdown if blank loaded
-            if (url.equals("about:blank")) {
-                if (this.ctx.callbackServer != null) {
-                    this.ctx.callbackServer.destroy();
-                }
-                this.ctx.endActivity();
-            }
-        }
-        
-        /**
-         * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
-         * The errorCode parameter corresponds to one of the ERROR_* constants.
-         *
-         * @param view          The WebView that is initiating the callback.
-         * @param errorCode     The error code corresponding to an ERROR_* value.
-         * @param description   A String describing the error.
-         * @param failingUrl    The url that failed to load. 
-         */
-        @Override
-        public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-            LOG.d(TAG, "DroidGap: GapViewClient.onReceivedError: Error code=%s Description=%s URL=%s", errorCode, description, failingUrl);
-
-            // Clear timeout flag
-            this.ctx.loadUrlTimeout++;
-
-            // Stop "app loading" spinner if showing
-            this.ctx.spinnerStop();
-
-            // Handle error
-            this.ctx.onReceivedError(errorCode, description, failingUrl);
-        }
-        
-        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-            
-            final String packageName = this.ctx.getPackageName();
-            final PackageManager pm = this.ctx.getPackageManager();
-            ApplicationInfo appInfo;
-            try {
-                appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
-                if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
-                    // debug = true
-                    handler.proceed();
-                    return;
-                } else {
-                    // debug = false
-                    super.onReceivedSslError(view, handler, error);    
-                }
-            } catch (NameNotFoundException e) {
-                // When it doubt, lock it out!
-                super.onReceivedSslError(view, handler, error);
-            }
-        }
-    }
     
     /**
      * End this activity by calling finish for activity
@@ -1632,89 +1241,11 @@ public class DroidGap extends PhonegapActivity {
          });
      }
      
-     /**
-      * We are providing this class to detect when the soft keyboard is shown 
-      * and hidden in the web view.
-      */
-     class LinearLayoutSoftKeyboardDetect extends LinearLayout {
-
-            private static final String TAG = "SoftKeyboardDetect";
-            
-            private int oldHeight = 0;  // Need to save the old height as not to send redundant events
-            private int oldWidth = 0; // Need to save old width for orientation change          
-            private int screenWidth = 0;
-            private int screenHeight = 0;
-                        
-            public LinearLayoutSoftKeyboardDetect(Context context, int width, int height) {
-                super(context);     
-                screenWidth = width;
-                screenHeight = height;                  
-            }
-
-            @Override
-            /**
-             * Start listening to new measurement events.  Fire events when the height 
-             * gets smaller fire a show keyboard event and when height gets bigger fire 
-             * a hide keyboard event.
-             * 
-             * Note: We are using callbackServer.sendJavascript() instead of 
-             * this.appView.loadUrl() as changing the URL of the app would cause the 
-             * soft keyboard to go away.
-             * 
-             * @param widthMeasureSpec
-             * @param heightMeasureSpec
-             */
-            protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-                super.onMeasure(widthMeasureSpec, heightMeasureSpec);       
-                
-                LOG.v(TAG, "We are in our onMeasure method");
-
-                // Get the current height of the visible part of the screen.
-                // This height will not included the status bar.
-                int height = MeasureSpec.getSize(heightMeasureSpec);
-                int width = MeasureSpec.getSize(widthMeasureSpec);
-
-                LOG.v(TAG, "Old Height = %d", oldHeight);
-                LOG.v(TAG, "Height = %d", height);             
-                LOG.v(TAG, "Old Width = %d", oldWidth);
-                LOG.v(TAG, "Width = %d", width);
-
-                // If the oldHeight = 0 then this is the first measure event as the app starts up.
-                // If oldHeight == height then we got a measurement change that doesn't affect us.
-                if (oldHeight == 0 || oldHeight == height) {
-                    LOG.d(TAG, "Ignore this event");
-                }
-                // Account for orientation change and ignore this event/Fire orientation change
-                else if(screenHeight == width)
-                {
-                    int tmp_var = screenHeight;
-                    screenHeight = screenWidth;
-                    screenWidth = tmp_var;
-                    LOG.v(TAG, "Orientation Change");
-                }
-                // If the height as gotten bigger then we will assume the soft keyboard has 
-                // gone away.
-                else if (height > oldHeight) {
-                    LOG.v(TAG, "Throw hide keyboard event");
-                    callbackServer.sendJavascript("PhoneGap.fireDocumentEvent('hidekeyboard');");
-                } 
-                // If the height as gotten smaller then we will assume the soft keyboard has 
-                // been displayed.
-                else if (height < oldHeight) {
-                    LOG.v(TAG, "Throw show keyboard event");
-                    callbackServer.sendJavascript("PhoneGap.fireDocumentEvent('showkeyboard');");
-                }
-
-                // Update the old height for the next event
-                oldHeight = height;
-                oldWidth = width;
-            }
-    }
      
     /**
      * Load PhoneGap configuration from res/xml/phonegap.xml.
      * Approved list of URLs that can be loaded into DroidGap
-     * 		<access origin="http://server regexp" subdomains="true" />
+     *      <access origin="http://server regexp" subdomains="true" />
      * Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
      *      <log level="DEBUG" />
      */
@@ -1743,6 +1274,18 @@ public class DroidGap extends PhonegapActivity {
                         LOG.setLogLevel(level);
                     }
                 }
+                else if (strNode.equals("preference")) {
+                    String name = xml.getAttributeValue(null, "name");
+                    String value = xml.getAttributeValue(null, "value");
+                    String readonlyString = xml.getAttributeValue(null, "readonly");
+
+                    boolean readonly = (readonlyString != null &&
+                                        readonlyString.equals("true"));
+
+                    LOG.i("PhoneGapLog", "Found preference for %s", name);
+
+                    preferences.add(new PreferenceNode(name, value, readonly));
+                }
             }
             try {
                 eventType = xml.next();
@@ -1765,24 +1308,24 @@ public class DroidGap extends PhonegapActivity {
         // Unlimited access to network resources
         if(origin.compareTo("*") == 0) {
             LOG.d(TAG, "Unlimited access to network resources");
-            whiteList.add(Pattern.compile("*"));
+            whiteList.add(Pattern.compile(".*"));
         } else { // specific access
           // check if subdomains should be included
           // TODO: we should not add more domains if * has already been added
           if (subdomains) {
               // XXX making it stupid friendly for people who forget to include protocol/SSL
               if(origin.startsWith("http")) {
-                whiteList.add(Pattern.compile(origin.replaceFirst("https{0,1}://", "^https{0,1}://.*")));
+                whiteList.add(Pattern.compile(origin.replaceFirst("https?://", "^https?://(.*\\.)?")));
               } else {
-                whiteList.add(Pattern.compile("^https{0,1}://.*"+origin));
+                whiteList.add(Pattern.compile("^https?://(.*\\.)?"+origin));
               }
               LOG.d(TAG, "Origin to allow with subdomains: %s", origin);
           } else {
               // XXX making it stupid friendly for people who forget to include protocol/SSL
               if(origin.startsWith("http")) {
-                whiteList.add(Pattern.compile(origin.replaceFirst("https{0,1}://", "^https{0,1}://")));
+                whiteList.add(Pattern.compile(origin.replaceFirst("https?://", "^https?://")));
               } else {
-                whiteList.add(Pattern.compile("^https{0,1}://"+origin));
+                whiteList.add(Pattern.compile("^https?://"+origin));
               }
               LOG.d(TAG, "Origin to allow: %s", origin);
           }    
@@ -1798,7 +1341,7 @@ public class DroidGap extends PhonegapActivity {
      * @param url
      * @return
      */
-    private boolean isUrlWhiteListed(String url) {
+    boolean isUrlWhiteListed(String url) {
 
         // Check to see if we have matched url previously
         if (whiteListCache.get(url) != null) {

framework/src/com/phonegap/FileTransfer.java

@@ -54,7 +54,7 @@ import com.phonegap.api.PluginResult;
 
 public class FileTransfer extends Plugin {
 
-    private static final String LOG_TAG = "FileUploader";
+    private static final String LOG_TAG = "FileTransfer";
     private static final String LINE_START = "--";
     private static final String LINE_END = "\r\n";
     private static final String BOUNDRY =  "*****";
@@ -386,7 +386,6 @@ public class FileTransfer extends Plugin {
             URL url = new URL(source);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("GET");
-            connection.setDoOutput(true);
             connection.connect();
 
             Log.d(LOG_TAG, "Download file:" + url);
@@ -429,7 +428,12 @@ public class FileTransfer extends Plugin {
             return ctx.getContentResolver().openInputStream(uri);
         }
         else if (path.startsWith("file://")) {
-            return new FileInputStream(path.substring(7));
+            int question = path.indexOf("?");
+            if (question == -1) {
+                return new FileInputStream(path.substring(7));
+            } else {
+                return new FileInputStream(path.substring(7, question));
+            }
         }
         else {
             return new FileInputStream(path);

framework/src/com/phonegap/FileUtils.java

@@ -101,7 +101,7 @@ public class FileUtils extends Plugin {
                     return new PluginResult(status, b);
                 }
                 else if (action.equals("getFreeDiskSpace")) {
-                    long l = DirectoryManager.getFreeDiskSpace();
+                    long l = DirectoryManager.getFreeDiskSpace(false);
                     return new PluginResult(status, l);
                 }
                 else if (action.equals("testFileExists")) {
@@ -131,7 +131,7 @@ public class FileUtils extends Plugin {
                 else if (action.equals("requestFileSystem")) {
                     long size = args.optLong(1);
                     if (size != 0) {
-                        if (size > (DirectoryManager.getFreeDiskSpace()*1024)) {
+                        if (size > (DirectoryManager.getFreeDiskSpace(true)*1024)) {
                             JSONObject error = new JSONObject().put("code", FileUtils.QUOTA_EXCEEDED_ERR);
                             return new PluginResult(PluginResult.Status.ERROR, error);
                         }
@@ -793,35 +793,30 @@ public class FileUtils extends Plugin {
     private JSONObject requestFileSystem(int type) throws IOException, JSONException {
         JSONObject fs = new JSONObject();
         if (type == TEMPORARY) {
+            File fp;
+            fs.put("name", "temporary");
             if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                fs.put("name", "temporary");
                 fs.put("root", getEntry(Environment.getExternalStorageDirectory().getAbsolutePath() +
                         "/Android/data/" + ctx.getPackageName() + "/cache/"));
 
                 // Create the cache dir if it doesn't exist.
-                File fp = new File(Environment.getExternalStorageDirectory().getAbsolutePath() +
+                fp = new File(Environment.getExternalStorageDirectory().getAbsolutePath() +
                     "/Android/data/" + ctx.getPackageName() + "/cache/");
-                fp.mkdirs();
             } else {
-                throw new IOException("SD Card not mounted");
+                fs.put("root", getEntry("/data/data/" + ctx.getPackageName() + "/cache/"));
+                // Create the cache dir if it doesn't exist.
+                fp = new File("/data/data/" + ctx.getPackageName() + "/cache/");
             }
+            fp.mkdirs();
         }
         else if (type == PERSISTENT) {
+            fs.put("name", "persistent");
             if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                fs.put("name", "persistent");
                 fs.put("root", getEntry(Environment.getExternalStorageDirectory()));
             } else {
-                throw new IOException("SD Card not mounted");
+                fs.put("root", getEntry("/data/data/" + ctx.getPackageName()));
             }
         }
-        else if (type == RESOURCE) {
-            fs.put("name", "resource");
-
-        }
-        else if (type == APPLICATION) {
-            fs.put("name", "application");
-
-        }
         else {
             throw new IOException("No filesystem of type requested");
         }

framework/src/com/phonegap/GapView.java

@@ -1,38 +0,0 @@
-package com.phonegap;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView;
-import android.widget.EditText;
-
-public class GapView extends WebView {
-
-	public GapView(Context context) {
-		super(context);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	protected void attachViewToParent(View child, int index, ViewGroup.LayoutParams params)
-	{
-		if(child.getClass() != EditText.class)
-			super.attachViewToParent(child, index, params);
-		else
-		{
-			super.attachViewToParent(child, index, params);
-		}
-	}
-	
-	@Override
-	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params)
-	{
-		return super.addViewInLayout(child, index, params);
-	}
-	
-	@Override
-	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params, boolean preventRequestLayout)
-	{
-		return super.addViewInLayout(child, index, params);
-	}
-}

framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java

@@ -0,0 +1,104 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package com.phonegap;
+import com.phonegap.api.LOG;
+
+import android.content.Context;
+import android.view.View.MeasureSpec;
+import android.widget.LinearLayout;
+
+/**
+ * This class is used to detect when the soft keyboard is shown and hidden in the web view.
+ */
+public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
+
+    private static final String TAG = "SoftKeyboardDetect";
+    
+    private int oldHeight = 0;  // Need to save the old height as not to send redundant events
+    private int oldWidth = 0; // Need to save old width for orientation change          
+    private int screenWidth = 0;
+    private int screenHeight = 0;
+    private DroidGap app = null;
+                
+    public LinearLayoutSoftKeyboardDetect(Context context, int width, int height) {
+        super(context);     
+        screenWidth = width;
+        screenHeight = height;
+        app = (DroidGap) context;
+    }
+
+    @Override
+    /**
+     * Start listening to new measurement events.  Fire events when the height 
+     * gets smaller fire a show keyboard event and when height gets bigger fire 
+     * a hide keyboard event.
+     * 
+     * Note: We are using app.postMessage so that this is more compatible with the API
+     * 
+     * @param widthMeasureSpec
+     * @param heightMeasureSpec
+     */
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);       
+        
+        LOG.v(TAG, "We are in our onMeasure method");
+
+        // Get the current height of the visible part of the screen.
+        // This height will not included the status bar.\
+        int width, height;
+
+        height = MeasureSpec.getSize(heightMeasureSpec);
+        width = MeasureSpec.getSize(widthMeasureSpec);
+        LOG.v(TAG, "Old Height = %d", oldHeight);
+        LOG.v(TAG, "Height = %d", height);             
+        LOG.v(TAG, "Old Width = %d", oldWidth);
+        LOG.v(TAG, "Width = %d", width);
+
+        // If the oldHeight = 0 then this is the first measure event as the app starts up.
+        // If oldHeight == height then we got a measurement change that doesn't affect us.
+        if (oldHeight == 0 || oldHeight == height) {
+            LOG.d(TAG, "Ignore this event");
+        }
+        // Account for orientation change and ignore this event/Fire orientation change
+        else if(screenHeight == width)
+        {
+            int tmp_var = screenHeight;
+            screenHeight = screenWidth;
+            screenWidth = tmp_var;
+            LOG.v(TAG, "Orientation Change");
+        }
+        // If the height as gotten bigger then we will assume the soft keyboard has 
+        // gone away.
+        else if (height > oldHeight) {
+            if(app != null)
+                app.sendJavascript("PhoneGap.fireDocumentEvent('hidekeyboard');");
+        } 
+        // If the height as gotten smaller then we will assume the soft keyboard has 
+        // been displayed.
+        else if (height < oldHeight) {
+            if(app != null)
+                app.sendJavascript("PhoneGap.fireDocumentEvent('showkeyboard');");
+        }
+
+        // Update the old height for the next event
+        oldHeight = height;
+        oldWidth = width;
+    }
+
+}

framework/src/com/phonegap/PreferenceNode.java

@@ -0,0 +1,16 @@
+package com.phonegap;
+
+// represents the <preference> element from the W3C config.xml spec
+// see http://www.w3.org/TR/widgets/#the-preference-element-and-its-attributes
+public class PreferenceNode {
+    public String name;
+    public String value;
+    public boolean readonly;
+
+    // constructor
+    public PreferenceNode(String name, String value, boolean readonly) {
+        this.name = name;
+        this.value = value;
+        this.readonly = readonly;
+    }
+}

framework/src/com/phonegap/PreferenceSet.java

@@ -0,0 +1,43 @@
+package com.phonegap;
+
+import java.util.HashSet;
+
+import com.phonegap.PreferenceNode;
+
+public class PreferenceSet {
+    private HashSet<PreferenceNode> innerSet;
+
+    public PreferenceSet() {
+        this.innerSet = new HashSet<PreferenceNode>();
+    }
+
+    public void add(PreferenceNode node) {
+        this.innerSet.add(node);
+    }
+
+    public int size() {
+        return this.innerSet.size();
+    }
+
+    public void clear() {
+        this.innerSet.clear();
+    }
+
+    public String pref(String prefName) {
+        for (PreferenceNode n : innerSet)
+            if (prefName.equals(n.name))
+                return n.value;
+
+        return null;
+    }
+
+    public boolean prefMatches(String prefName, String prefValue) {
+        String value = pref(prefName);
+
+        if (value == null) {
+            return false;
+        } else {
+            return value.equals(prefValue);
+        }
+    }
+}

framework/src/com/phonegap/Storage.java

@@ -18,17 +18,22 @@
 */
 package com.phonegap;
 
+import java.io.File;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;
+
+import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.*;
 
 /**
- * This class implements the HTML5 database support for Android 1.X devices. It
- * is not used for Android 2.X, since HTML5 database is built in to the browser.
+ * This class implements the HTML5 database support to work around a bug for 
+ * Android 3.0 devices. It is not used for other versions of Android, since 
+ * HTML5 database is built in to the browser.
  */
 public class Storage extends Plugin {
 
@@ -64,11 +69,7 @@ public class Storage extends Plugin {
 		String result = "";
 
 		try {
-			// TODO: Do we want to allow a user to do this, since they could get
-			// to other app databases?
-			if (action.equals("setStorage")) {
-				this.setStorage(args.getString(0));
-			} else if (action.equals("openDatabase")) {
+			if (action.equals("openDatabase")) {
 				this.openDatabase(args.getString(0), args.getString(1),
 						args.getString(2), args.getLong(3));
 			} else if (action.equals("executeSql")) {
@@ -118,21 +119,6 @@ public class Storage extends Plugin {
 	// LOCAL METHODS
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Set the application package for the database. Each application saves its
-	 * database files in a directory with the application package as part of the
-	 * file name.
-	 * 
-	 * For example, application "com.phonegap.demo.Demo" would save its database
-	 * files in "/data/data/com.phonegap.demo/databases/" directory.
-	 * 
-	 * @param appPackage
-	 *            The application package.
-	 */
-	public void setStorage(String appPackage) {
-		this.path = "/data/data/" + appPackage + "/databases/";
-	}
-
 	/**
 	 * Open database.
 	 * 
@@ -155,12 +141,10 @@ public class Storage extends Plugin {
 
 		// If no database path, generate from application package
 		if (this.path == null) {
-			Package pack = this.ctx.getClass().getPackage();
-			String appPackage = pack.getName();
-			this.setStorage(appPackage);
+			this.path = this.ctx.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
 		}
 
-		this.dbName = this.path + db + ".db";
+		this.dbName = this.path + File.pathSeparator + db + ".db";
 		this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
 	}
 
@@ -249,9 +233,7 @@ public class Storage extends Plugin {
 		}
 
 		// Let JavaScript know that there are no more rows
-		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result
-				+ ");");
-
+		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result + ");");
 	}
 
 }

framework/test/com/phonegap/PreferenceNodeTest.java

@@ -0,0 +1,35 @@
+import org.junit.*;
+import static org.junit.Assert.*;
+
+import com.phonegap.PreferenceNode;
+
+public class PreferenceNodeTest {
+    @Test
+        public void testConstructor() {
+            PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+            assertEquals("fullscreen", foo.name);
+            assertEquals("false", foo.value);
+            assertEquals(false, foo.readonly);
+        }
+
+    @Test
+        public void testNameAssignment() {
+            PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+            foo.name = "widescreen";
+            assertEquals("widescreen", foo.name);
+        }
+
+    @Test
+        public void testValueAssignment() {
+            PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+            foo.value = "maybe";
+            assertEquals("maybe", foo.value);
+        }
+
+    @Test
+        public void testReadonlyAssignment() {
+            PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+            foo.readonly = true;
+            assertEquals(true, foo.readonly);
+        }
+}

framework/test/com/phonegap/PreferenceSetTest.java

@@ -0,0 +1,55 @@
+import org.junit.*;
+import static org.junit.Assert.*;
+
+import com.phonegap.PreferenceNode;
+import com.phonegap.PreferenceSet;
+
+public class PreferenceSetTest {
+    private PreferenceSet preferences;
+    private PreferenceNode screen;
+
+    @Before
+        public void setUp() {
+            preferences = new PreferenceSet();
+            screen = new PreferenceNode("fullscreen", "true", false);
+        }
+
+    @Test
+        public void testAddition() {
+            preferences.add(screen);
+            assertEquals(1, preferences.size());
+        }
+
+    @Test
+        public void testClear() {
+            preferences.add(screen);
+            preferences.clear();
+            assertEquals(0, preferences.size());
+        }
+
+    @Test
+        public void testPreferenceRetrieval() {
+            preferences.add(screen);
+            assertEquals("true", preferences.pref("fullscreen"));
+        }
+
+    @Test
+        public void testNoPreferenceRetrieval() {
+            // return null if the preference is not defined
+            assertEquals(null, preferences.pref("antigravity"));
+        }
+
+    @Test
+        public void testUnsetPreferenceChecking() {
+            PreferenceSet emptySet = new PreferenceSet();
+            boolean value = emptySet.prefMatches("fullscreen", "true");
+            assertEquals(false, value);
+        }
+
+    @Test
+        public void testSetPreferenceChecking() {
+            preferences.add(screen);
+            boolean value = preferences.prefMatches("fullscreen", "true");
+            assertEquals(true, value);
+        }
+}