From 6d1e0356ac65db16ea8a0b4e3141640159ce6ac5 Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Tue, 5 Jun 2012 09:49:50 -0400
Subject: [PATCH 1/2] Changing all tabs to spaces

---
 framework/.project                            |  60 +-
 framework/AndroidManifest.xml                 |  12 +-
 framework/assets/www/index.html               |   2 +-
 framework/build.xml                           |  12 +-
 framework/default.properties                  |   4 +-
 framework/res/layout/main.xml                 |   6 +-
 framework/res/values/strings.xml              |   2 +-
 framework/res/xml/cordova.xml                 |  16 +-
 framework/res/xml/plugins.xml                 |   2 +-
 framework/src/com/phonegap/api/LOG.java       |   2 +-
 .../src/com/phonegap/api/PluginManager.java   |   2 +-
 .../src/com/phonegap/api/PluginResult.java    |  36 +-
 .../src/org/apache/cordova/AccelListener.java | 107 ++-
 framework/src/org/apache/cordova/App.java     | 186 ++---
 .../src/org/apache/cordova/AudioHandler.java  | 422 ++++++-----
 .../src/org/apache/cordova/AudioPlayer.java   | 710 +++++++++---------
 .../apache/cordova/AuthenticationToken.java   |  24 +-
 .../org/apache/cordova/BatteryListener.java   |  52 +-
 .../org/apache/cordova/CallbackServer.java    | 597 ++++++++-------
 .../org/apache/cordova/CameraLauncher.java    | 140 ++--
 framework/src/org/apache/cordova/Capture.java |  78 +-
 .../org/apache/cordova/CompassListener.java   |  62 +-
 .../org/apache/cordova/ContactAccessor.java   |  28 +-
 .../apache/cordova/ContactAccessorSdk5.java   | 555 +++++++-------
 .../org/apache/cordova/ContactManager.java    |   4 +-
 .../apache/cordova/CordovaChromeClient.java   |  56 +-
 .../cordova/CordovaLocationListener.java      | 238 +++---
 .../apache/cordova/CordovaWebViewClient.java  |  53 +-
 framework/src/org/apache/cordova/Device.java  |  54 +-
 .../org/apache/cordova/DirectoryManager.java  | 202 ++---
 .../src/org/apache/cordova/DroidGap.java      | 375 +++++----
 .../src/org/apache/cordova/ExifHelper.java    |  28 +-
 .../src/org/apache/cordova/FileTransfer.java  |   6 +-
 .../org/apache/cordova/FileUploadResult.java  |  18 +-
 .../src/org/apache/cordova/FileUtils.java     |  13 +-
 .../src/org/apache/cordova/GPSListener.java   |  40 +-
 .../src/org/apache/cordova/GeoBroker.java     | 170 ++---
 .../src/org/apache/cordova/HttpHandler.java   |  96 +--
 .../LinearLayoutSoftKeyboardDetect.java       |  29 +-
 .../org/apache/cordova/NetworkListener.java   |   6 +-
 .../org/apache/cordova/NetworkManager.java    |  50 +-
 .../src/org/apache/cordova/Notification.java  |  54 +-
 .../src/org/apache/cordova/StandAlone.java    |  17 +-
 framework/src/org/apache/cordova/Storage.java | 360 ++++-----
 .../src/org/apache/cordova/TempListener.java  | 120 +--
 .../apache/cordova/api/CordovaInterface.java  |  43 +-
 .../src/org/apache/cordova/api/IPlugin.java   |  96 +--
 framework/src/org/apache/cordova/api/LOG.java |  52 +-
 .../src/org/apache/cordova/api/Plugin.java    | 150 ++--
 .../org/apache/cordova/api/PluginEntry.java   |  10 +-
 .../org/apache/cordova/api/PluginManager.java |  38 +-
 .../org/apache/cordova/api/PluginResult.java  | 174 +++--
 .../cordova/file/EncodingException.java       |   8 +-
 .../cordova/file/FileExistsException.java     |   6 +-
 .../file/InvalidModificationException.java    |   6 +-
 .../file/NoModificationAllowedException.java  |   6 +-
 .../cordova/file/TypeMismatchException.java   |   6 +-
 57 files changed, 2837 insertions(+), 2864 deletions(-)

diff --git a/framework/.project b/framework/.project
index 56d67639..ed4a955a 100644
--- a/framework/.project
+++ b/framework/.project
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Cordova</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+    <name>Cordova</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
 </projectDescription>
diff --git a/framework/AndroidManifest.xml b/framework/AndroidManifest.xml
index 316009bf..a2676834 100755
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        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
@@ -39,12 +39,12 @@
     <uses-permission android:name="android.permission.RECORD_VIDEO"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
@@ -57,7 +57,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name" 
+        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden">
             <intent-filter>
             </intent-filter>
@@ -65,4 +65,4 @@
     </application>
 
     <uses-sdk android:minSdkVersion="2" />
-</manifest> 
+</manifest>
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 1f39dc57..1a51674f 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
        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
diff --git a/framework/build.xml b/framework/build.xml
index 452a8d66..5554bc64 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
        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
@@ -51,7 +51,7 @@
 
          -->
     <property file="ant.properties" />
-    
+
     <!-- We need to setup the double quote. -->
     <property name="dblQuote">"</property>
 
@@ -110,10 +110,10 @@
 
     <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
     <target name="build-javascript" depends="clean">
-        
+
       <!-- Clean up existing files -->
       <!--<delete file="assets/www/cordova_${version}.js"/>-->
-        
+
       <!-- Create uncompressed JS file -->
       <concat destfile="assets/www/cordova-${version}.js">
         <filelist dir="assets/js" files="cordova.android.js"/>
@@ -121,8 +121,8 @@
 
       <!-- update project files to reference cordova-x.x.x.min.js -->
       <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
-         <fileset file="assets/www/index.html" /> 
-         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" /> 
+         <fileset file="assets/www/index.html" />
+         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" />
       </replaceregexp>
 
       <!-- This is sketchy, but it works, ${dblQuote} does not -->
diff --git a/framework/default.properties b/framework/default.properties
index d035c7c6..d4e24dcb 100644
--- a/framework/default.properties
+++ b/framework/default.properties
@@ -1,8 +1,8 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
 # "build.properties", and override values to adapt the script to your
 # project structure.
diff --git a/framework/res/layout/main.xml b/framework/res/layout/main.xml
index 514318ca..bf8a0ff2 100644
--- a/framework/res/layout/main.xml
+++ b/framework/res/layout/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        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
@@ -21,9 +21,9 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >    
+    >
             <WebView android:id="@+id/appView"
             android:layout_height="fill_parent"
             android:layout_width="fill_parent"
-            />	
+            />
 </LinearLayout>
diff --git a/framework/res/values/strings.xml b/framework/res/values/strings.xml
index e290e320..8bfae7c6 100644
--- a/framework/res/values/strings.xml
+++ b/framework/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        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
diff --git a/framework/res/xml/cordova.xml b/framework/res/xml/cordova.xml
index 8f347e7d..0eb8d5e5 100644
--- a/framework/res/xml/cordova.xml
+++ b/framework/res/xml/cordova.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        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
@@ -18,16 +18,16 @@
        under the License.
 -->
 <cordova>
-	<!--  
-	access elements control the Android whitelist.  
-	Domains are assumed blocked unless set otherwise
-	 -->
+    <!--
+    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 -->
+    <!-- <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" />
diff --git a/framework/res/xml/plugins.xml b/framework/res/xml/plugins.xml
index 76879a1c..1e0f191d 100755
--- a/framework/res/xml/plugins.xml
+++ b/framework/res/xml/plugins.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        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
diff --git a/framework/src/com/phonegap/api/LOG.java b/framework/src/com/phonegap/api/LOG.java
index 35204250..e9a37d2e 100755
--- a/framework/src/com/phonegap/api/LOG.java
+++ b/framework/src/com/phonegap/api/LOG.java
@@ -20,7 +20,7 @@ package com.phonegap.api;
 
 /**
  * Log to Android logging system.
- * 
+ *
  * Log message can be a string or a printf formatted string with arguments.
  * See http://developer.android.com/reference/java/util/Formatter.html
  */
diff --git a/framework/src/com/phonegap/api/PluginManager.java b/framework/src/com/phonegap/api/PluginManager.java
index 4f0f13f0..7781901c 100755
--- a/framework/src/com/phonegap/api/PluginManager.java
+++ b/framework/src/com/phonegap/api/PluginManager.java
@@ -24,7 +24,7 @@ import android.webkit.WebView;
 
 /**
  * PluginManager is exposed to JavaScript in the Cordova WebView.
- * 
+ *
  * Calling native plugin code can be done by calling PluginManager.exec(...)
  * from JavaScript.
  */
diff --git a/framework/src/com/phonegap/api/PluginResult.java b/framework/src/com/phonegap/api/PluginResult.java
index 01f69c3d..8649135e 100755
--- a/framework/src/com/phonegap/api/PluginResult.java
+++ b/framework/src/com/phonegap/api/PluginResult.java
@@ -22,32 +22,32 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class PluginResult extends org.apache.cordova.api.PluginResult {
-	
-	public PluginResult(Status status) {
-		super(status);
-	}
-	
-	public PluginResult(Status status, String message) {
-		super(status, message);
-	}
 
-	public PluginResult(Status status, JSONArray message) {
+    public PluginResult(Status status) {
+        super(status);
+    }
+
+    public PluginResult(Status status, String message) {
         super(status, message);
-	}
+    }
 
-	public PluginResult(Status status, JSONObject message) {
+    public PluginResult(Status status, JSONArray message) {
         super(status, message);
-	}
+    }
 
-	public PluginResult(Status status, int i) {
+    public PluginResult(Status status, JSONObject message) {
+        super(status, message);
+    }
+
+    public PluginResult(Status status, int i) {
         super(status, i);
-	}
+    }
 
-	public PluginResult(Status status, float f) {
+    public PluginResult(Status status, float f) {
         super(status, f);
-	}
+    }
 
-	public PluginResult(Status status, boolean b) {
+    public PluginResult(Status status, boolean b) {
         super(status, b);
-	}
+    }
 }
diff --git a/framework/src/org/apache/cordova/AccelListener.java b/framework/src/org/apache/cordova/AccelListener.java
index 83a322d6..6422dbb5 100755
--- a/framework/src/org/apache/cordova/AccelListener.java
+++ b/framework/src/org/apache/cordova/AccelListener.java
@@ -18,12 +18,7 @@
 */
 package org.apache.cordova;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.cordova.api.CordovaInterface;
 import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
@@ -36,12 +31,10 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.location.Location;
-import android.util.Log;
 import android.content.Context;
 
 /**
- * This class listens to the accelerometer sensor and stores the latest 
+ * This class listens to the accelerometer sensor and stores the latest
  * acceleration values x,y,z.
  */
 public class AccelListener extends Plugin implements SensorEventListener {
@@ -50,7 +43,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
     public static int STARTING = 1;
     public static int RUNNING = 2;
     public static int ERROR_FAILED_TO_START = 3;
-    
+
     private float x,y,z;						        // most recent acceleration values
     private long timestamp;					        // time of most recent value
     private int status;							        // status of listener
@@ -71,11 +64,11 @@ public class AccelListener extends Plugin implements SensorEventListener {
         this.timestamp = 0;
         this.setStatus(AccelListener.STOPPED);
      }
-    
+
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
+     *
      * @param ctx The context of the main Activity.
      */
     public void setContext(CordovaInterface ctx) {
@@ -85,7 +78,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action 		The action to execute.
      * @param args 			JSONArry of arguments for the plugin.
      * @param callbackId	The callback id used when calling back into JavaScript.
@@ -95,7 +88,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
         PluginResult.Status status = PluginResult.Status.NO_RESULT;
         String message = "";
         PluginResult result = new PluginResult(status, message);
-        result.setKeepCallback(true);	
+        result.setKeepCallback(true);
 
         if (action.equals("start")) {
             this.callbackId = callbackId;
@@ -115,7 +108,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
         }
         return result;
     }
-    
+
     /**
      * Called by AccelBroker when listener is to be shut down.
      * Stop listener.
@@ -130,46 +123,46 @@ public class AccelListener extends Plugin implements SensorEventListener {
     //
     /**
      * Start listening for acceleration sensor.
-     * 
+     *
      * @return 			status of listener
      */
     private int start() {
-    	// If already starting or running, then just return
-    	if ((this.status == AccelListener.RUNNING) || (this.status == AccelListener.STARTING)) {
-          return this.status;
-    	}
-    	
-    	this.setStatus(AccelListener.STARTING);
-    	
-    	// Get accelerometer from sensor manager
-    	List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
+        // If already starting or running, then just return
+        if ((this.status == AccelListener.RUNNING) || (this.status == AccelListener.STARTING)) {
+            return this.status;
+        }
 
-    	// If found, then register as listener
-    	if ((list != null) && (list.size() > 0)) {
-          this.mSensor = list.get(0);
-          this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_UI);
-          this.setStatus(AccelListener.STARTING);
-    	} else {
-          this.setStatus(AccelListener.ERROR_FAILED_TO_START);
-          this.fail(AccelListener.ERROR_FAILED_TO_START, "No sensors found to register accelerometer listening to.");
-          return this.status;
-    	}
-    	
-    	// Wait until running
-    	long timeout = 2000;
-    	while ((this.status == STARTING) && (timeout > 0)) {
-          timeout = timeout - 100;
-          try {
-              Thread.sleep(100);
-          } catch (InterruptedException e) {
-              e.printStackTrace();
-          }
-    	}
-    	if (timeout == 0) {
+        this.setStatus(AccelListener.STARTING);
+
+        // Get accelerometer from sensor manager
+        List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
+
+        // If found, then register as listener
+        if ((list != null) && (list.size() > 0)) {
+            this.mSensor = list.get(0);
+            this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_UI);
+            this.setStatus(AccelListener.STARTING);
+        } else {
+            this.setStatus(AccelListener.ERROR_FAILED_TO_START);
+            this.fail(AccelListener.ERROR_FAILED_TO_START, "No sensors found to register accelerometer listening to.");
+            return this.status;
+        }
+
+        // Wait until running
+        long timeout = 2000;
+        while ((this.status == STARTING) && (timeout > 0)) {
+            timeout = timeout - 100;
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (timeout == 0) {
           this.setStatus(AccelListener.ERROR_FAILED_TO_START);
           this.fail(AccelListener.ERROR_FAILED_TO_START, "Accelerometer could not be started.");
-    	}
-    	return this.status;
+        }
+        return this.status;
     }
 
     /**
@@ -185,16 +178,16 @@ public class AccelListener extends Plugin implements SensorEventListener {
 
     /**
      * Called when the accuracy of the sensor has changed.
-     * 
+     *
      * @param sensor
      * @param accuracy
      */
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
-    	// Only look at accelerometer events
+        // Only look at accelerometer events
         if (sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
             return;
         }
-        
+
         // If not running, then just return
         if (this.status == AccelListener.STOPPED) {
             return;
@@ -204,7 +197,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
 
     /**
      * Sensor listener event.
-     * 
+     *
      * @param SensorEvent event
      */
     public void onSensorChanged(SensorEvent event) {
@@ -212,14 +205,14 @@ public class AccelListener extends Plugin implements SensorEventListener {
         if (event.sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
             return;
         }
-        
+
         // If not running, then just return
         if (this.status == AccelListener.STOPPED) {
             return;
         }
-        
+
         this.setStatus(AccelListener.RUNNING);
-        
+
         if (this.accuracy >= SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM) {
 
             // Save time that event was received
@@ -247,7 +240,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
 
         this.error(err, this.callbackId);
     }
-    
+
     private void win() {
         // Success return object
         PluginResult result = new PluginResult(PluginResult.Status.OK, this.getAccelerationJSON());
@@ -259,7 +252,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
     private void setStatus(int status) {
         this.status = status;
     }
-	
+
     private JSONObject getAccelerationJSON() {
         JSONObject r = new JSONObject();
         try {
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index 9b1c96a9..5b639216 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -45,30 +45,30 @@ public class App extends Plugin {
         String result = "";
 
         try {
-        	if (action.equals("clearCache")) {
-        		this.clearCache();
-        	}
-        	else if (action.equals("loadUrl")) {
-            	this.loadUrl(args.getString(0), args.optJSONObject(1));
+            if (action.equals("clearCache")) {
+                this.clearCache();
             }
-        	else if (action.equals("cancelLoadUrl")) {
-            	this.cancelLoadUrl();
+            else if (action.equals("loadUrl")) {
+                this.loadUrl(args.getString(0), args.optJSONObject(1));
             }
-        	else if (action.equals("clearHistory")) {
-            	this.clearHistory();
+            else if (action.equals("cancelLoadUrl")) {
+                this.cancelLoadUrl();
+            }
+            else if (action.equals("clearHistory")) {
+                this.clearHistory();
             }
             else if (action.equals("backHistory")) {
                 this.backHistory();
             }
-        	else if (action.equals("overrideBackbutton")) {
-            	this.overrideBackbutton(args.getBoolean(0));
+            else if (action.equals("overrideBackbutton")) {
+                this.overrideBackbutton(args.getBoolean(0));
             }
-        	else if (action.equals("isBackbuttonOverridden")) {
-            	boolean b = this.isBackbuttonOverridden();
-            	return new PluginResult(status, b);
+            else if (action.equals("isBackbuttonOverridden")) {
+                boolean b = this.isBackbuttonOverridden();
+                return new PluginResult(status, b);
             }
-        	else if (action.equals("exitApp")) {
-            	this.exitApp();
+            else if (action.equals("exitApp")) {
+                this.exitApp();
             }
             return new PluginResult(status, result);
         } catch (JSONException e) {
@@ -80,87 +80,87 @@ public class App extends Plugin {
     // LOCAL METHODS
     //--------------------------------------------------------------------------
 
-	/**
-	 * Clear the resource cache.
-	 */
-	public void clearCache() {
-		((DroidGap)this.ctx).clearCache();
-	}
-	
-	/**
-	 * Load the url into the webview.
-	 * 
-	 * @param url
-	 * @param props			Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
-	 * @throws JSONException 
-	 */
-	public void loadUrl(String url, JSONObject props) throws JSONException {
-		LOG.d("App", "App.loadUrl("+url+","+props+")");
-		int wait = 0;
-		boolean openExternal = false;
-		boolean clearHistory = false;
+    /**
+     * Clear the resource cache.
+     */
+    public void clearCache() {
+        ((DroidGap)this.ctx).clearCache();
+    }
 
-		// If there are properties, then set them on the Activity
-		HashMap<String, Object> params = new HashMap<String, Object>();
-		if (props != null) {
-			JSONArray keys = props.names();
-			for (int i=0; i<keys.length(); i++) {
-				String key = keys.getString(i); 
-				if (key.equals("wait")) {
-					wait = props.getInt(key);
-				}
-				else if (key.equalsIgnoreCase("openexternal")) {
-					openExternal = props.getBoolean(key);
-				}
-				else if (key.equalsIgnoreCase("clearhistory")) {
-					clearHistory = props.getBoolean(key);
-				}
-				else {
-					Object value = props.get(key);
-					if (value == null) {
+    /**
+     * Load the url into the webview.
+     *
+     * @param url
+     * @param props			Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
+     * @throws JSONException
+     */
+    public void loadUrl(String url, JSONObject props) throws JSONException {
+        LOG.d("App", "App.loadUrl("+url+","+props+")");
+        int wait = 0;
+        boolean openExternal = false;
+        boolean clearHistory = false;
 
-					}
-					else if (value.getClass().equals(String.class)) {
-						params.put(key, (String)value);
-					}
-					else if (value.getClass().equals(Boolean.class)) {
-						params.put(key, (Boolean)value);
-					}
-					else if (value.getClass().equals(Integer.class)) {
-						params.put(key, (Integer)value);
-					}
-				}
-			}
-		}
+        // If there are properties, then set them on the Activity
+        HashMap<String, Object> params = new HashMap<String, Object>();
+        if (props != null) {
+            JSONArray keys = props.names();
+            for (int i=0; i<keys.length(); i++) {
+                String key = keys.getString(i);
+                if (key.equals("wait")) {
+                    wait = props.getInt(key);
+                }
+                else if (key.equalsIgnoreCase("openexternal")) {
+                    openExternal = props.getBoolean(key);
+                }
+                else if (key.equalsIgnoreCase("clearhistory")) {
+                    clearHistory = props.getBoolean(key);
+                }
+                else {
+                    Object value = props.get(key);
+                    if (value == null) {
 
-		// If wait property, then delay loading
+                    }
+                    else if (value.getClass().equals(String.class)) {
+                        params.put(key, (String)value);
+                    }
+                    else if (value.getClass().equals(Boolean.class)) {
+                        params.put(key, (Boolean)value);
+                    }
+                    else if (value.getClass().equals(Integer.class)) {
+                        params.put(key, (Integer)value);
+                    }
+                }
+            }
+        }
 
-		if (wait > 0) {
-			try {
-				synchronized(this) {
-					this.wait(wait);
-				}
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		((DroidGap)this.ctx).showWebPage(url, openExternal, clearHistory, params);
-	}
+        // If wait property, then delay loading
+
+        if (wait > 0) {
+            try {
+                synchronized(this) {
+                    this.wait(wait);
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        ((DroidGap)this.ctx).showWebPage(url, openExternal, clearHistory, params);
+    }
+
+    /**
+     * Cancel loadUrl before it has been loaded.
+     */
+    public void cancelLoadUrl() {
+        ((DroidGap)this.ctx).cancelLoadUrl();
+    }
 
-	/**
-	 * Cancel loadUrl before it has been loaded.
-	 */
-	public void cancelLoadUrl() {
-		((DroidGap)this.ctx).cancelLoadUrl();
-	}
-	
     /**
      * Clear page history for the app.
      */
     public void clearHistory() {
-    	((DroidGap)this.ctx).clearHistory();
+        ((DroidGap)this.ctx).clearHistory();
     }
-    
+
     /**
      * Go to previous page displayed.
      * This is the same as pressing the backbutton on Android device.
@@ -172,27 +172,27 @@ public class App extends Plugin {
     /**
      * Override the default behavior of the Android back button.
      * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
-     * 
+     *
      * @param override		T=override, F=cancel override
      */
     public void overrideBackbutton(boolean override) {
-    	LOG.i("DroidGap", "WARNING: Back Button Default Behaviour will be overridden.  The backbutton event will be fired!");
-    	((DroidGap)this.ctx).bound = override;
+        LOG.i("DroidGap", "WARNING: Back Button Default Behaviour will be overridden.  The backbutton event will be fired!");
+        ((DroidGap)this.ctx).bound = override;
     }
 
     /**
      * Return whether the Android back button is overridden by the user.
-     * 
+     *
      * @return boolean
      */
     public boolean isBackbuttonOverridden() {
-    	return ((DroidGap)this.ctx).bound;
+        return ((DroidGap)this.ctx).bound;
     }
 
     /**
      * Exit the Android application.
      */
     public void exitApp() {
-    	((DroidGap)this.ctx).endActivity();
+        ((DroidGap)this.ctx).endActivity();
     }
 }
diff --git a/framework/src/org/apache/cordova/AudioHandler.java b/framework/src/org/apache/cordova/AudioHandler.java
index d7df63e9..dce24cdc 100755
--- a/framework/src/org/apache/cordova/AudioHandler.java
+++ b/framework/src/org/apache/cordova/AudioHandler.java
@@ -22,22 +22,20 @@ import android.content.Context;
 import android.media.AudioManager;
 import java.util.ArrayList;
 
-import org.apache.cordova.api.LOG;
 import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 
 import java.util.HashMap;
-import java.util.Map.Entry;
 
 /**
- * This class called by CordovaActivity to play and record audio.  
+ * This class called by CordovaActivity to play and record audio.
  * The file can be local or over a network using http.
- * 
+ *
  * Audio formats supported (tested):
  * 	.mp3, .wav
- * 
+ *
  * Local audio files must reside in one of two places:
  * 		android_asset: 		file name must start with /android_asset/sound.mp3
  * 		sdcard:				file name is just sound.mp3
@@ -45,112 +43,112 @@ import java.util.Map.Entry;
 public class AudioHandler extends Plugin {
 
     public static String TAG = "AudioHandler";
-	HashMap<String,AudioPlayer> players;	// Audio player object
-	ArrayList<AudioPlayer> pausedForPhone;     // Audio players that were paused when phone call came in
-	
-	/**
-	 * Constructor.
-	 */
-	public AudioHandler() {
-		this.players = new HashMap<String,AudioPlayer>();
-		this.pausedForPhone = new ArrayList<AudioPlayer>();
-	}
+    HashMap<String,AudioPlayer> players;	// Audio player object
+    ArrayList<AudioPlayer> pausedForPhone;     // Audio players that were paused when phone call came in
 
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("startRecordingAudio")) {
-				this.startRecordingAudio(args.getString(0), args.getString(1));
-			}
-			else if (action.equals("stopRecordingAudio")) {
-				this.stopRecordingAudio(args.getString(0));
-			}
-			else if (action.equals("startPlayingAudio")) {
-				this.startPlayingAudio(args.getString(0), args.getString(1));
-			}
-			else if (action.equals("seekToAudio")) {
-				this.seekToAudio(args.getString(0), args.getInt(1));
-			}
-			else if (action.equals("pausePlayingAudio")) {
-				this.pausePlayingAudio(args.getString(0));
-			}
-			else if (action.equals("stopPlayingAudio")) {
-				this.stopPlayingAudio(args.getString(0));
-			} else if (action.equals("setVolume")) {
-			   try {
-				   this.setVolume(args.getString(0), Float.parseFloat(args.getString(1)));
-			   } catch (NumberFormatException nfe) {
-				   //no-op
-			   }
-			} else if (action.equals("getCurrentPositionAudio")) {
-				float f = this.getCurrentPositionAudio(args.getString(0));
-				return new PluginResult(status, f);
-			}
-			else if (action.equals("getDurationAudio")) {
-				float f = this.getDurationAudio(args.getString(0), args.getString(1));
-				return new PluginResult(status, f);
-			}
-			else if (action.equals("release")) {
-				boolean b = this.release(args.getString(0));
-				return new PluginResult(status, b);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			e.printStackTrace();
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
+    /**
+     * Constructor.
+     */
+    public AudioHandler() {
+        this.players = new HashMap<String,AudioPlayer>();
+        this.pausedForPhone = new ArrayList<AudioPlayer>();
+    }
 
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("getCurrentPositionAudio")) {
-			return true;
-		}
-		else if (action.equals("getDurationAudio")) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Executes the request and returns PluginResult.
+     *
+     * @param action 		The action to execute.
+     * @param args 			JSONArry of arguments for the plugin.
+     * @param callbackId	The callback id used when calling back into JavaScript.
+     * @return 				A PluginResult object with a status and message.
+     */
+    public PluginResult execute(String action, JSONArray args, String callbackId) {
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";
 
-	/**
-	 * Stop all audio players and recorders.
-	 */
-	public void onDestroy() {
+        try {
+            if (action.equals("startRecordingAudio")) {
+                this.startRecordingAudio(args.getString(0), args.getString(1));
+            }
+            else if (action.equals("stopRecordingAudio")) {
+                this.stopRecordingAudio(args.getString(0));
+            }
+            else if (action.equals("startPlayingAudio")) {
+                this.startPlayingAudio(args.getString(0), args.getString(1));
+            }
+            else if (action.equals("seekToAudio")) {
+                this.seekToAudio(args.getString(0), args.getInt(1));
+            }
+            else if (action.equals("pausePlayingAudio")) {
+                this.pausePlayingAudio(args.getString(0));
+            }
+            else if (action.equals("stopPlayingAudio")) {
+                this.stopPlayingAudio(args.getString(0));
+            } else if (action.equals("setVolume")) {
+               try {
+                   this.setVolume(args.getString(0), Float.parseFloat(args.getString(1)));
+               } catch (NumberFormatException nfe) {
+                   //no-op
+               }
+            } else if (action.equals("getCurrentPositionAudio")) {
+                float f = this.getCurrentPositionAudio(args.getString(0));
+                return new PluginResult(status, f);
+            }
+            else if (action.equals("getDurationAudio")) {
+                float f = this.getDurationAudio(args.getString(0), args.getString(1));
+                return new PluginResult(status, f);
+            }
+            else if (action.equals("release")) {
+                boolean b = this.release(args.getString(0));
+                return new PluginResult(status, b);
+            }
+            return new PluginResult(status, result);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+        }
+    }
+
+    /**
+     * Identifies if action to be executed returns a value and should be run synchronously.
+     *
+     * @param action	The action to execute
+     * @return			T=returns value
+     */
+    public boolean isSynch(String action) {
+        if (action.equals("getCurrentPositionAudio")) {
+            return true;
+        }
+        else if (action.equals("getDurationAudio")) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Stop all audio players and recorders.
+     */
+    public void onDestroy() {
         for (AudioPlayer audio : this.players.values()) {
             audio.destroy();
         }
         this.players.clear();
-	}
-	
+    }
+
     /**
-     * Called when a message is sent to plugin. 
-     * 
+     * Called when a message is sent to plugin.
+     *
      * @param id            The message id
      * @param data          The message data
      */
     public void onMessage(String id, Object data) {
-        
+
         // If phone message
         if (id.equals("telephone")) {
-            
+
             // If phone ringing, then pause playing
             if ("ringing".equals(data) || "offhook".equals(data)) {
-                
+
                 // Get all audio players and pause them
                 for (AudioPlayer audio : this.players.values()) {
                     if (audio.getState() == AudioPlayer.MEDIA_RUNNING) {
@@ -160,7 +158,7 @@ public class AudioHandler extends Plugin {
                 }
 
             }
-            
+
             // If phone idle, then resume playing those players we paused
             else if ("idle".equals(data)) {
                 for (AudioPlayer audio : this.pausedForPhone) {
@@ -174,177 +172,177 @@ public class AudioHandler extends Plugin {
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
-	
-	/**
-	 * Release the audio player instance to save memory.
-	 * 
-	 * @param id				The id of the audio player
-	 */
-	private boolean release(String id) {
-    	if (!this.players.containsKey(id)) {
-    		return false;
-    	}
-    	AudioPlayer audio = this.players.get(id);
-    	this.players.remove(id);
-    	audio.destroy();
-    	return true;
-	}
 
-	/**
-	 * Start recording and save the specified file.
-	 * 
-	 * @param id				The id of the audio player
-	 * @param file				The name of the file
-	 */
+    /**
+     * Release the audio player instance to save memory.
+     *
+     * @param id				The id of the audio player
+     */
+    private boolean release(String id) {
+        if (!this.players.containsKey(id)) {
+            return false;
+        }
+        AudioPlayer audio = this.players.get(id);
+        this.players.remove(id);
+        audio.destroy();
+        return true;
+    }
+
+    /**
+     * Start recording and save the specified file.
+     *
+     * @param id				The id of the audio player
+     * @param file				The name of the file
+     */
     public void startRecordingAudio(String id, String file) {
-    	// If already recording, then just return;
-    	if (this.players.containsKey(id)) {
-    		return;
-    	}
-    	AudioPlayer audio = new AudioPlayer(this, id);
-    	this.players.put(id, audio);
-    	audio.startRecording(file);
+        // If already recording, then just return;
+        if (this.players.containsKey(id)) {
+            return;
+        }
+        AudioPlayer audio = new AudioPlayer(this, id);
+        this.players.put(id, audio);
+        audio.startRecording(file);
     }
 
     /**
      * Stop recording and save to the file specified when recording started.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      */
     public void stopRecordingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.stopRecording();
-    		this.players.remove(id);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.stopRecording();
+            this.players.remove(id);
+        }
     }
-    
+
     /**
      * Start or resume playing audio file.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      * @param file				The name of the audio file.
      */
     public void startPlayingAudio(String id, String file) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio == null) {
-    		audio = new AudioPlayer(this, id);
-    		this.players.put(id, audio);
-    	}
-    	audio.startPlaying(file);
+        AudioPlayer audio = this.players.get(id);
+        if (audio == null) {
+            audio = new AudioPlayer(this, id);
+            this.players.put(id, audio);
+        }
+        audio.startPlaying(file);
     }
 
     /**
      * Seek to a location.
-     * 
-     * 
-	 * @param id				The id of the audio player
-	 * @param miliseconds		int: number of milliseconds to skip 1000 = 1 second
+     *
+     *
+     * @param id				The id of the audio player
+     * @param miliseconds		int: number of milliseconds to skip 1000 = 1 second
      */
     public void seekToAudio(String id, int milliseconds) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.seekToPlaying(milliseconds);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.seekToPlaying(milliseconds);
+        }
     }
-    
+
     /**
      * Pause playing.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      */
     public void pausePlayingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.pausePlaying();
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.pausePlaying();
+        }
     }
 
     /**
      * Stop playing the audio file.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      */
     public void stopPlayingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.stopPlaying();
-    		//audio.destroy();
-    		//this.players.remove(id);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.stopPlaying();
+            //audio.destroy();
+            //this.players.remove(id);
+        }
     }
-    
+
     /**
      * Get current position of playback.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      * @return 					position in msec
      */
     public float getCurrentPositionAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		return(audio.getCurrentPosition()/1000.0f);
-    	}
-    	return -1;
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            return(audio.getCurrentPosition()/1000.0f);
+        }
+        return -1;
     }
-    
+
     /**
      * Get the duration of the audio file.
-     * 
-	 * @param id				The id of the audio player
+     *
+     * @param id				The id of the audio player
      * @param file				The name of the audio file.
      * @return					The duration in msec.
      */
     public float getDurationAudio(String id, String file) {
-    	
-    	// Get audio file
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		return(audio.getDuration(file));
-    	}
-    	
-    	// If not already open, then open the file
-    	else {
-    		audio = new AudioPlayer(this, id);
-    		this.players.put(id, audio);
-    		return(audio.getDuration(file));
-    	}
-    }  
-    
+
+        // Get audio file
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            return(audio.getDuration(file));
+        }
+
+        // If not already open, then open the file
+        else {
+            audio = new AudioPlayer(this, id);
+            this.players.put(id, audio);
+            return(audio.getDuration(file));
+        }
+    }
+
     /**
      * Set the audio device to be used for playback.
-     * 
+     *
      * @param output			1=earpiece, 2=speaker
      */
     public void setAudioOutputDevice(int output) {
-		AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
-		if (output == 2) {
-			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
-		}
-		else if (output == 1) {
-			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
-		}
-		else {
-			System.out.println("AudioHandler.setAudioOutputDevice() Error: Unknown output device.");
-		}
+        AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
+        if (output == 2) {
+            audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
+        }
+        else if (output == 1) {
+            audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
+        }
+        else {
+            System.out.println("AudioHandler.setAudioOutputDevice() Error: Unknown output device.");
+        }
     }
-    
+
     /**
      * Get the audio device to be used for playback.
-     * 
+     *
      * @return					1=earpiece, 2=speaker
      */
     public int getAudioOutputDevice() {
-		AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
-		if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE) {
-			return 1;
-		}
-		else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEAKER) {
-			return 2;
-		}
-		else {
-			return -1;
-		}
+        AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
+        if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE) {
+            return 1;
+        }
+        else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEAKER) {
+            return 2;
+        }
+        else {
+            return -1;
+        }
     }
 
     /**
diff --git a/framework/src/org/apache/cordova/AudioPlayer.java b/framework/src/org/apache/cordova/AudioPlayer.java
index 9397ec74..675161fe 100755
--- a/framework/src/org/apache/cordova/AudioPlayer.java
+++ b/framework/src/org/apache/cordova/AudioPlayer.java
@@ -35,7 +35,7 @@ import java.io.IOException;
  * This class implements the audio playback and recording capabilities used by Cordova.
  * It is called by the AudioHandler Cordova class.
  * Only one file can be played or recorded per class instance.
- * 
+ *
  * Local audio files must reside in one of two places:
  * 		android_asset: 		file name must start with /android_asset/sound.mp3
  * 		sdcard:				file name is just sound.mp3
@@ -45,422 +45,422 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
     private static final String LOG_TAG = "AudioPlayer";
 
     // AudioPlayer states
-	public static int MEDIA_NONE = 0;
-	public static int MEDIA_STARTING = 1;
-	public static int MEDIA_RUNNING = 2;
-	public static int MEDIA_PAUSED = 3;
-	public static int MEDIA_STOPPED = 4;
-	
-	// AudioPlayer message ids
-	private static int MEDIA_STATE = 1;
-	private static int MEDIA_DURATION = 2;
+    public static int MEDIA_NONE = 0;
+    public static int MEDIA_STARTING = 1;
+    public static int MEDIA_RUNNING = 2;
+    public static int MEDIA_PAUSED = 3;
+    public static int MEDIA_STOPPED = 4;
+
+    // AudioPlayer message ids
+    private static int MEDIA_STATE = 1;
+    private static int MEDIA_DURATION = 2;
     private static int MEDIA_POSITION = 3;
-	private static int MEDIA_ERROR = 9;
-	
-	// Media error codes
+    private static int MEDIA_ERROR = 9;
+
+    // Media error codes
     private static int MEDIA_ERR_NONE_ACTIVE    = 0;
     private static int MEDIA_ERR_ABORTED        = 1;
     private static int MEDIA_ERR_NETWORK        = 2;
     private static int MEDIA_ERR_DECODE         = 3;
     private static int MEDIA_ERR_NONE_SUPPORTED = 4;
-	
-	private AudioHandler handler;					// The AudioHandler object
-	private String id;								// The id of this player (used to identify Media object in JavaScript)
-	private int state = MEDIA_NONE;					// State of recording or playback
-	private String audioFile = null;				// File name to play or record to
-	private float duration = -1;					// Duration of audio
 
-	private MediaRecorder recorder = null;			// Audio recording object
-	private String tempFile = null;					// Temporary recording file name
-	
-	private MediaPlayer mPlayer = null;				// Audio player object
-	private boolean prepareOnly = false;
+    private AudioHandler handler;					// The AudioHandler object
+    private String id;								// The id of this player (used to identify Media object in JavaScript)
+    private int state = MEDIA_NONE;					// State of recording or playback
+    private String audioFile = null;				// File name to play or record to
+    private float duration = -1;					// Duration of audio
 
-	/**
-	 * Constructor.
-	 * 
-	 * @param handler			The audio handler object
-	 * @param id				The id of this audio player
-	 */
-	public AudioPlayer(AudioHandler handler, String id) {
-		this.handler = handler;
-		this.id = id;
+    private MediaRecorder recorder = null;			// Audio recording object
+    private String tempFile = null;					// Temporary recording file name
+
+    private MediaPlayer mPlayer = null;				// Audio player object
+    private boolean prepareOnly = false;
+
+    /**
+     * Constructor.
+     *
+     * @param handler			The audio handler object
+     * @param id				The id of this audio player
+     */
+    public AudioPlayer(AudioHandler handler, String id) {
+        this.handler = handler;
+        this.id = id;
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
             this.tempFile = Environment.getExternalStorageDirectory().getAbsolutePath() + "/tmprecording.mp3";
         } else {
             this.tempFile = "/data/data/" + handler.ctx.getPackageName() + "/cache/tmprecording.mp3";
         }
-	}	
+    }
 
-	/**
-	 * Destroy player and stop audio playing or recording.
-	 */
-	public void destroy() {
-		
-		// Stop any play or record
-		if (this.mPlayer != null) {
-	        if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-	            this.mPlayer.stop();
-	            this.setState(MEDIA_STOPPED);
-	        }
-			this.mPlayer.release();
-			this.mPlayer = null;
-		}
-		if (this.recorder != null) {
-			this.stopRecording();
-			this.recorder.release();
-			this.recorder = null;
-		}
-	}
+    /**
+     * Destroy player and stop audio playing or recording.
+     */
+    public void destroy() {
 
-	/**
-	 * Start recording the specified file.
-	 * 
-	 * @param file				The name of the file
-	 */
-	public void startRecording(String file) {
-		if (this.mPlayer != null) {
-			Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
-		}
-		
-		// Make sure we're not already recording
-		else if (this.recorder == null) {
-			this.audioFile = file;
-			this.recorder = new MediaRecorder();
-			this.recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-			this.recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT); // THREE_GPP);
-			this.recorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT); //AMR_NB);
-			this.recorder.setOutputFile(this.tempFile);
-			try {
-				this.recorder.prepare();
-				this.recorder.start();
-				this.setState(MEDIA_RUNNING);
-				return;
-			} catch (IllegalStateException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-		}
-	}
-	
-	/**
-	 * Save temporary recorded file to specified name
-	 * 
-	 * @param file
-	 */
-	public void moveFile(String file) {	
-		/* this is a hack to save the file as the specified name */
-		File f = new File(this.tempFile);
+        // Stop any play or record
+        if (this.mPlayer != null) {
+            if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
+                this.mPlayer.stop();
+                this.setState(MEDIA_STOPPED);
+            }
+            this.mPlayer.release();
+            this.mPlayer = null;
+        }
+        if (this.recorder != null) {
+            this.stopRecording();
+            this.recorder.release();
+            this.recorder = null;
+        }
+    }
+
+    /**
+     * Start recording the specified file.
+     *
+     * @param file				The name of the file
+     */
+    public void startRecording(String file) {
+        if (this.mPlayer != null) {
+            Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+        }
+
+        // Make sure we're not already recording
+        else if (this.recorder == null) {
+            this.audioFile = file;
+            this.recorder = new MediaRecorder();
+            this.recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+            this.recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT); // THREE_GPP);
+            this.recorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT); //AMR_NB);
+            this.recorder.setOutputFile(this.tempFile);
+            try {
+                this.recorder.prepare();
+                this.recorder.start();
+                this.setState(MEDIA_RUNNING);
+                return;
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+        }
+        else {
+            Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+        }
+    }
+
+    /**
+     * Save temporary recorded file to specified name
+     *
+     * @param file
+     */
+    public void moveFile(String file) {
+        /* this is a hack to save the file as the specified name */
+        File f = new File(this.tempFile);
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            f.renameTo(new File(Environment.getExternalStorageDirectory().getAbsolutePath() 
+            f.renameTo(new File(Environment.getExternalStorageDirectory().getAbsolutePath()
                     + File.separator + file));
         } else {
             f.renameTo(new File("/data/data/" + handler.ctx.getPackageName() + "/cache/" + file));
         }
-		
-	}
-	
+
+    }
+
     /**
      * Stop recording and save to the file specified when recording started.
      */
-	public void stopRecording() {
-		if (this.recorder != null) {
-			try{
-				if (this.state == MEDIA_RUNNING) {
-					this.recorder.stop();
-					this.setState(MEDIA_STOPPED);
-				}
-				this.moveFile(this.audioFile);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}	
-	
+    public void stopRecording() {
+        if (this.recorder != null) {
+            try{
+                if (this.state == MEDIA_RUNNING) {
+                    this.recorder.stop();
+                    this.setState(MEDIA_STOPPED);
+                }
+                this.moveFile(this.audioFile);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     /**
      * Start or resume playing audio file.
-     * 
+     *
      * @param file				The name of the audio file.
      */
-	public void startPlaying(String file) {
-		if (this.recorder != null) {
-		    Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
-		}
-		
-		// If this is a new request to play audio, or stopped
-		else if ((this.mPlayer == null) || (this.state == MEDIA_STOPPED)) {
-			try {
-				// If stopped, then reset player
-				if (this.mPlayer != null) {
-					this.mPlayer.reset();
-				}
-				// Otherwise, create a new one
-				else {
-					this.mPlayer = new MediaPlayer();
-				}
-				this.audioFile = file;
-				
-				// If streaming file
-				if (this.isStreaming(file)) {
-					this.mPlayer.setDataSource(file);
-					this.mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);  
-					this.setState(MEDIA_STARTING);
-					this.mPlayer.setOnPreparedListener(this);		
-					this.mPlayer.prepareAsync();
-				}
-				
-				// If local file
-				else {
-					if (file.startsWith("/android_asset/")) {
-						String f = file.substring(15);
-						android.content.res.AssetFileDescriptor fd = this.handler.ctx.getBaseContext().getAssets().openFd(f);
-						this.mPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
-					}
+    public void startPlaying(String file) {
+        if (this.recorder != null) {
+            Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+        }
+
+        // If this is a new request to play audio, or stopped
+        else if ((this.mPlayer == null) || (this.state == MEDIA_STOPPED)) {
+            try {
+                // If stopped, then reset player
+                if (this.mPlayer != null) {
+                    this.mPlayer.reset();
+                }
+                // Otherwise, create a new one
+                else {
+                    this.mPlayer = new MediaPlayer();
+                }
+                this.audioFile = file;
+
+                // If streaming file
+                if (this.isStreaming(file)) {
+                    this.mPlayer.setDataSource(file);
+                    this.mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+                    this.setState(MEDIA_STARTING);
+                    this.mPlayer.setOnPreparedListener(this);
+                    this.mPlayer.prepareAsync();
+                }
+
+                // If local file
+                else {
+                    if (file.startsWith("/android_asset/")) {
+                        String f = file.substring(15);
+                        android.content.res.AssetFileDescriptor fd = this.handler.ctx.getBaseContext().getAssets().openFd(f);
+                        this.mPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
+                    }
                     else {
                         File fp = new File(file);
                         if (fp.exists()) {
                             FileInputStream fileInputStream = new FileInputStream(file);
                             this.mPlayer.setDataSource(fileInputStream.getFD());
-                        } 
+                        }
                         else {
                             this.mPlayer.setDataSource("/sdcard/" + file);
                         }
                     }
-					this.setState(MEDIA_STARTING);
-					this.mPlayer.setOnPreparedListener(this);		
-					this.mPlayer.prepare();
+                    this.setState(MEDIA_STARTING);
+                    this.mPlayer.setOnPreparedListener(this);
+                    this.mPlayer.prepare();
 
-					// Get duration
-					this.duration = getDurationInSeconds();
-				}
-			} 
-			catch (Exception e) { 
-				e.printStackTrace(); 
-				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-			}
-		}
+                    // Get duration
+                    this.duration = getDurationInSeconds();
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+            }
+        }
 
-		// If we have already have created an audio player
-		else {
-			
-			// If player has been paused, then resume playback
-			if ((this.state == MEDIA_PAUSED) || (this.state == MEDIA_STARTING)) {
-				this.mPlayer.start();
-				this.setState(MEDIA_RUNNING);
-			}
-			else {
-			    Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
-				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-			}
-		}
-	} 
+        // If we have already have created an audio player
+        else {
 
-	/**
-	 * Seek or jump to a new time in the track.
-	 */
-	public void seekToPlaying(int milliseconds) {
-		if (this.mPlayer != null) {
-		    this.mPlayer.seekTo(milliseconds);
-		    Log.d(LOG_TAG, "Send a onStatus update for the new seek");
-		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
-		}
-	}
-	
-	/**
-	 * Pause playing.
-	 */
-	public void pausePlaying() {
-		
-		// If playing, then pause
-		if (this.state == MEDIA_RUNNING) {
-			this.mPlayer.pause();
-			this.setState(MEDIA_PAUSED);
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);			
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");			
-		}
-	}
+            // If player has been paused, then resume playback
+            if ((this.state == MEDIA_PAUSED) || (this.state == MEDIA_STARTING)) {
+                this.mPlayer.start();
+                this.setState(MEDIA_RUNNING);
+            }
+            else {
+                Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
+                this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+            }
+        }
+    }
+
+    /**
+     * Seek or jump to a new time in the track.
+     */
+    public void seekToPlaying(int milliseconds) {
+        if (this.mPlayer != null) {
+            this.mPlayer.seekTo(milliseconds);
+            Log.d(LOG_TAG, "Send a onStatus update for the new seek");
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
+        }
+    }
+
+    /**
+     * Pause playing.
+     */
+    public void pausePlaying() {
+
+        // If playing, then pause
+        if (this.state == MEDIA_RUNNING) {
+            this.mPlayer.pause();
+            this.setState(MEDIA_PAUSED);
+        }
+        else {
+            Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");
+        }
+    }
 
     /**
      * Stop playing the audio file.
      */
-	public void stopPlaying() {
-		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-			this.mPlayer.stop();
-			this.setState(MEDIA_STOPPED);
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);			
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");			
-		}
-	}
-	
-	/**
-	 * Callback to be invoked when playback of a media source has completed.
-	 * 
-	 * @param mPlayer			The MediaPlayer that reached the end of the file 
-	 */
-	public void onCompletion(MediaPlayer mPlayer) {
-		this.setState(MEDIA_STOPPED);
-    } 
-	
+    public void stopPlaying() {
+        if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
+            this.mPlayer.stop();
+            this.setState(MEDIA_STOPPED);
+        }
+        else {
+            Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");
+        }
+    }
+
+    /**
+     * Callback to be invoked when playback of a media source has completed.
+     *
+     * @param mPlayer			The MediaPlayer that reached the end of the file
+     */
+    public void onCompletion(MediaPlayer mPlayer) {
+        this.setState(MEDIA_STOPPED);
+    }
+
     /**
      * Get current position of playback.
-     * 
+     *
      * @return 					position in msec or -1 if not playing
      */
-	public long getCurrentPosition() {
-		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-		    int curPos = this.mPlayer.getCurrentPosition();
-		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
-			return curPos;
-		} 
-		else { 
-			return -1; 
-		}
-	}
-	
-	/**
-	 * Determine if playback file is streaming or local.
-	 * It is streaming if file name starts with "http://"
-	 * 
-	 * @param file				The file name
-	 * @return					T=streaming, F=local
-	 */
-	public boolean isStreaming(String file) {
-		if (file.contains("http://") || file.contains("https://")) {
-			return true;
-		} 
-		else {
-			return false;
-		}
-	}
-	
+    public long getCurrentPosition() {
+        if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
+            int curPos = this.mPlayer.getCurrentPosition();
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
+            return curPos;
+        }
+        else {
+            return -1;
+        }
+    }
+
+    /**
+     * Determine if playback file is streaming or local.
+     * It is streaming if file name starts with "http://"
+     *
+     * @param file				The file name
+     * @return					T=streaming, F=local
+     */
+    public boolean isStreaming(String file) {
+        if (file.contains("http://") || file.contains("https://")) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
    /**
      * Get the duration of the audio file.
-     * 
+     *
      * @param file				The name of the audio file.
      * @return					The duration in msec.
      * 							-1=can't be determined
      * 							-2=not allowed
      */
-	public float getDuration(String file) {
-		
-		// Can't get duration of recording
-		if (this.recorder != null) {
-			return(-2); // not allowed
-		}
-		
-		// If audio file already loaded and started, then return duration
-		if (this.mPlayer != null) {
-			return this.duration;
-		}
-		
-		// If no player yet, then create one
-		else {
-			this.prepareOnly = true;
-			this.startPlaying(file);
-			
-			// This will only return value for local, since streaming
-			// file hasn't been read yet.
-			return this.duration;
-		}
-	}
+    public float getDuration(String file) {
 
-	/**
-	 * Callback to be invoked when the media source is ready for playback. 
-	 * 
-	 * @param mPlayer			The MediaPlayer that is ready for playback 
-	 */
-	public void onPrepared(MediaPlayer mPlayer) {
-		// Listen for playback completion
-		this.mPlayer.setOnCompletionListener(this);
+        // Can't get duration of recording
+        if (this.recorder != null) {
+            return(-2); // not allowed
+        }
 
-		// If start playing after prepared
-		if (!this.prepareOnly) {
-			
-			// Start playing
-			this.mPlayer.start();
+        // If audio file already loaded and started, then return duration
+        if (this.mPlayer != null) {
+            return this.duration;
+        }
 
-			// Set player init flag
-			this.setState(MEDIA_RUNNING);
-		}
-		
-		// Save off duration
-		this.duration = getDurationInSeconds();	
-		this.prepareOnly = false;
+        // If no player yet, then create one
+        else {
+            this.prepareOnly = true;
+            this.startPlaying(file);
 
-		// Send status notification to JavaScript
-		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
-		
-	}
+            // This will only return value for local, since streaming
+            // file hasn't been read yet.
+            return this.duration;
+        }
+    }
 
-	/**
-	 * By default Android returns the length of audio in mills but we want seconds
-	 * 
-	 * @return length of clip in seconds
-	 */
-	private float getDurationInSeconds() {
-		return (this.mPlayer.getDuration() / 1000.0f);
-	}
+    /**
+     * Callback to be invoked when the media source is ready for playback.
+     *
+     * @param mPlayer			The MediaPlayer that is ready for playback
+     */
+    public void onPrepared(MediaPlayer mPlayer) {
+        // Listen for playback completion
+        this.mPlayer.setOnCompletionListener(this);
 
-	/**
-	 * Callback to be invoked when there has been an error during an asynchronous operation
-	 *  (other errors will throw exceptions at method call time).
-	 *  
-	 * @param mPlayer			the MediaPlayer the error pertains to
-	 * @param arg1				the type of error that has occurred: (MEDIA_ERROR_UNKNOWN, MEDIA_ERROR_SERVER_DIED)
-	 * @param arg2				an extra code, specific to the error.
-	 */
-	public boolean onError(MediaPlayer mPlayer, int arg1, int arg2) {
-	    Log.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2+")");
+        // If start playing after prepared
+        if (!this.prepareOnly) {
 
-		// TODO: Not sure if this needs to be sent?
-		this.mPlayer.stop();
-		this.mPlayer.release();
-		
-		// Send error notification to JavaScript
-		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', { \"code\":"+arg1+"});");
-		return false;
-	}
-	
-	/**
-	 * Set the state and send it to JavaScript.
-	 * 
-	 * @param state
-	 */
-	private void setState(int state) {
-		if (this.state != state) {
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
-		}
-		
-		this.state = state;
-	}
-	
-	/**
-	 * Get the audio state.
-	 * 
-	 * @return int
-	 */
-	public int getState() {
-	    return this.state;
-	}
+            // Start playing
+            this.mPlayer.start();
 
-	/**
-	 * Set the volume for audio player
-	 *
-	 * @param volume
-	 */
+            // Set player init flag
+            this.setState(MEDIA_RUNNING);
+        }
+
+        // Save off duration
+        this.duration = getDurationInSeconds();
+        this.prepareOnly = false;
+
+        // Send status notification to JavaScript
+        this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
+
+    }
+
+    /**
+     * By default Android returns the length of audio in mills but we want seconds
+     *
+     * @return length of clip in seconds
+     */
+    private float getDurationInSeconds() {
+        return (this.mPlayer.getDuration() / 1000.0f);
+    }
+
+    /**
+     * Callback to be invoked when there has been an error during an asynchronous operation
+     *  (other errors will throw exceptions at method call time).
+     *
+     * @param mPlayer			the MediaPlayer the error pertains to
+     * @param arg1				the type of error that has occurred: (MEDIA_ERROR_UNKNOWN, MEDIA_ERROR_SERVER_DIED)
+     * @param arg2				an extra code, specific to the error.
+     */
+    public boolean onError(MediaPlayer mPlayer, int arg1, int arg2) {
+        Log.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2+")");
+
+        // TODO: Not sure if this needs to be sent?
+        this.mPlayer.stop();
+        this.mPlayer.release();
+
+        // Send error notification to JavaScript
+        this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', { \"code\":"+arg1+"});");
+        return false;
+    }
+
+    /**
+     * Set the state and send it to JavaScript.
+     *
+     * @param state
+     */
+    private void setState(int state) {
+        if (this.state != state) {
+            this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
+        }
+
+        this.state = state;
+    }
+
+    /**
+     * Get the audio state.
+     *
+     * @return int
+     */
+    public int getState() {
+        return this.state;
+    }
+
+    /**
+     * Set the volume for audio player
+     *
+     * @param volume
+     */
     public void setVolume(float volume) {
         this.mPlayer.setVolume(volume, volume);
     }
diff --git a/framework/src/org/apache/cordova/AuthenticationToken.java b/framework/src/org/apache/cordova/AuthenticationToken.java
index 60965a37..d3a231a0 100644
--- a/framework/src/org/apache/cordova/AuthenticationToken.java
+++ b/framework/src/org/apache/cordova/AuthenticationToken.java
@@ -24,46 +24,46 @@ package org.apache.cordova;
 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;
     }
-    
-    
-    
-    
+
+
+
+
 }
diff --git a/framework/src/org/apache/cordova/BatteryListener.java b/framework/src/org/apache/cordova/BatteryListener.java
index 84024b2c..22b1b94b 100755
--- a/framework/src/org/apache/cordova/BatteryListener.java
+++ b/framework/src/org/apache/cordova/BatteryListener.java
@@ -32,23 +32,23 @@ import android.content.IntentFilter;
 import android.util.Log;
 
 public class BatteryListener extends Plugin {
-    
+
     private static final String LOG_TAG = "BatteryManager";
 
     BroadcastReceiver receiver;
 
     private String batteryCallbackId = null;
-    
+
     /**
      * Constructor.
      */
     public BatteryListener() {
         this.receiver = null;
     }
-    
+
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action        The action to execute.
      * @param args          JSONArry of arguments for the plugin.
      * @param callbackId    The callback id used when calling back into JavaScript.
@@ -56,12 +56,12 @@ public class BatteryListener extends Plugin {
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
-        String result = "Unsupported Operation: " + action; 
-                
+        String result = "Unsupported Operation: " + action;
+
         if (action.equals("start")) {
-        	if (this.batteryCallbackId != null) {
-        		return new PluginResult(PluginResult.Status.ERROR, "Battery listener already running.");
-        	}
+            if (this.batteryCallbackId != null) {
+                return new PluginResult(PluginResult.Status.ERROR, "Battery listener already running.");
+            }
             this.batteryCallbackId = callbackId;
 
             // We need to listen to power events to update battery status
@@ -70,29 +70,29 @@ public class BatteryListener extends Plugin {
             if (this.receiver == null) {
                 this.receiver = new BroadcastReceiver() {
                     @Override
-                    public void onReceive(Context context, Intent intent) { 
-                        updateBatteryInfo(intent);              
+                    public void onReceive(Context context, Intent intent) {
+                        updateBatteryInfo(intent);
                     }
                 };
                 ctx.registerReceiver(this.receiver, intentFilter);
             }
 
-            // Don't return any result now, since status results will be sent when events come in from broadcast receiver 
+            // Don't return any result now, since status results will be sent when events come in from broadcast receiver
             PluginResult pluginResult = new PluginResult(PluginResult.Status.NO_RESULT);
             pluginResult.setKeepCallback(true);
             return pluginResult;
-        } 
-        
+        }
+
         else if (action.equals("stop")) {
             removeBatteryListener();
             this.sendUpdate(new JSONObject(), false); // release status callback in JS side
             this.batteryCallbackId = null;
             return new PluginResult(PluginResult.Status.OK);
         }
-        
+
         return new PluginResult(status, result);
     }
-    
+
     /**
      * Stop battery receiver.
      */
@@ -116,7 +116,7 @@ public class BatteryListener extends Plugin {
 
     /**
      * Creates a JSONObject with the current battery information
-     * 
+     *
      * @param batteryIntent the current battery information
      * @return a JSONObject containing the battery status information
      */
@@ -133,24 +133,24 @@ public class BatteryListener extends Plugin {
 
     /**
      * Updates the JavaScript side whenever the battery changes
-     * 
+     *
      * @param batteryIntent the current battery information
      * @return
      */
-    private void updateBatteryInfo(Intent batteryIntent) {    
+    private void updateBatteryInfo(Intent batteryIntent) {
         sendUpdate(this.getBatteryInfo(batteryIntent), true);
     }
-    
+
     /**
      * Create a new plugin result and send it back to JavaScript
-     * 
+     *
      * @param connection the network info to set as navigator.connection
      */
     private void sendUpdate(JSONObject info, boolean keepCallback) {
-    	if (this.batteryCallbackId != null) {
-    		PluginResult result = new PluginResult(PluginResult.Status.OK, info);
-    		result.setKeepCallback(keepCallback);
-    		this.success(result, this.batteryCallbackId);
-    	}
+        if (this.batteryCallbackId != null) {
+            PluginResult result = new PluginResult(PluginResult.Status.OK, info);
+            result.setKeepCallback(keepCallback);
+            this.success(result, this.batteryCallbackId);
+        }
     }
 }
diff --git a/framework/src/org/apache/cordova/CallbackServer.java b/framework/src/org/apache/cordova/CallbackServer.java
index 6b6ce703..a34ef3cb 100755
--- a/framework/src/org/apache/cordova/CallbackServer.java
+++ b/framework/src/org/apache/cordova/CallbackServer.java
@@ -25,337 +25,334 @@ import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.net.URLEncoder;
 import java.util.LinkedList;
 
-import android.util.Log;
-
 /**
  * This class provides a way for Java to run JavaScript in the web page that has loaded Cordova.
  * The CallbackServer class implements an XHR server and a polling server with a list of JavaScript
  * statements that are to be executed on the web page.
- * 
+ *
  * The process flow for XHR is:
- * 1. JavaScript makes an async XHR call. 
- * 2. The server holds the connection open until data is available. 
- * 3. The server writes the data to the client and closes the connection. 
- * 4. The server immediately starts listening for the next XHR call. 
+ * 1. JavaScript makes an async XHR call.
+ * 2. The server holds the connection open until data is available.
+ * 3. The server writes the data to the client and closes the connection.
+ * 4. The server immediately starts listening for the next XHR call.
  * 5. The client receives this XHR response, processes it.
  * 6. The client sends a new async XHR request.
  *
  * The CallbackServer class requires the following permission in Android manifest file
  * 		<uses-permission android:name="android.permission.INTERNET" />
- * 
+ *
  * If the device has a proxy set, then XHR cannot be used, so polling must be used instead.
- * This can be determined by the client by calling CallbackServer.usePolling().  
- * 
+ * This can be determined by the client by calling CallbackServer.usePolling().
+ *
  * The process flow for polling is:
  * 1. The client calls CallbackServer.getJavascript() to retrieve next statement.
  * 2. If statement available, then client processes it.
- * 3. The client repeats #1 in loop. 
+ * 3. The client repeats #1 in loop.
  */
 public class CallbackServer implements Runnable {
-	
-	private static final String LOG_TAG = "CallbackServer";
 
-	/**
-	 * The list of JavaScript statements to be sent to JavaScript.
-	 */
-	private LinkedList<String> javascript;
-	
-	/**
-	 * The port to listen on.
-	 */
-	private int port;
-	
-	/**
-	 * The server thread.
-	 */
-	private Thread serverThread;
-	
-	/**
-	 * Indicates the server is running.
-	 */
-	private boolean active;
-	
-	/**
-	 * Indicates that the JavaScript statements list is empty
-	 */
-	private boolean empty;
-	
-	/**
-	 * Indicates that polling should be used instead of XHR.
-	 */
-	private boolean usePolling = true;
-	
-	/**
-	 * Security token to prevent other apps from accessing this callback server via XHR
-	 */
-	private String token;
-	
-	/**
-	 * Constructor.
-	 */
-	public CallbackServer() {
-		//System.out.println("CallbackServer()");
-		this.active = false;
-		this.empty = true;
-		this.port = 0;
-		this.javascript = new LinkedList<String>();		
-	}
-	
-	/**
-	 * Init callback server and start XHR if running local app.
-	 * 
-	 * If Cordova app is loaded from file://, then we can use XHR
-	 * otherwise we have to use polling due to cross-domain security restrictions.
-	 * 
-	 * @param url			The URL of the Cordova app being loaded
-	 */
-	public void init(String url) {
-		//System.out.println("CallbackServer.start("+url+")");
-		this.active = false;
-		this.empty = true;
-		this.port = 0;
-		this.javascript = new LinkedList<String>();		
+    private static final String LOG_TAG = "CallbackServer";
+
+    /**
+     * The list of JavaScript statements to be sent to JavaScript.
+     */
+    private LinkedList<String> javascript;
+
+    /**
+     * The port to listen on.
+     */
+    private int port;
+
+    /**
+     * The server thread.
+     */
+    private Thread serverThread;
+
+    /**
+     * Indicates the server is running.
+     */
+    private boolean active;
+
+    /**
+     * Indicates that the JavaScript statements list is empty
+     */
+    private boolean empty;
+
+    /**
+     * Indicates that polling should be used instead of XHR.
+     */
+    private boolean usePolling = true;
+
+    /**
+     * Security token to prevent other apps from accessing this callback server via XHR
+     */
+    private String token;
+
+    /**
+     * Constructor.
+     */
+    public CallbackServer() {
+        //System.out.println("CallbackServer()");
+        this.active = false;
+        this.empty = true;
+        this.port = 0;
+        this.javascript = new LinkedList<String>();
+    }
+
+    /**
+     * Init callback server and start XHR if running local app.
+     *
+     * If Cordova app is loaded from file://, then we can use XHR
+     * otherwise we have to use polling due to cross-domain security restrictions.
+     *
+     * @param url			The URL of the Cordova app being loaded
+     */
+    public void init(String url) {
+        //System.out.println("CallbackServer.start("+url+")");
+        this.active = false;
+        this.empty = true;
+        this.port = 0;
+        this.javascript = new LinkedList<String>();
+
+        // Determine if XHR or polling is to be used
+        if ((url != null) && !url.startsWith("file://")) {
+            this.usePolling = true;
+            this.stopServer();
+        }
+        else if (android.net.Proxy.getDefaultHost() != null) {
+            this.usePolling = true;
+            this.stopServer();
+        }
+        else {
+            this.usePolling = false;
+            this.startServer();
+        }
+    }
 
-		// Determine if XHR or polling is to be used
-		if ((url != null) && !url.startsWith("file://")) {
-			this.usePolling = true;
-			this.stopServer();
-		}
-		else if (android.net.Proxy.getDefaultHost() != null) {
-			this.usePolling = true;
-			this.stopServer();
-		}
-		else {
-			this.usePolling = false;
-			this.startServer();
-		}
-	}
-	
     /**
      * Re-init when loading a new HTML page into webview.
-     * 
+     *
      * @param url           The URL of the Cordova app being loaded
      */
-	public void reinit(String url) {
-	    this.stopServer();
-	    this.init(url);
-	}
-	
-	/**
-	 * Return if polling is being used instead of XHR.
-	 * 
-	 * @return
-	 */
-	public boolean usePolling() {
-		return this.usePolling;
-	}
-	
-	/**
-	 * Get the port that this server is running on.
-	 * 
-	 * @return
-	 */
-	public int getPort() {
-		return this.port;
-	}
-	
-	/**
-	 * Get the security token that this server requires when calling getJavascript().
-	 * 
-	 * @return
-	 */
-	public String getToken() {
-		return this.token;
-	}
-	
-	/**
-	 * Start the server on a new thread.
-	 */
-	public void startServer() {
-		//System.out.println("CallbackServer.startServer()");
-		this.active = false;
-		
-		// Start server on new thread
-		this.serverThread = new Thread(this);
-		this.serverThread.start();
-	}
+    public void reinit(String url) {
+        this.stopServer();
+        this.init(url);
+    }
 
-	/**
-	 * Restart the server on a new thread.
-	 */
-	public void restartServer() {
-		
-		// Stop server
-		this.stopServer();
-				
-		// Start server again
-		this.startServer();
-	}
+    /**
+     * Return if polling is being used instead of XHR.
+     *
+     * @return
+     */
+    public boolean usePolling() {
+        return this.usePolling;
+    }
 
-	/**
-	 * Start running the server.  
-	 * This is called automatically when the server thread is started.
-	 */
-	public void run() {
-		
-		// Start server
-		try {
-			this.active = true;
-			String request;
-			ServerSocket waitSocket = new ServerSocket(0);
-			this.port = waitSocket.getLocalPort();
-			//System.out.println("CallbackServer -- using port " +this.port);
-			this.token = java.util.UUID.randomUUID().toString();
-			//System.out.println("CallbackServer -- using token "+this.token);
+    /**
+     * Get the port that this server is running on.
+     *
+     * @return
+     */
+    public int getPort() {
+        return this.port;
+    }
 
-			 while (this.active) {
-				 //System.out.println("CallbackServer: Waiting for data on socket");
-				 Socket connection = waitSocket.accept();
-				 BufferedReader xhrReader = new BufferedReader(new InputStreamReader(connection.getInputStream()),40);
-				 DataOutputStream output = new DataOutputStream(connection.getOutputStream());
-				 request = xhrReader.readLine();
-				 String response = "";
-				 //System.out.println("CallbackServerRequest="+request);
-				 if (this.active && (request != null)) {
-					 if (request.contains("GET")) {
-						 
-						 // Get requested file
-						 String[] requestParts = request.split(" "); 
-						 
-						 // Must have security token
-						 if ((requestParts.length == 3) && (requestParts[1].substring(1).equals(this.token))) {
-							 //System.out.println("CallbackServer -- Processing GET request");
+    /**
+     * Get the security token that this server requires when calling getJavascript().
+     *
+     * @return
+     */
+    public String getToken() {
+        return this.token;
+    }
 
-							 // Wait until there is some data to send, or send empty data every 10 sec 
-							 // to prevent XHR timeout on the client 
-							 synchronized (this) { 
-								 while (this.empty) { 
-									 try { 
-										 this.wait(10000); // prevent timeout from happening
-										 //System.out.println("CallbackServer>>> break <<<");
-										 break;
-									 } 
-									 catch (Exception e) { }
-								 } 
-							 }
+    /**
+     * Start the server on a new thread.
+     */
+    public void startServer() {
+        //System.out.println("CallbackServer.startServer()");
+        this.active = false;
 
-							 // If server is still running
-							 if (this.active) {
+        // Start server on new thread
+        this.serverThread = new Thread(this);
+        this.serverThread.start();
+    }
 
-								 // If no data, then send 404 back to client before it times out
-								 if (this.empty) {
-									 //System.out.println("CallbackServer -- sending data 0");
-									 response = "HTTP/1.1 404 NO DATA\r\n\r\n "; // need to send content otherwise some Android devices fail, so send space
-								 }
-								 else {
-									 //System.out.println("CallbackServer -- sending item");
-									 response = "HTTP/1.1 200 OK\r\n\r\n";
-									 String js = this.getJavascript();
-									 if (js != null) {
-										 response += encode(js, "UTF-8");
-									 }
-								 }
-							 }
-							 else {
-								 response = "HTTP/1.1 503 Service Unavailable\r\n\r\n ";							 
-							 }
-						 }
-						 else {
-							 response = "HTTP/1.1 403 Forbidden\r\n\r\n ";						 
-						 }
-					 }
-					 else {
-						 response = "HTTP/1.1 400 Bad Request\r\n\r\n ";
-					 }
-					 //System.out.println("CallbackServer: response="+response);
-					 //System.out.println("CallbackServer: closing output");
-					 output.writeBytes(response);
-					 output.flush();
-				 }
-				 output.close();
-				 xhrReader.close();
-			 }
-		 } catch (IOException e) {
-			 e.printStackTrace();
-		 }
-		 this.active = false;
-		 //System.out.println("CallbackServer.startServer() - EXIT");
-	}
-		
-	/**
-	 * Stop server.  
-	 * This stops the thread that the server is running on.
-	 */
-	public void stopServer() {
-		//System.out.println("CallbackServer.stopServer()");
-		if (this.active) {
-			this.active = false;
+    /**
+     * Restart the server on a new thread.
+     */
+    public void restartServer() {
 
-			// Break out of server wait
-			synchronized (this) { 
-				this.notify();
-			}
-		}		
-	}
+        // Stop server
+        this.stopServer();
+
+        // Start server again
+        this.startServer();
+    }
+
+    /**
+     * Start running the server.
+     * This is called automatically when the server thread is started.
+     */
+    public void run() {
+
+        // Start server
+        try {
+            this.active = true;
+            String request;
+            ServerSocket waitSocket = new ServerSocket(0);
+            this.port = waitSocket.getLocalPort();
+            //System.out.println("CallbackServer -- using port " +this.port);
+            this.token = java.util.UUID.randomUUID().toString();
+            //System.out.println("CallbackServer -- using token "+this.token);
+
+             while (this.active) {
+                 //System.out.println("CallbackServer: Waiting for data on socket");
+                 Socket connection = waitSocket.accept();
+                 BufferedReader xhrReader = new BufferedReader(new InputStreamReader(connection.getInputStream()),40);
+                 DataOutputStream output = new DataOutputStream(connection.getOutputStream());
+                 request = xhrReader.readLine();
+                 String response = "";
+                 //System.out.println("CallbackServerRequest="+request);
+                 if (this.active && (request != null)) {
+                     if (request.contains("GET")) {
+
+                         // Get requested file
+                         String[] requestParts = request.split(" ");
+
+                         // Must have security token
+                         if ((requestParts.length == 3) && (requestParts[1].substring(1).equals(this.token))) {
+                             //System.out.println("CallbackServer -- Processing GET request");
+
+                             // Wait until there is some data to send, or send empty data every 10 sec
+                             // to prevent XHR timeout on the client
+                             synchronized (this) {
+                                 while (this.empty) {
+                                     try {
+                                         this.wait(10000); // prevent timeout from happening
+                                         //System.out.println("CallbackServer>>> break <<<");
+                                         break;
+                                     }
+                                     catch (Exception e) { }
+                                 }
+                             }
+
+                             // If server is still running
+                             if (this.active) {
+
+                                 // If no data, then send 404 back to client before it times out
+                                 if (this.empty) {
+                                     //System.out.println("CallbackServer -- sending data 0");
+                                     response = "HTTP/1.1 404 NO DATA\r\n\r\n "; // need to send content otherwise some Android devices fail, so send space
+                                 }
+                                 else {
+                                     //System.out.println("CallbackServer -- sending item");
+                                     response = "HTTP/1.1 200 OK\r\n\r\n";
+                                     String js = this.getJavascript();
+                                     if (js != null) {
+                                         response += encode(js, "UTF-8");
+                                     }
+                                 }
+                             }
+                             else {
+                                 response = "HTTP/1.1 503 Service Unavailable\r\n\r\n ";
+                             }
+                         }
+                         else {
+                             response = "HTTP/1.1 403 Forbidden\r\n\r\n ";
+                         }
+                     }
+                     else {
+                         response = "HTTP/1.1 400 Bad Request\r\n\r\n ";
+                     }
+                     //System.out.println("CallbackServer: response="+response);
+                     //System.out.println("CallbackServer: closing output");
+                     output.writeBytes(response);
+                     output.flush();
+                 }
+                 output.close();
+                 xhrReader.close();
+             }
+         } catch (IOException e) {
+             e.printStackTrace();
+         }
+         this.active = false;
+         //System.out.println("CallbackServer.startServer() - EXIT");
+    }
+
+    /**
+     * Stop server.
+     * This stops the thread that the server is running on.
+     */
+    public void stopServer() {
+        //System.out.println("CallbackServer.stopServer()");
+        if (this.active) {
+            this.active = false;
+
+            // Break out of server wait
+            synchronized (this) {
+                this.notify();
+            }
+        }
+    }
 
     /**
      * Destroy
      */
     public void destroy() {
-    	this.stopServer();
+        this.stopServer();
     }
 
-	/**
-	 * Get the number of JavaScript statements.
-	 * 
-	 * @return int
-	 */
-	public int getSize() {
-	    synchronized(this) {
-	        int size = this.javascript.size();
-	        return size;
-	    }
-	}
-	
-	/**
-	 * Get the next JavaScript statement and remove from list.
-	 *  
-	 * @return String
-	 */
-	public String getJavascript() {
-	    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;
-	    }
-	}
-	
-	/**
-	 * Add a JavaScript statement to the list.
-	 * 
-	 * @param statement
-	 */
-	public void sendJavascript(String statement) {
-	    synchronized (this) { 
-	        this.javascript.add(statement);
-	        this.empty = false;
-	        this.notify();
-	    }
-	}
-	
-	/* The Following code has been modified from original implementation of URLEncoder */
-	
-	/* start */
-	
-	/*
+    /**
+     * Get the number of JavaScript statements.
+     *
+     * @return int
+     */
+    public int getSize() {
+        synchronized(this) {
+            int size = this.javascript.size();
+            return size;
+        }
+    }
+
+    /**
+     * Get the next JavaScript statement and remove from list.
+     *
+     * @return String
+     */
+    public String getJavascript() {
+        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;
+        }
+    }
+
+    /**
+     * Add a JavaScript statement to the list.
+     *
+     * @param statement
+     */
+    public void sendJavascript(String statement) {
+        synchronized (this) {
+            this.javascript.add(statement);
+            this.empty = false;
+            this.notify();
+        }
+    }
+
+    /* The Following code has been modified from original implementation of URLEncoder */
+
+    /* start */
+
+    /*
      *  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.
@@ -371,24 +368,24 @@ public class CallbackServer implements Runnable {
      *  See the License for the specific language governing permissions and
      *  limitations under the License.
      */
-	static final String digits = "0123456789ABCDEF";
+    static final String digits = "0123456789ABCDEF";
 
     /**
-     * This will encode the return value to JavaScript.  We revert the encoding for 
-     * common characters that don't require encoding to reduce the size of the string 
+     * This will encode the return value to JavaScript.  We revert the encoding for
+     * common characters that don't require encoding to reduce the size of the string
      * being passed to JavaScript.
-     * 
+     *
      * @param s to be encoded
      * @param enc encoding type
      * @return encoded string
      */
-	public static String encode(String s, String enc) throws UnsupportedEncodingException {
+    public static String encode(String s, String enc) throws UnsupportedEncodingException {
         if (s == null || enc == null) {
             throw new NullPointerException();
         }
         // check for UnsupportedEncodingException
         "".getBytes(enc);
-        
+
         // Guess a bit bigger for encoded form
         StringBuilder buf = new StringBuilder(s.length() + 16);
         int start = -1;
@@ -426,6 +423,6 @@ public class CallbackServer implements Runnable {
             buf.append(digits.charAt(bytes[j] & 0xf));
         }
     }
-    
+
     /* end */
 }
diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java
index e6fe1531..cba7e49c 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -44,40 +44,40 @@ import android.provider.MediaStore;
 
 /**
  * This class launches the camera view, allows the user to take a picture, closes the camera view,
- * and returns the captured image.  When the camera view is closed, the screen displayed before 
+ * and returns the captured image.  When the camera view is closed, the screen displayed before
  * the camera view was shown is redisplayed.
  */
 public class CameraLauncher extends Plugin {
 
     private static final int DATA_URL = 0;              // Return base64 encoded string
     private static final int FILE_URI = 1;              // Return file uri (content://media/external/images/media/2 for Android)
-    
+
     private static final int PHOTOLIBRARY = 0;          // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
     private static final int CAMERA = 1;                // Take picture from camera
     private static final int SAVEDPHOTOALBUM = 2;       // Choose image from picture library (same as PHOTOLIBRARY for Android)
-    
+
     private static final int PICTURE = 0;               // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
     private static final int VIDEO = 1;                 // allow selection of video only, ONLY RETURNS URL
     private static final int ALLMEDIA = 2;              // allow selection from all media types
-    
+
     private static final int JPEG = 0;                  // Take a picture of type JPEG
     private static final int PNG = 1;                   // Take a picture of type PNG
     private static final String GET_PICTURE = "Get Picture";
     private static final String GET_VIDEO = "Get Video";
     private static final String GET_All = "Get All";
-    
+
     private static final String LOG_TAG = "CameraLauncher";
-    
+
     private int mQuality;                   // Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
     private int targetWidth;                // desired width of the image
     private int targetHeight;               // desired height of the image
-    private Uri imageUri;                   // Uri of captured image       
+    private Uri imageUri;                   // Uri of captured image
     private int encodingType;               // Type of encoding to use
     private int mediaType;                  // What type of media to retrieve
-     
+
     public String callbackId;
     private int numPics;
-    
+
     /**
      * Constructor.
      */
@@ -86,7 +86,7 @@ public class CameraLauncher extends Plugin {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action        The action to execute.
      * @param args          JSONArry of arguments for the plugin.
      * @param callbackId    The callback id used when calling back into JavaScript.
@@ -94,9 +94,9 @@ public class CameraLauncher extends Plugin {
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.OK;
-        String result = "";     
+        String result = "";
         this.callbackId = callbackId;
-        
+
         try {
             if (action.equals("takePicture")) {
                 int srcType = CAMERA;
@@ -114,7 +114,7 @@ public class CameraLauncher extends Plugin {
                 this.targetHeight = args.getInt(4);
                 this.encodingType = args.getInt(5);
                 this.mediaType = args.getInt(6);
-                
+
                 if (srcType == CAMERA) {
                     this.takePicture(destType, encodingType);
                 }
@@ -131,32 +131,32 @@ public class CameraLauncher extends Plugin {
             return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
         }
     }
-    
+
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
-    
+
     /**
      * Take a picture with the camera.
      * When an image is captured or the camera view is cancelled, the result is returned
      * in CordovaActivity.onActivityResult, which forwards the result to this.onActivityResult.
-     * 
+     *
      * The image can either be returned as a base64 string or a URI that points to the file.
      * To display base64 string in an img tag, set the source to:
      *      img.src="data:image/jpeg;base64,"+result;
      * or to display URI in an img tag
      *      img.src=result;
-     * 
+     *
      * @param quality           Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
-     * @param returnType        Set the type of image to return. 
+     * @param returnType        Set the type of image to return.
      */
     public void takePicture(int returnType, int encodingType) {
         // Save the number of images currently on disk for later
         this.numPics = queryImgDB().getCount();
-                
+
         // Display camera
         Intent intent = new Intent("android.media.action.IMAGE_CAPTURE");
-        
+
         // Specify file so that large image is captured and returned
         // TODO: What if there isn't any external storage?
         File photo = createCaptureFile(encodingType);
@@ -168,7 +168,7 @@ public class CameraLauncher extends Plugin {
 
     /**
      * Create a file in the applications temporary directory based upon the supplied encoding.
-     * 
+     *
      * @param encodingType of the image to be taken
      * @return a File object pointing to the temporary picture
      */
@@ -177,7 +177,7 @@ public class CameraLauncher extends Plugin {
         if (encodingType == JPEG) {
             photo = new File(DirectoryManager.getTempDirectoryPath(ctx.getContext()),  "Pic.jpg");
         } else if (encodingType == PNG) {
-            photo = new File(DirectoryManager.getTempDirectoryPath(ctx.getContext()),  "Pic.png");            
+            photo = new File(DirectoryManager.getTempDirectoryPath(ctx.getContext()),  "Pic.png");
         } else {
             throw new IllegalArgumentException("Invalid Encoding Type: " + encodingType);
         }
@@ -186,29 +186,29 @@ public class CameraLauncher extends Plugin {
 
     /**
      * Get image from photo library.
-     * 
+     *
      * @param quality           Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
      * @param srcType           The album to get image from.
-     * @param returnType        Set the type of image to return. 
+     * @param returnType        Set the type of image to return.
      */
     // TODO: Images selected from SDCARD don't display correctly, but from CAMERA ALBUM do!
     public void getImage(int srcType, int returnType) {
         Intent intent = new Intent();
         String title = GET_PICTURE;
         if (this.mediaType == PICTURE) {
-            intent.setType("image/*");  
+            intent.setType("image/*");
         }
         else if (this.mediaType == VIDEO) {
-            intent.setType("video/*");     
+            intent.setType("video/*");
             title = GET_VIDEO;
         }
         else if (this.mediaType == ALLMEDIA) {
-            // I wanted to make the type 'image/*, video/*' but this does not work on all versions 
+            // I wanted to make the type 'image/*, video/*' but this does not work on all versions
             // of android so I had to go with the wildcard search.
-            intent.setType("*/*"); 
+            intent.setType("*/*");
             title = GET_All;
         }
-        
+
         intent.setAction(Intent.ACTION_GET_CONTENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         this.ctx.startActivityForResult((Plugin) this, Intent.createChooser(intent,
@@ -217,9 +217,9 @@ public class CameraLauncher extends Plugin {
 
     /**
      * Scales the bitmap according to the requested size.
-     * 
+     *
      * @param bitmap        The bitmap to scale.
-     * @return Bitmap       A new Bitmap object of the same bitmap after scaling. 
+     * @return Bitmap       A new Bitmap object of the same bitmap after scaling.
      */
     public Bitmap scaleBitmap(Bitmap bitmap) {
         int newWidth = this.targetWidth;
@@ -255,27 +255,27 @@ public class CameraLauncher extends Plugin {
                 newWidth = (newHeight * origWidth) / origHeight;
             }
         }
-        
+
         Bitmap retval = Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true);
         bitmap.recycle();
         return retval;
     }
-    
+
     /**
-     * Called when the camera view exits. 
-     * 
-     * @param requestCode       The request code originally supplied to startActivityForResult(), 
+     * Called when the camera view exits.
+     *
+     * @param requestCode       The request code originally supplied to startActivityForResult(),
      *                          allowing you to identify who this result came from.
      * @param resultCode        The integer result code returned by the child activity through its setResult().
      * @param intent            An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
      */
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        
+
         // Get src and dest types from request code
         int srcType = (requestCode/16) - 1;
         int destType = (requestCode % 16) - 1;
      int rotate = 0;
-        
+
      // Create an ExifHelper to save the exif data that is lost during compression
      ExifHelper exif = new ExifHelper();
      try {
@@ -303,7 +303,7 @@ public class CameraLauncher extends Plugin {
                     }
 
                     bitmap = scaleBitmap(bitmap);
-                    
+
                     // If sending base64 image back
                     if (destType == DATA_URL) {
                         this.processPicture(bitmap);
@@ -324,7 +324,7 @@ public class CameraLauncher extends Plugin {
                             try {
                                 uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
                             } catch (UnsupportedOperationException ex) {
-                                LOG.d(LOG_TAG, "Can't write to internal media storage.");                           
+                                LOG.d(LOG_TAG, "Can't write to internal media storage.");
                                 this.failPicture("Error capturing image - no media storage found.");
                                 return;
                             }
@@ -334,7 +334,7 @@ public class CameraLauncher extends Plugin {
                         OutputStream os = this.ctx.getContentResolver().openOutputStream(uri);
                         bitmap.compress(Bitmap.CompressFormat.JPEG, this.mQuality, os);
                         os.close();
-                        
+
                         // Restore exif data to file
                         if (this.encodingType == JPEG) {
                             exif.createOutFile(FileUtils.getRealPathFromURI(uri, this.ctx));
@@ -347,12 +347,12 @@ public class CameraLauncher extends Plugin {
                     bitmap.recycle();
                     bitmap = null;
                     System.gc();
-                    
+
                     checkForDuplicateImage(FILE_URI);
                 } catch (IOException e) {
                     e.printStackTrace();
                     this.failPicture("Error capturing image.");
-                }       
+                }
             }
 
             // If cancelled
@@ -365,17 +365,17 @@ public class CameraLauncher extends Plugin {
                 this.failPicture("Did not complete!");
             }
         }
-        
+
         // If retrieving photo from library
         else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
             if (resultCode == Activity.RESULT_OK) {
                 Uri uri = intent.getData();
                 android.content.ContentResolver resolver = this.ctx.getContentResolver();
-                
-                // If you ask for video or all media type you will automatically get back a file URI 
+
+                // If you ask for video or all media type you will automatically get back a file URI
                 // and there will be no attempt to resize any returned data
                 if (this.mediaType != PICTURE) {
-                    this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);                        
+                    this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
                 }
                 else {
                     // If sending base64 image back
@@ -383,8 +383,8 @@ public class CameraLauncher extends Plugin {
                         try {
                             Bitmap bitmap = android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
                  String[] cols = { MediaStore.Images.Media.ORIENTATION };
-                 Cursor cursor = this.ctx.getContentResolver().query(intent.getData(), 
-                                         cols, 
+                 Cursor cursor = this.ctx.getContentResolver().query(intent.getData(),
+                                         cols,
                                          null, null, null);
                  if (cursor != null) {
                  cursor.moveToPosition(0);
@@ -406,7 +406,7 @@ public class CameraLauncher extends Plugin {
                             this.failPicture("Error retrieving image.");
                         }
                     }
-                    
+
                     // If sending filename back
                     else if (destType == FILE_URI) {
                         // Do we need to scale the returned file
@@ -414,12 +414,12 @@ public class CameraLauncher extends Plugin {
                             try {
                                 Bitmap bitmap = android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
                                 bitmap = scaleBitmap(bitmap);
-    
+
                                 String fileName = DirectoryManager.getTempDirectoryPath(ctx.getContext()) + "/resize.jpg";
-                                OutputStream os = new FileOutputStream(fileName);                         
+                                OutputStream os = new FileOutputStream(fileName);
                                 bitmap.compress(Bitmap.CompressFormat.JPEG, this.mQuality, os);
                                 os.close();
-    
+
                                 // Restore exif data to file
                                 if (this.encodingType == JPEG) {
                                     exif.createOutFile(FileUtils.getRealPathFromURI(uri, this.ctx));
@@ -428,8 +428,8 @@ public class CameraLauncher extends Plugin {
 
                                 bitmap.recycle();
                                 bitmap = null;
-                                
-                                // The resized image is cached by the app in order to get around this and not have to delete you 
+
+                                // The resized image is cached by the app in order to get around this and not have to delete you
                                 // application cache I'm adding the current system time to the end of the file url.
                                 this.success(new PluginResult(PluginResult.Status.OK, ("file://" + fileName + "?" + System.currentTimeMillis())), this.callbackId);
                                 System.gc();
@@ -439,23 +439,23 @@ public class CameraLauncher extends Plugin {
                             }
                         }
                         else {
-                            this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);                        
+                            this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
                         }
                     }
                 }
             }
             else if (resultCode == Activity.RESULT_CANCELED) {
-                this.failPicture("Selection cancelled.");               
+                this.failPicture("Selection cancelled.");
             }
             else {
-                this.failPicture("Selection did not complete!");                
+                this.failPicture("Selection did not complete!");
             }
         }
     }
 
     /**
      * Creates a cursor that can be used to determine how many images we have.
-     * 
+     *
      * @return a cursor
      */
     private Cursor queryImgDB() {
@@ -466,27 +466,27 @@ public class CameraLauncher extends Plugin {
                 null,
                 null);
     }
-    
+
     /**
      * Used to find out if we are in a situation where the Camera Intent adds to images
-     * to the content store. If we are using a FILE_URI and the number of images in the DB 
+     * to the content store. If we are using a FILE_URI and the number of images in the DB
      * increases by 2 we have a duplicate, when using a DATA_URL the number is 1.
-     * 
+     *
      * @param type FILE_URI or DATA_URL
      */
     private void checkForDuplicateImage(int type) {
         int diff = 1;
         Cursor cursor = queryImgDB();
         int currentNumOfImages = cursor.getCount();
-        
+
         if (type == FILE_URI) {
             diff = 2;
         }
-        
+
         // delete the duplicate file if the difference is 2 for file URI or 1 for Data URL
         if ((currentNumOfImages - numPics) == diff) {
             cursor.moveToLast();
-            int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;                    
+            int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
             Uri uri = Uri.parse(MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "/" + id);
             this.ctx.getContentResolver().delete(uri, null, null);
         }
@@ -497,7 +497,7 @@ public class CameraLauncher extends Plugin {
      *
      * @param bitmap
      */
-    public void processPicture(Bitmap bitmap) {     
+    public void processPicture(Bitmap bitmap) {
         ByteArrayOutputStream jpeg_data = new ByteArrayOutputStream();
         try {
             if (bitmap.compress(CompressFormat.JPEG, mQuality, jpeg_data)) {
@@ -508,17 +508,17 @@ public class CameraLauncher extends Plugin {
                 js_out = null;
                 output = null;
                 code = null;
-            }   
+            }
         }
         catch(Exception e) {
             this.failPicture("Error compressing image.");
-        }       
+        }
         jpeg_data = null;
     }
-    
+
     /**
      * Send error message to JavaScript.
-     * 
+     *
      * @param err
      */
     public void failPicture(String err) {
diff --git a/framework/src/org/apache/cordova/Capture.java b/framework/src/org/apache/cordova/Capture.java
index 1eb0b90f..adf70592 100644
--- a/framework/src/org/apache/cordova/Capture.java
+++ b/framework/src/org/apache/cordova/Capture.java
@@ -45,23 +45,23 @@ public class Capture extends Plugin {
     private static final String VIDEO_MP4  = "video/mp4";
     private static final String AUDIO_3GPP = "audio/3gpp";
     private static final String IMAGE_JPEG = "image/jpeg";
-    
+
     private static final int CAPTURE_AUDIO = 0;     // Constant for capture audio
     private static final int CAPTURE_IMAGE = 1;     // Constant for capture image
     private static final int CAPTURE_VIDEO = 2;     // Constant for capture video
     private static final String LOG_TAG = "Capture";
-    
+
     private static final int CAPTURE_INTERNAL_ERR = 0;
     private static final int CAPTURE_APPLICATION_BUSY = 1;
     private static final int CAPTURE_INVALID_ARGUMENT = 2;
     private static final int CAPTURE_NO_MEDIA_FILES = 3;
     private static final int CAPTURE_NOT_SUPPORTED = 20;
-    
+
     private String callbackId;                      // The ID of the callback to be invoked with our result
     private long limit;                             // the number of pics/vids/clips to take
     private double duration;                        // optional duration parameter for video recording
     private JSONArray results;                      // The array of results to be returned to the user
-    private Uri imageUri;                           // Uri of captured image 
+    private Uri imageUri;                           // Uri of captured image
 
     @Override
     public PluginResult execute(String action, JSONArray args, String callbackId) {
@@ -69,7 +69,7 @@ public class Capture extends Plugin {
         this.limit = 1;
         this.duration = 0.0f;
         this.results = new JSONArray();
-        
+
         JSONObject options = args.optJSONObject(0);
         if (options != null) {
             limit = options.optLong("limit", 1);
@@ -91,9 +91,9 @@ public class Capture extends Plugin {
             this.captureImage();
         }
         else if (action.equals("captureVideo")) {
-            this.captureVideo(duration);    
+            this.captureVideo(duration);
         }
-        
+
         PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
         r.setKeepCallback(true);
         return r;
@@ -101,7 +101,7 @@ public class Capture extends Plugin {
 
     /**
      * Provides the media data file data depending on it's mime type
-     * 
+     *
      * @param filePath path to the file
      * @param mimeType of the file
      * @return a MediaFileData object
@@ -122,7 +122,7 @@ public class Capture extends Plugin {
                 mimeType = FileUtils.getMimeType(filePath);
             }
             Log.d(LOG_TAG, "Mime type = " + mimeType);
-            
+
             if (mimeType.equals(IMAGE_JPEG) || filePath.endsWith(".jpg")) {
                 obj = getImageData(filePath, obj);
             }
@@ -141,7 +141,7 @@ public class Capture extends Plugin {
 
     /**
      * Get the Image specific attributes
-     * 
+     *
      * @param filePath path to the file
      * @param obj represents the Media File Data
      * @return a JSONObject that represents the Media File Data
@@ -157,7 +157,7 @@ public class Capture extends Plugin {
 
     /**
      * Get the Image specific attributes
-     * 
+     *
      * @param filePath path to the file
      * @param obj represents the Media File Data
      * @param video if true get video attributes as well
@@ -177,7 +177,7 @@ public class Capture extends Plugin {
         }
         catch (IOException e) {
             Log.d(LOG_TAG, "Error: loading video file");
-        } 
+        }
         return obj;
     }
 
@@ -211,18 +211,18 @@ public class Capture extends Plugin {
         Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE);
         // Introduced in API 8
         //intent.putExtra(android.provider.MediaStore.EXTRA_DURATION_LIMIT, duration);
-        
+
         this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_VIDEO);
     }
-    
+
     /**
-     * Called when the video view exits. 
-     * 
-     * @param requestCode       The request code originally supplied to startActivityForResult(), 
+     * Called when the video view exits.
+     *
+     * @param requestCode       The request code originally supplied to startActivityForResult(),
      *                          allowing you to identify who this result came from.
      * @param resultCode        The integer result code returned by the child activity through its setResult().
      * @param intent            An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
-     * @throws JSONException 
+     * @throws JSONException
      */
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
 
@@ -252,7 +252,7 @@ public class Capture extends Plugin {
                     ExifHelper exif = new ExifHelper();
                     exif.createInFile(DirectoryManager.getTempDirectoryPath(ctx.getContext()) + "/Capture.jpg");
                     exif.readExifData();
-                    
+
                     // Read in bitmap of captured image
                     Bitmap bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
 
@@ -268,7 +268,7 @@ public class Capture extends Plugin {
                         try {
                             uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
                         } catch (UnsupportedOperationException ex) {
-                            LOG.d(LOG_TAG, "Can't write to internal media storage.");                           
+                            LOG.d(LOG_TAG, "Can't write to internal media storage.");
                             this.fail(createErrorObject(CAPTURE_INTERNAL_ERR, "Error capturing image - no media storage found."));
                             return;
                         }
@@ -282,14 +282,14 @@ public class Capture extends Plugin {
                     bitmap.recycle();
                     bitmap = null;
                     System.gc();
-                    
+
                     // Restore exif data to file
                     exif.createOutFile(FileUtils.getRealPathFromURI(uri, this.ctx));
                     exif.writeExifData();
-                    
+
                     // Add image to results
                     results.put(createMediaFile(uri));
-                    
+
                     if (results.length() >= limit) {
                         // Send Uri back to JavaScript for viewing image
                         this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
@@ -320,7 +320,7 @@ public class Capture extends Plugin {
         else if (resultCode == Activity.RESULT_CANCELED) {
             // If we have partial results send them back to the user
             if (results.length() > 0) {
-                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);                
+                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
             }
             // user canceled the action
             else {
@@ -331,7 +331,7 @@ public class Capture extends Plugin {
         else {
             // If we have partial results send them back to the user
             if (results.length() > 0) {
-                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);                
+                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
             }
             // something bad happened
             else {
@@ -342,43 +342,43 @@ public class Capture extends Plugin {
 
     /**
      * Creates a JSONObject that represents a File from the Uri
-     *  
+     *
      * @param data the Uri of the audio/image/video
      * @return a JSONObject that represents a File
-     * @throws IOException 
+     * @throws IOException
      */
     private JSONObject createMediaFile(Uri data){
         File fp = new File(FileUtils.getRealPathFromURI(data, this.ctx));
         JSONObject obj = new JSONObject();
 
-        try {       
+        try {
             // File properties
             obj.put("name", fp.getName());
             obj.put("fullPath", "file://" + fp.getAbsolutePath());
-            
-            // Because of an issue with MimeTypeMap.getMimeTypeFromExtension() all .3gpp files 
-            // are reported as video/3gpp. I'm doing this hacky check of the URI to see if it 
+
+            // Because of an issue with MimeTypeMap.getMimeTypeFromExtension() all .3gpp files
+            // are reported as video/3gpp. I'm doing this hacky check of the URI to see if it
             // is stored in the audio or video content store.
             if (fp.getAbsoluteFile().toString().endsWith(".3gp") || fp.getAbsoluteFile().toString().endsWith(".3gpp")) {
                 if (data.toString().contains("/audio/")) {
-                    obj.put("type", AUDIO_3GPP);                
+                    obj.put("type", AUDIO_3GPP);
                 } else {
-                    obj.put("type", VIDEO_3GPP);                
-                }               
+                    obj.put("type", VIDEO_3GPP);
+                }
             } else {
-                obj.put("type", FileUtils.getMimeType(fp.getAbsolutePath()));                
+                obj.put("type", FileUtils.getMimeType(fp.getAbsolutePath()));
             }
-            
+
             obj.put("lastModifiedDate", fp.lastModified());
             obj.put("size", fp.length());
         } catch (JSONException e) {
             // this will never happen
             e.printStackTrace();
         }
-        
+
         return obj;
     }
-    
+
     private JSONObject createErrorObject(int code, String message) {
         JSONObject obj = new JSONObject();
         try {
@@ -392,7 +392,7 @@ public class Capture extends Plugin {
 
     /**
      * Send error message to JavaScript.
-     * 
+     *
      * @param err
      */
     public void fail(JSONObject err) {
diff --git a/framework/src/org/apache/cordova/CompassListener.java b/framework/src/org/apache/cordova/CompassListener.java
index 01d431a5..86151575 100755
--- a/framework/src/org/apache/cordova/CompassListener.java
+++ b/framework/src/org/apache/cordova/CompassListener.java
@@ -43,18 +43,18 @@ public class CompassListener extends Plugin implements SensorEventListener {
     public static int STARTING = 1;
     public static int RUNNING = 2;
     public static int ERROR_FAILED_TO_START = 3;
-    
+
     public long TIMEOUT = 30000;        // Timeout in msec to shut off listener
-    
+
     int status;                         // status of listener
     float heading;                      // most recent heading value
     long timeStamp;                     // time of most recent value
     long lastAccessTime;                // time the value was last retrieved
     int accuracy;                       // accuracy of the sensor
-    
+
     private SensorManager sensorManager;// Sensor manager
     Sensor mSensor;                     // Compass sensor returned by sensor manager
-    
+
     /**
      * Constructor.
      */
@@ -67,7 +67,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
+     *
      * @param ctx The context of the main Activity.
      */
     public void setContext(CordovaInterface ctx) {
@@ -77,7 +77,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action        The action to execute.
      * @param args          JSONArry of arguments for the plugin.
      * @param callbackId    The callback id used when calling back into JavaScript.
@@ -85,8 +85,8 @@ public class CompassListener extends Plugin implements SensorEventListener {
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.OK;
-        String result = "";     
-        
+        String result = "";
+
         try {
             if (action.equals("start")) {
                 this.start();
@@ -116,7 +116,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
                         }
                     }
                     if (timeout == 0) {
-                        return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);                     
+                        return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);
                     }
                 }
                 return new PluginResult(status, getCompassHeading());
@@ -140,7 +140,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
 
     /**
      * Identifies if action to be executed returns a value and should be run synchronously.
-     * 
+     *
      * @param action    The action to execute
      * @return          T=returns value
      */
@@ -159,7 +159,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
         }
         return false;
     }
-    
+
     /**
      * Called when listener is to be shut down and object is being destroyed.
      */
@@ -173,11 +173,11 @@ public class CompassListener extends Plugin implements SensorEventListener {
 
     /**
      * Start listening for compass sensor.
-     * 
+     *
      * @return          status of listener
      */
     public int start() {
-        
+
         // If already starting or running, then just return
         if ((this.status == CompassListener.RUNNING) || (this.status == CompassListener.STARTING)) {
             return this.status;
@@ -198,10 +198,10 @@ public class CompassListener extends Plugin implements SensorEventListener {
         else {
             this.setStatus(CompassListener.ERROR_FAILED_TO_START);
         }
-        
+
         return this.status;
     }
-    
+
     /**
      * Stop listening to compass sensor.
      */
@@ -211,15 +211,15 @@ public class CompassListener extends Plugin implements SensorEventListener {
         }
         this.setStatus(CompassListener.STOPPED);
     }
-    
-    
+
+
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        // TODO Auto-generated method stub  
+        // TODO Auto-generated method stub
     }
 
     /**
      * Sensor listener event.
-     * 
+     *
      * @param SensorEvent event
      */
     public void onSensorChanged(SensorEvent event) {
@@ -237,38 +237,38 @@ public class CompassListener extends Plugin implements SensorEventListener {
             this.stop();
         }
     }
-    
+
     /**
      * Get status of compass sensor.
-     * 
+     *
      * @return          status
      */
     public int getStatus() {
         return this.status;
     }
-    
+
     /**
      * Get the most recent compass heading.
-     * 
+     *
      * @return          heading
      */
     public float getHeading() {
         this.lastAccessTime = System.currentTimeMillis();
         return this.heading;
     }
-    
+
     /**
      * Set the timeout to turn off compass sensor if getHeading() hasn't been called.
-     * 
+     *
      * @param timeout       Timeout in msec.
      */
     public void setTimeout(long timeout) {
         this.TIMEOUT = timeout;
     }
-    
+
     /**
      * Get the timeout to turn off compass sensor if getHeading() hasn't been called.
-     * 
+     *
      * @return timeout in msec
      */
     public long getTimeout() {
@@ -285,23 +285,23 @@ public class CompassListener extends Plugin implements SensorEventListener {
 
     /**
      * Create the CompassHeading JSON object to be returned to JavaScript
-     * 
+     *
      * @return a compass heading
      */
     private JSONObject getCompassHeading() {
         JSONObject obj = new JSONObject();
-        
+
         try {
             obj.put("magneticHeading", this.getHeading());
             obj.put("trueHeading", this.getHeading());
-            // Since the magnetic and true heading are always the same our and accuracy 
+            // Since the magnetic and true heading are always the same our and accuracy
             // is defined as the difference between true and magnetic always return zero
             obj.put("headingAccuracy", 0);
             obj.put("timestamp", this.timeStamp);
         } catch (JSONException e) {
             // Should never happen
         }
-        
+
         return obj;
     }
 
diff --git a/framework/src/org/apache/cordova/ContactAccessor.java b/framework/src/org/apache/cordova/ContactAccessor.java
index d2bf66c8..b8ac6361 100644
--- a/framework/src/org/apache/cordova/ContactAccessor.java
+++ b/framework/src/org/apache/cordova/ContactAccessor.java
@@ -34,15 +34,15 @@ import org.json.JSONObject;
  * Eclair or higher, we want to use {@link ContactAccessorSdk5}.
  */
 public abstract class ContactAccessor {
-  
+
     protected final String LOG_TAG = "ContactsAccessor";
     protected Context mApp;
     protected WebView mView;
-  
+
     /**
-     * Check to see if the data associated with the key is required to 
+     * Check to see if the data associated with the key is required to
      * be populated in the Contact object.
-     * @param key 
+     * @param key
      * @param map created by running buildPopulationSet.
      * @return true if the key data is required
      */
@@ -50,7 +50,7 @@ public abstract class ContactAccessor {
         Boolean retVal = map.get(key);
         return (retVal == null) ? false : retVal.booleanValue();
     }
-    
+
     /**
      * Create a hash map of what data needs to be populated in the Contact object
      * @param fields the list of fields to populate
@@ -58,7 +58,7 @@ public abstract class ContactAccessor {
      */
     protected HashMap<String,Boolean> buildPopulationSet(JSONArray fields) {
         HashMap<String,Boolean> map = new HashMap<String,Boolean>();
-    
+
         String key;
         try {
             if (fields.length() == 1 && fields.getString(0).equals("*")) {
@@ -75,7 +75,7 @@ public abstract class ContactAccessor {
                 map.put("urls", true);
                 map.put("photos", true);
                 map.put("categories", true);
-            } 
+            }
             else {
                 for (int i=0; i<fields.length(); i++) {
                     key = fields.getString(i);
@@ -127,12 +127,12 @@ public abstract class ContactAccessor {
         }
         return map;
     }
-  
+
     /**
-     * Convenience method to get a string from a JSON object.  Saves a 
+     * Convenience method to get a string from a JSON object.  Saves a
      * lot of try/catch writing.
      * If the property is not found in the object null will be returned.
-     * 
+     *
      * @param obj contact object to search
      * @param property to be looked up
      * @return The value of the property
@@ -150,7 +150,7 @@ public abstract class ContactAccessor {
         }
         catch (JSONException e) {
             Log.d(LOG_TAG, "Could not get = " + e.getMessage());
-        }   
+        }
         return value;
     }
 
@@ -167,7 +167,7 @@ public abstract class ContactAccessor {
 
     /**
      * Handles searching through SDK-specific contacts API.
-     * @throws JSONException 
+     * @throws JSONException
      */
     public abstract JSONObject getContactById(String id) throws JSONException;
 
@@ -175,9 +175,9 @@ public abstract class ContactAccessor {
      * Handles removing a contact from the database.
      */
     public abstract boolean remove(String id);
-  
+
     /**
-     * A class that represents the where clause to be used in the database query 
+     * A class that represents the where clause to be used in the database query
      */
     class WhereOptions {
         private String where;
diff --git a/framework/src/org/apache/cordova/ContactAccessorSdk5.java b/framework/src/org/apache/cordova/ContactAccessorSdk5.java
index 02047e8c..52cf5992 100644
--- a/framework/src/org/apache/cordova/ContactAccessorSdk5.java
+++ b/framework/src/org/apache/cordova/ContactAccessorSdk5.java
@@ -41,7 +41,6 @@ import org.json.JSONObject;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.app.Activity;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentUris;
@@ -79,7 +78,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    * Keep the photo size under the 1 MB blog limit.
    */
   private static final long MAX_PHOTO_SIZE = 1048576;
-  
+
   private static final String EMAIL_REGEXP = ".+@.+\\.+.+";  /* <anything>@<anything>.<anything>*/
 
   /**
@@ -129,13 +128,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     mApp = context;
     mView = view;
   }
-  
-  /** 
-   * This method takes the fields required and search options in order to produce an 
+
+  /**
+   * This method takes the fields required and search options in order to produce an
    * array of contacts that matches the criteria provided.
    * @param fields an array of items to be used as search criteria
    * @param options that can be applied to contact searching
-   * @return an array of contacts 
+   * @return an array of contacts
    */
   @Override
   public JSONArray search(JSONArray fields, JSONObject options) {
@@ -143,7 +142,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     String searchTerm = "";
     int limit = Integer.MAX_VALUE;
     boolean multiple = true;
-    
+
     if (options != null) {
       searchTerm = options.optString("filter");
       if (searchTerm.length()==0) {
@@ -164,23 +163,23 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     else {
       searchTerm = "%";
     }
-    
+
     //Log.d(LOG_TAG, "Search Term = " + searchTerm);
     //Log.d(LOG_TAG, "Field Length = " + fields.length());
     //Log.d(LOG_TAG, "Fields = " + fields.toString());
 
     // Loop through the fields the user provided to see what data should be returned.
     HashMap<String,Boolean> populate = buildPopulationSet(fields);
-    
+
     // Build the ugly where clause and where arguments for one big query.
     WhereOptions whereOptions = buildWhereClause(fields, searchTerm);
-          
+
     // Get all the id's where the search term matches the fields passed in.
     Cursor idCursor = mApp.getContentResolver().query(ContactsContract.Data.CONTENT_URI,
         new String[] { ContactsContract.Data.CONTACT_ID },
         whereOptions.getWhere(),
         whereOptions.getWhereArgs(),
-        ContactsContract.Data.CONTACT_ID + " ASC");       
+        ContactsContract.Data.CONTACT_ID + " ASC");
 
     // Create a set of unique ids
     //Log.d(LOG_TAG, "ID cursor query returns = " + idCursor.getCount());
@@ -189,43 +188,43 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       contactIds.add(idCursor.getString(idCursor.getColumnIndex(ContactsContract.Data.CONTACT_ID)));
     }
     idCursor.close();
-    
+
     // Build a query that only looks at ids
     WhereOptions idOptions = buildIdClause(contactIds, searchTerm);
-    
+
     // Do the id query
     Cursor c = mApp.getContentResolver().query(ContactsContract.Data.CONTENT_URI,
         null,
         idOptions.getWhere(),
         idOptions.getWhereArgs(),
-        ContactsContract.Data.CONTACT_ID + " ASC");       
-    
-    JSONArray contacts = populateContactArray(limit, populate, c);    
+        ContactsContract.Data.CONTACT_ID + " ASC");
+
+    JSONArray contacts = populateContactArray(limit, populate, c);
     return contacts;
   }
-  
+
   /**
-   * A special search that finds one contact by id 
-   * 
+   * A special search that finds one contact by id
+   *
    * @param id   contact to find by id
    * @return     a JSONObject representing the contact
-   * @throws JSONException 
+   * @throws JSONException
    */
-  public JSONObject getContactById(String id) throws JSONException {     
+  public JSONObject getContactById(String id) throws JSONException {
         // Do the id query
         Cursor c = mApp.getContentResolver().query(ContactsContract.Data.CONTENT_URI,
                 null,
                 ContactsContract.Data.CONTACT_ID + " = ? ",
                 new String[] { id },
-                ContactsContract.Data.CONTACT_ID + " ASC");             
+                ContactsContract.Data.CONTACT_ID + " ASC");
 
         JSONArray fields = new JSONArray();
         fields.put("*");
-        
+
         HashMap<String,Boolean> populate = buildPopulationSet(fields);
-      
+
         JSONArray contacts = populateContactArray(1, populate, c);
-        
+
         if (contacts.length() == 1) {
             return contacts.getJSONObject(0);
         } else {
@@ -233,9 +232,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
         }
   }
 
-  /** 
+  /**
    * Creates an array of contacts from the cursor you pass in
-   * 
+   *
    * @param limit        max number of contacts for the array
    * @param populate     whether or not you should populate a certain value
    * @param c            the cursor
@@ -243,7 +242,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    */
     private JSONArray populateContactArray(int limit,
             HashMap<String, Boolean> populate, Cursor c) {
-    
+
     String contactId = "";
     String rawId = "";
     String oldContactId = "";
@@ -258,27 +257,27 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     JSONArray emails = new JSONArray();
     JSONArray ims = new JSONArray();
     JSONArray websites = new JSONArray();
-    JSONArray photos = new JSONArray();     
-    
+    JSONArray photos = new JSONArray();
+
     if (c.getCount() > 0) {
-      while (c.moveToNext() && (contacts.length() <= (limit-1))) {          
+      while (c.moveToNext() && (contacts.length() <= (limit-1))) {
         try {
           contactId = c.getString(c.getColumnIndex(ContactsContract.Data.CONTACT_ID));
-          rawId = c.getString(c.getColumnIndex(ContactsContract.Data.RAW_CONTACT_ID));        
-          
+          rawId = c.getString(c.getColumnIndex(ContactsContract.Data.RAW_CONTACT_ID));
+
           // If we are in the first row set the oldContactId
           if (c.getPosition() == 0) {
             oldContactId = contactId;
           }
-          
-          // When the contact ID changes we need to push the Contact object 
+
+          // When the contact ID changes we need to push the Contact object
           // to the array of contacts and create new objects.
           if (!oldContactId.equals(contactId)) {
             // Populate the Contact object with it's arrays
             // and push the contact into the contacts array
             contacts.put(populateContact(contact, organizations, addresses, phones,
                 emails, ims, websites, photos));
-            
+
             // Clean up the objects
             contact = new JSONObject();
             organizations = new JSONArray();
@@ -288,11 +287,11 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             ims = new JSONArray();
             websites = new JSONArray();
             photos = new JSONArray();
-            
+
             // Set newContact to true as we are starting to populate a new contact
             newContact = true;
           }
-          
+
           // When we detect a new contact set the ID and display name.
           // These fields are available in every row in the result set returned.
           if (newContact) {
@@ -300,56 +299,56 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             contact.put("id", contactId);
             contact.put("rawId", rawId);
           }
-          
+
           // Grab the mimetype of the current row as it will be used in a lot of comparisons
           mimetype = c.getString(c.getColumnIndex(ContactsContract.Data.MIMETYPE));
-          
+
                     if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)) {
                         contact.put("displayName", c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME)));
                     }
-                    if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) 
+                    if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
                             && isRequired("name",populate)) {
                         contact.put("name", nameQuery(c));
                     }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
               && isRequired("phoneNumbers",populate)) {
             phones.put(phoneQuery(c));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
               && isRequired("emails",populate)) {
             emails.put(emailQuery(c));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
               && isRequired("addresses",populate)) {
             addresses.put(addressQuery(c));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
               && isRequired("organizations",populate)) {
             organizations.put(organizationQuery(c));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
               && isRequired("ims",populate)) {
             ims.put(imQuery(c));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE)
               && isRequired("note",populate)) {
             contact.put("note",c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.Note.NOTE)));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE)
               && isRequired("nickname",populate)) {
             contact.put("nickname",c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.Nickname.NAME)));
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE)
               && isRequired("urls",populate)) {
             websites.put(websiteQuery(c));
           }
           else if (mimetype.equals(ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE)) {
-            if (ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY == c.getInt(c.getColumnIndex(ContactsContract.CommonDataKinds.Event.TYPE)) 
+            if (ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY == c.getInt(c.getColumnIndex(ContactsContract.CommonDataKinds.Event.TYPE))
                 && isRequired("birthday",populate)) {
               contact.put("birthday", c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.Event.START_DATE)));
             }
           }
-          else if (mimetype.equals(ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE) 
+          else if (mimetype.equals(ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
               && isRequired("photos",populate)) {
             photos.put(photoQuery(c, contactId));
           }
@@ -357,11 +356,11 @@ public class ContactAccessorSdk5 extends ContactAccessor {
         catch (JSONException e) {
           Log.e(LOG_TAG, e.getMessage(),e);
         }
-        
-        // Set the old contact ID 
-        oldContactId = contactId;     
+
+        // Set the old contact ID
+        oldContactId = contactId;
       }
-  
+
       // Push the last contact into the contacts array
       if (contacts.length() < limit) {
         contacts.put(populateContact(contact, organizations, addresses, phones,
@@ -378,9 +377,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    * @param searchTerm what to search for
    * @return an object containing the selection and selection args
    */
-  private WhereOptions buildIdClause(Set<String> contactIds, String searchTerm) {   
+  private WhereOptions buildIdClause(Set<String> contactIds, String searchTerm) {
     WhereOptions options = new WhereOptions();
-    
+
     // If the user is searching for every contact then short circuit the method
     // and return a shorter where clause to be searched.
     if (searchTerm.equals("%")) {
@@ -392,7 +391,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     // This clause means that there are specific ID's to be populated
     Iterator<String> it = contactIds.iterator();
     StringBuffer buffer = new StringBuffer("(");
-    
+
     while (it.hasNext()) {
       buffer.append("'" + it.next() + "'");
       if (it.hasNext()) {
@@ -400,23 +399,23 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       }
     }
     buffer.append(")");
-    
+
     options.setWhere(ContactsContract.Data.CONTACT_ID + " IN " + buffer.toString());
-    options.setWhereArgs(null);   
-        
+    options.setWhereArgs(null);
+
     return options;
   }
 
   /**
-   * Create a new contact using a JSONObject to hold all the data. 
-   * @param contact 
+   * Create a new contact using a JSONObject to hold all the data.
+   * @param contact
    * @param organizations array of organizations
    * @param addresses array of addresses
    * @param phones array of phones
    * @param emails array of emails
    * @param ims array of instant messenger addresses
    * @param websites array of websites
-   * @param photos 
+   * @param photos
    * @return
    */
   private JSONObject populateContact(JSONObject contact, JSONArray organizations,
@@ -462,9 +461,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
     ArrayList<String> where = new ArrayList<String>();
     ArrayList<String> whereArgs = new ArrayList<String>();
-    
+
     WhereOptions options = new WhereOptions();
-        
+
         /*
          * Special case where the user wants all fields returned
          */
@@ -475,43 +474,43 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 options.setWhereArgs(new String[] {searchTerm});
                 return options;
             } else {
-                // Get all contacts that match the filter but return all properties 
+                // Get all contacts that match the filter but return all properties
                 where.add("(" + dbMap.get("displayName") + " LIKE ? )");
                 whereArgs.add(searchTerm);
-                where.add("(" + dbMap.get("name") + " LIKE ? AND " 
+                where.add("(" + dbMap.get("name") + " LIKE ? AND "
                         + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("nickname") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("nickname") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("phoneNumbers") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("phoneNumbers") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("emails") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("emails") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("addresses") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("addresses") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("ims") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("ims") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("organizations") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("organizations") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("note") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("note") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE);
-                where.add("(" + dbMap.get("urls") + " LIKE ? AND " 
-                        + ContactsContract.Data.MIMETYPE + " = ? )");               
+                where.add("(" + dbMap.get("urls") + " LIKE ? AND "
+                        + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(searchTerm);
                 whereArgs.add(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE);
             }
@@ -525,7 +524,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       options.setWhereArgs(new String[] {searchTerm});
       return options;
     }
-    
+
     String key;
     try {
       //Log.d(LOG_TAG, "How many fields do we have = " + fields.length());
@@ -541,44 +540,44 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                     whereArgs.add(searchTerm);
                 }
         else if (key.startsWith("name")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
               + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("nickname")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("phoneNumbers")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("emails")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("addresses")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("ims")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("organizations")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
         }
@@ -590,9 +589,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 // while Java's January is 00.
                 searchDate.setMonth(searchDate.getMonth()-1);
                 SimpleDateFormat newFormat = new SimpleDateFormat("yyyy-MM-dd");
-                
-                where.add("(" + dbMap.get(key) + " = ? AND " 
-                    + ContactsContract.Data.MIMETYPE + " = ? )");                 
+
+                where.add("(" + dbMap.get(key) + " = ? AND "
+                    + ContactsContract.Data.MIMETYPE + " = ? )");
                 whereArgs.add(newFormat.format(searchDate));
                 whereArgs.add(ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE);
             }
@@ -601,14 +600,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             }
         }
         else if (key.startsWith("note")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE);
         }
         else if (key.startsWith("urls")) {
-          where.add("(" + dbMap.get(key) + " LIKE ? AND " 
-              + ContactsContract.Data.MIMETYPE + " = ? )");       
+          where.add("(" + dbMap.get(key) + " LIKE ? AND "
+              + ContactsContract.Data.MIMETYPE + " = ? )");
           whereArgs.add(searchTerm);
           whereArgs.add(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE);
         }
@@ -634,13 +633,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       selectionArgs[i] = whereArgs.get(i);
     }
     options.setWhereArgs(selectionArgs);
-    
+
     return options;
   }
 
   /**
    * If the user passes in the '*' wildcard character for search then they want all fields for each contact
-   * 
+   *
    * @param fields
    * @return true if wildcard search requested, false otherwise
    */
@@ -650,7 +649,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
           try {
                 if ("*".equals(fields.getString(0))) {
                     return true;
-                }                
+                }
             } catch (JSONException e) {
                 return false;
             }
@@ -722,7 +721,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       if (middleName != null) { formatted.append(middleName + " "); }
       if (familyName != null) { formatted.append(familyName + " "); }
       if (honorificSuffix != null) { formatted.append(honorificSuffix + " "); }
-      
+
       contactName.put("familyName", familyName);
       contactName.put("givenName", givenName);
       contactName.put("middleName", middleName);
@@ -752,7 +751,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     }
     catch (Exception excp) {
       Log.e(LOG_TAG, excp.getMessage(), excp);
-    } 
+    }
     return phoneNumber;
   }
 
@@ -790,7 +789,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       Log.e(LOG_TAG, e.getMessage(), e);
     }
     return im;
-  } 
+  }
 
   /**
    * Create a ContactField JSONObject
@@ -808,11 +807,11 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       Log.e(LOG_TAG, e.getMessage(), e);
     }
     return website;
-  } 
+  }
 
   /**
    * Create a ContactField JSONObject
-   * @param contactId 
+   * @param contactId
    * @return a JSONObject representing a ContactField
    */
   private JSONObject photoQuery(Cursor cursor, String contactId) {
@@ -833,7 +832,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
   @Override
   /**
    * This method will save a contact object into the devices contacts database.
-   * 
+   *
    * @param contact the contact to be saved.
    * @returns the id if the contact is successfully saved, null otherwise.
    */
@@ -854,7 +853,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 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*/ {
@@ -888,7 +887,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Creates a new contact and stores it in the database
-   * 
+   *
    * @param id the raw contact id which is required for linking items to the contact
    * @param contact the contact to be saved
    * @param account the account to be saved under
@@ -897,16 +896,16 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     // 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();
-    
+
     // Create a list of attributes to add to the contact database
     ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-    
+
     //Add contact type
     ops.add(ContentProviderOperation.newUpdate(ContactsContract.RawContacts.CONTENT_URI)
             .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, accountType)
             .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, accountName)
             .build());
-    
+
     // Modify name
     JSONObject name;
     try {
@@ -914,14 +913,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       name = contact.getJSONObject("name");
       if (displayName != null || name != null) {
         ContentProviderOperation.Builder builder = ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
-              ContactsContract.Data.MIMETYPE + "=?", 
+          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " +
+              ContactsContract.Data.MIMETYPE + "=?",
               new String[]{id, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
 
         if (displayName != null) {
           builder.withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, displayName);
         }
-          
+
         String familyName = getJsonString(name, "familyName");
         if (familyName != null) {
           builder.withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, familyName);
@@ -942,13 +941,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
         if (honorificSuffix != null) {
           builder.withValue(ContactsContract.CommonDataKinds.StructuredName.SUFFIX, honorificSuffix);
         }
-        
+
         ops.add(builder.build());
       }
     } catch (JSONException e1) {
       Log.d(LOG_TAG, "Could not get name");
     }
-    
+
     // Modify phone numbers
     JSONArray phones = null;
     try {
@@ -966,13 +965,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
               contentValues.put(ContactsContract.CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone, "type")));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing phone so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Phone._ID + "=? AND " + 
-                  ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Phone._ID + "=? AND " +
+                  ContactsContract.Data.MIMETYPE + "=?",
                   new String[]{phoneId, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE})
                     .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, getJsonString(phone, "value"))
                     .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone, "type")))
@@ -984,7 +983,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get phone numbers");
     }
-    
+
     // Modify emails
     JSONArray emails = null;
     try {
@@ -1002,13 +1001,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
               contentValues.put(ContactsContract.CommonDataKinds.Email.TYPE, getContactType(getJsonString(email, "type")));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing email so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Email._ID + "=? AND " + 
-                  ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Email._ID + "=? AND " +
+                  ContactsContract.Data.MIMETYPE + "=?",
                   new String[]{emailId, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE})
                     .withValue(ContactsContract.CommonDataKinds.Email.DATA, getJsonString(email, "value"))
                     .withValue(ContactsContract.CommonDataKinds.Email.TYPE, getContactType(getJsonString(email, "type")))
@@ -1043,13 +1042,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY, getJsonString(address, "country"));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing address so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.StructuredPostal._ID + "=? AND " + 
-                    ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.StructuredPostal._ID + "=? AND " +
+                    ContactsContract.Data.MIMETYPE + "=?",
                     new String[]{addressId, ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE})
                                 .withValue(ContactsContract.CommonDataKinds.StructuredPostal.TYPE, getAddressType(getJsonString(address, "type")))
                     .withValue(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, getJsonString(address, "formatted"))
@@ -1086,13 +1085,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 contentValues.put(ContactsContract.CommonDataKinds.Organization.TITLE, getJsonString(org, "title"));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing organization so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Organization._ID + "=? AND " + 
-                    ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Organization._ID + "=? AND " +
+                    ContactsContract.Data.MIMETYPE + "=?",
                     new String[]{orgId, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE})
                                 .withValue(ContactsContract.CommonDataKinds.Organization.TYPE, getOrgType(getJsonString(org, "type")))
                     .withValue(ContactsContract.CommonDataKinds.Organization.DEPARTMENT, getJsonString(org, "department"))
@@ -1124,13 +1123,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 contentValues.put(ContactsContract.CommonDataKinds.Im.TYPE, getContactType(getJsonString(im, "type")));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing IM so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Im._ID + "=? AND " + 
-                    ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Im._ID + "=? AND " +
+                    ContactsContract.Data.MIMETYPE + "=?",
                     new String[]{imId, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE})
                     .withValue(ContactsContract.CommonDataKinds.Im.DATA, getJsonString(im, "value"))
                     .withValue(ContactsContract.CommonDataKinds.Im.TYPE, getContactType(getJsonString(im, "type")))
@@ -1146,8 +1145,8 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     // Modify note
     String note = getJsonString(contact, "note");
     ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-        .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
-            ContactsContract.Data.MIMETYPE + "=?", 
+        .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " +
+            ContactsContract.Data.MIMETYPE + "=?",
             new String[]{id,ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE})
             .withValue(ContactsContract.CommonDataKinds.Note.NOTE, note)
         .build());
@@ -1156,14 +1155,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     String nickname = getJsonString(contact, "nickname");
     if (nickname != null) {
       ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
-              ContactsContract.Data.MIMETYPE + "=?", 
+          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " +
+              ContactsContract.Data.MIMETYPE + "=?",
               new String[]{id,ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE})
               .withValue(ContactsContract.CommonDataKinds.Nickname.NAME, nickname)
               .build());
     }
-      
-    // Modify urls  
+
+    // Modify urls
     JSONArray websites = null;
     try {
       websites = contact.getJSONArray("urls");
@@ -1180,13 +1179,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 contentValues.put(ContactsContract.CommonDataKinds.Website.TYPE, getContactType(getJsonString(website, "type")));
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing website so do a DB update
           else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Website._ID + "=? AND " + 
-                    ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Website._ID + "=? AND " +
+                    ContactsContract.Data.MIMETYPE + "=?",
                     new String[]{websiteId, ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE})
                     .withValue(ContactsContract.CommonDataKinds.Website.DATA, getJsonString(website, "value"))
                     .withValue(ContactsContract.CommonDataKinds.Website.TYPE, getContactType(getJsonString(website, "type")))
@@ -1198,14 +1197,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get websites");
     }
-    
+
     // Modify birthday
     String birthday = getJsonString(contact, "birthday");
     if (birthday != null) {
       ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
-              ContactsContract.Data.MIMETYPE + "=? AND " + 
-              ContactsContract.CommonDataKinds.Event.TYPE + "=?", 
+          .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " +
+              ContactsContract.Data.MIMETYPE + "=? AND " +
+              ContactsContract.CommonDataKinds.Event.TYPE + "=?",
               new String[]{id,ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE, new String(""+ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY)})
               .withValue(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY)
               .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, birthday)
@@ -1230,13 +1229,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 contentValues.put(ContactsContract.CommonDataKinds.Photo.PHOTO, bytes);
 
               ops.add(ContentProviderOperation.newInsert(
-                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());            
+                      ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
           }
           // This is an existing photo so do a DB update
-          else {            
+          else {
             ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                    .withSelection(ContactsContract.CommonDataKinds.Photo._ID + "=? AND " + 
-                    ContactsContract.Data.MIMETYPE + "=?", 
+                    .withSelection(ContactsContract.CommonDataKinds.Photo._ID + "=? AND " +
+                    ContactsContract.Data.MIMETYPE + "=?",
                     new String[]{photoId, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE})
                     .withValue(ContactsContract.Data.IS_SUPER_PRIMARY, 1)
                     .withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, bytes)
@@ -1248,9 +1247,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get photos");
     }
-    
+
     boolean retVal = true;
-    
+
     //Modify contact
     try {
         mApp.getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops);
@@ -1263,7 +1262,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       Log.e(LOG_TAG, Log.getStackTraceString(e), e);
       retVal = false;
     }
-    
+
     // if the save was a succes return the contact ID
     if (retVal) {
         return id;
@@ -1274,7 +1273,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add a website to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param website the item to be inserted
    */
@@ -1290,7 +1289,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add an im to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param im the item to be inserted
    */
@@ -1305,7 +1304,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add an organization to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param org the item to be inserted
    */
@@ -1323,7 +1322,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add an address to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param address the item to be inserted
    */
@@ -1344,7 +1343,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add an email to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param email the item to be inserted
    */
@@ -1360,7 +1359,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add a phone to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param phone the item to be inserted
    */
@@ -1376,7 +1375,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 
   /**
    * Add a phone to a list of database actions to be performed
-   * 
+   *
    * @param ops the list of database actions
    * @param phone the item to be inserted
    */
@@ -1390,13 +1389,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             .withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, bytes)
             .build());
   }
-  
+
   /**
    * Gets the raw bytes from the supplied filename
-   * 
+   *
    * @param filename the file to read the bytes from
    * @return a byte array
-   * @throws IOException 
+   * @throws IOException
    */
   private byte[] getPhotoBytes(String filename) {
     ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -1405,12 +1404,12 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       long totalBytesRead = 0;
       byte[] data = new byte[8192];
       InputStream in = getPathFromUri(filename);
-      
+
       while ((bytesRead = in.read(data, 0, data.length)) != -1 && totalBytesRead <= MAX_PHOTO_SIZE) {
         buffer.write(data, 0, bytesRead);
         totalBytesRead += bytesRead;
       }
-      
+
       in.close();
       buffer.flush();
     } catch (FileNotFoundException e) {
@@ -1422,12 +1421,12 @@ public class ContactAccessorSdk5 extends ContactAccessor {
   }
   /**
      * Get an input stream based on file path or uri content://, http://, file://
-     * 
+     *
      * @param path
      * @return an input stream
-   * @throws IOException 
+   * @throws IOException
      */
-    private InputStream getPathFromUri(String path) throws IOException {      
+    private InputStream getPathFromUri(String path) throws IOException {
       if (path.startsWith("content:")) {
         Uri uri = Uri.parse(path);
         return mApp.getContentResolver().openInputStream(uri);
@@ -1439,11 +1438,11 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       else {
         return new FileInputStream(path);
       }
-    }  
+    }
 
   /**
    * Creates a new contact and stores it in the database
-   * 
+   *
    * @param contact the contact to be saved
    * @param account the account to be saved under
    */
@@ -1477,7 +1476,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get name object");
     }
-    
+
     //Add phone numbers
     JSONArray phones = null;
     try {
@@ -1492,7 +1491,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get phone numbers");
     }
-        
+
     // Add emails
     JSONArray emails = null;
     try {
@@ -1572,8 +1571,8 @@ public class ContactAccessorSdk5 extends ContactAccessor {
               .withValue(ContactsContract.CommonDataKinds.Nickname.NAME, nickname)
               .build());
     }
-    
-    // Add urls 
+
+    // Add urls
     JSONArray websites = null;
     try {
       websites = contact.getJSONArray("websites");
@@ -1587,7 +1586,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     catch (JSONException e) {
       Log.d(LOG_TAG, "Could not get websites");
     }
-    
+
     // Add birthday
     String birthday = getJsonString(contact, "birthday");
     if (birthday != null) {
@@ -1598,7 +1597,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
               .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, birthday)
               .build());
     }
-    
+
     // Add photos
     JSONArray photos = null;
     try {
@@ -1630,13 +1629,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
   }
 
   @Override
-  /** 
+  /**
    * This method will remove a Contact from the database based on ID.
    * @param id the unique ID of the contact to remove
    */
   public boolean remove(String id) {
         int result = 0;
-        Cursor cursor = mApp.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI, 
+        Cursor cursor = mApp.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
                                                         null,
                                                         ContactsContract.Contacts._ID + " = ?",
                                                         new String[] {id}, null);
@@ -1650,15 +1649,15 @@ public class ContactAccessorSdk5 extends ContactAccessor {
         }
 
       return (result > 0) ? true : false;
-  } 
+  }
 
 /**************************************************************************
- *  
- * All methods below this comment are used to convert from JavaScript 
+ *
+ * All methods below this comment are used to convert from JavaScript
  * text types to Android integer types and vice versa.
- * 
+ *
  *************************************************************************/
-  
+
   /**
    * Converts a string from the W3C Contact API to it's Android int value.
    * @param string
@@ -1667,79 +1666,79 @@ public class ContactAccessorSdk5 extends ContactAccessor {
   private int getPhoneType(String string) {
     int type = ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
     if (string != null) {
-    	if ("home".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_HOME;
-    	}
-    	else if ("mobile".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE;
-    	}
-    	else if ("work".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_WORK;
-    	}
-    	else if ("work fax".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
-    	}
-    	else if ("home fax".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME;
-    	}
-    	else if ("fax".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
-    	}
-    	else if ("pager".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_PAGER;
-    	}
-    	else if ("other".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
-    	}
-    	else if ("car".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_CAR;
-    	}
-    	else if ("company main".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN;
-    	}
-    	else if ("isdn".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_ISDN;
-    	}
-    	else if ("main".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
-    	}
-    	else if ("other fax".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX;
-    	}
-    	else if ("radio".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_RADIO;
-    	}
-    	else if ("telex".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_TELEX;
-    	}
-    	else if ("work mobile".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE;
-    	}
-    	else if ("work pager".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER;
-    	}
-    	else if ("assistant".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT;
-    	}
-    	else if ("mms".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_MMS;
-    	}
-    	else if ("callback".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK;
-    	}
-    	else if ("tty ttd".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD;
-    	}
-    	else if ("custom".equals(string.toLowerCase())) {
-    		return ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM;
-    	}
+        if ("home".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_HOME;
+        }
+        else if ("mobile".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE;
+        }
+        else if ("work".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_WORK;
+        }
+        else if ("work fax".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
+        }
+        else if ("home fax".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME;
+        }
+        else if ("fax".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
+        }
+        else if ("pager".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_PAGER;
+        }
+        else if ("other".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
+        }
+        else if ("car".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_CAR;
+        }
+        else if ("company main".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN;
+        }
+        else if ("isdn".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_ISDN;
+        }
+        else if ("main".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
+        }
+        else if ("other fax".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX;
+        }
+        else if ("radio".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_RADIO;
+        }
+        else if ("telex".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_TELEX;
+        }
+        else if ("work mobile".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE;
+        }
+        else if ("work pager".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER;
+        }
+        else if ("assistant".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT;
+        }
+        else if ("mms".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_MMS;
+        }
+        else if ("callback".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK;
+        }
+        else if ("tty ttd".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD;
+        }
+        else if ("custom".equals(string.toLowerCase())) {
+            return ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM;
+        }
     }
     return type;
   }
 
   /**
    * getPhoneType converts an Android phone type into a string
-   * @param type 
+   * @param type
    * @return phone type as string.
    */
   private String getPhoneType(int type) {
@@ -1803,7 +1802,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
       stringType = "isdn";
       break;
     case ContactsContract.CommonDataKinds.Phone.TYPE_OTHER:
-    default: 
+    default:
       stringType = "other";
       break;
     }
@@ -1832,33 +1831,33 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             }
             else if ("custom".equals(string.toLowerCase())) {
                 return ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM;
-            }       
+            }
         }
         return type;
     }
 
     /**
      * getPhoneType converts an Android phone type into a string
-     * @param type 
+     * @param type
      * @return phone type as string.
      */
     private String getContactType(int type) {
         String stringType;
         switch (type) {
-            case ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM: 
+            case ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM:
                 stringType = "custom";
                 break;
-            case ContactsContract.CommonDataKinds.Email.TYPE_HOME: 
+            case ContactsContract.CommonDataKinds.Email.TYPE_HOME:
                 stringType = "home";
                 break;
-            case ContactsContract.CommonDataKinds.Email.TYPE_WORK: 
+            case ContactsContract.CommonDataKinds.Email.TYPE_WORK:
                 stringType = "work";
                 break;
-            case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE: 
+            case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE:
                 stringType = "mobile";
                 break;
-            case ContactsContract.CommonDataKinds.Email.TYPE_OTHER: 
-            default: 
+            case ContactsContract.CommonDataKinds.Email.TYPE_OTHER:
+            default:
                 stringType = "other";
                 break;
         }
@@ -1881,27 +1880,27 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             }
             else if ("custom".equals(string.toLowerCase())) {
                 return ContactsContract.CommonDataKinds.Organization.TYPE_CUSTOM;
-            }       
+            }
         }
         return type;
     }
 
     /**
      * getPhoneType converts an Android phone type into a string
-     * @param type 
+     * @param type
      * @return phone type as string.
      */
     private String getOrgType(int type) {
         String stringType;
         switch (type) {
-            case ContactsContract.CommonDataKinds.Organization.TYPE_CUSTOM: 
+            case ContactsContract.CommonDataKinds.Organization.TYPE_CUSTOM:
                 stringType = "custom";
                 break;
-            case ContactsContract.CommonDataKinds.Organization.TYPE_WORK: 
+            case ContactsContract.CommonDataKinds.Organization.TYPE_WORK:
                 stringType = "work";
                 break;
-            case ContactsContract.CommonDataKinds.Organization.TYPE_OTHER: 
-            default: 
+            case ContactsContract.CommonDataKinds.Organization.TYPE_OTHER:
+            default:
                 stringType = "other";
                 break;
         }
@@ -1924,27 +1923,27 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             }
             else if ("home".equals(string.toLowerCase())) {
                 return ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME;
-            }       
+            }
         }
         return type;
     }
 
     /**
      * getPhoneType converts an Android phone type into a string
-     * @param type 
+     * @param type
      * @return phone type as string.
      */
     private String getAddressType(int type) {
         String stringType;
         switch (type) {
-            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME: 
+            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME:
                 stringType = "home";
                 break;
-            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK: 
+            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK:
                 stringType = "work";
                 break;
-            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER: 
-            default: 
+            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER:
+            default:
                 stringType = "other";
                 break;
         }
diff --git a/framework/src/org/apache/cordova/ContactManager.java b/framework/src/org/apache/cordova/ContactManager.java
index ebe9ede6..55a9739f 100755
--- a/framework/src/org/apache/cordova/ContactManager.java
+++ b/framework/src/org/apache/cordova/ContactManager.java
@@ -46,7 +46,7 @@ public class ContactManager extends Plugin {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action    The action to execute.
      * @param args      JSONArry of arguments for the plugin.
      * @param callbackId  The callback id used when calling back into JavaScript.
@@ -57,7 +57,7 @@ public class ContactManager extends Plugin {
         String result = "";
 
         /**
-         * Check to see if we are on an Android 1.X device.  If we are return an error as we 
+         * Check to see if we are on an Android 1.X device.  If we are return an error as we
          * do not support this as of Cordova 1.0.
          */
         if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java
index 2344c511..1125e629 100755
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -40,15 +40,15 @@ import android.widget.EditText;
  * This class is the WebChromeClient that implements callbacks for our web view.
  */
 public class CordovaChromeClient extends WebChromeClient {
-    
+
 
     private String TAG = "CordovaLog";
     private long MAX_QUOTA = 100 * 1024 * 1024;
     private DroidGap ctx;
-    
+
     /**
      * Constructor.
-     * 
+     *
      * @param ctx
      */
     public CordovaChromeClient(Context ctx) {
@@ -57,7 +57,7 @@ public class CordovaChromeClient extends WebChromeClient {
 
     /**
      * Tell the client to display a javascript alert dialog.
-     * 
+     *
      * @param view
      * @param url
      * @param message
@@ -97,11 +97,11 @@ public class CordovaChromeClient extends WebChromeClient {
         dlg.create();
         dlg.show();
         return true;
-    }       
+    }
 
     /**
      * Tell the client to display a confirm dialog to the user.
-     * 
+     *
      * @param view
      * @param url
      * @param message
@@ -113,13 +113,13 @@ public class CordovaChromeClient extends WebChromeClient {
         dlg.setMessage(message);
         dlg.setTitle("Confirm");
         dlg.setCancelable(true);
-        dlg.setPositiveButton(android.R.string.ok, 
+        dlg.setPositiveButton(android.R.string.ok,
             new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     result.confirm();
                 }
             });
-        dlg.setNegativeButton(android.R.string.cancel, 
+        dlg.setNegativeButton(android.R.string.cancel,
             new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     result.cancel();
@@ -149,13 +149,13 @@ public class CordovaChromeClient extends WebChromeClient {
     }
 
     /**
-     * Tell the client to display a prompt dialog to the user. 
-     * If the client returns true, WebView will assume that the client will 
+     * 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 
+     *
+     * 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
@@ -164,15 +164,15 @@ public class CordovaChromeClient extends WebChromeClient {
      */
     @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 
+
+        // 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;
@@ -188,13 +188,13 @@ public class CordovaChromeClient extends WebChromeClient {
                 e.printStackTrace();
             }
         }
-        
-        // Polling for JavaScript messages 
+
+        // 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 = "";
@@ -212,7 +212,7 @@ public class CordovaChromeClient extends WebChromeClient {
             }
             result.confirm(r);
         }
-        
+
         // Cordova JS has initialized, so show webview
         // (This solves white flash seen when rendering HTML)
         else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
@@ -235,14 +235,14 @@ public class CordovaChromeClient extends WebChromeClient {
             }
             dlg.setView(input);
             dlg.setCancelable(false);
-            dlg.setPositiveButton(android.R.string.ok, 
+            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, 
+            dlg.setNegativeButton(android.R.string.cancel,
                 new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                     res.cancel();
@@ -253,7 +253,7 @@ public class CordovaChromeClient extends WebChromeClient {
         }
         return true;
     }
-    
+
     /**
      * Handle database quota exceeded notification.
      *
@@ -288,14 +288,14 @@ public class CordovaChromeClient extends WebChromeClient {
     // 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);
@@ -303,8 +303,8 @@ public class CordovaChromeClient extends WebChromeClient {
 
     @Override
     /**
-     * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin. 
-     * 
+     * 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
      */
diff --git a/framework/src/org/apache/cordova/CordovaLocationListener.java b/framework/src/org/apache/cordova/CordovaLocationListener.java
index 3daa211b..fcb6bf34 100755
--- a/framework/src/org/apache/cordova/CordovaLocationListener.java
+++ b/framework/src/org/apache/cordova/CordovaLocationListener.java
@@ -38,161 +38,161 @@ public class CordovaLocationListener implements LocationListener {
     protected LocationManager locationManager;
     private GeoBroker owner;
     protected boolean running = false;
-    
+
     public HashMap<String, String> watches = new HashMap<String, String>();
     private List<String> callbacks = new ArrayList<String>();
 
     private String TAG = "[Cordova Location Listener]";
-	
+
     public CordovaLocationListener(LocationManager manager, GeoBroker broker, String tag) {
-    	this.locationManager = manager;
-    	this.owner = broker;
-    	this.TAG = tag;
+        this.locationManager = manager;
+        this.owner = broker;
+        this.TAG = tag;
     }
-    
+
     protected void fail(int code, String message) {
         for (String callbackId: this.callbacks)
         {
-        	this.owner.fail(code, message, callbackId);
+            this.owner.fail(code, message, callbackId);
         }
         this.callbacks.clear();
-        
+
         Iterator it = this.watches.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry pairs = (Map.Entry)it.next();
             this.owner.fail(code, message, (String)pairs.getValue());
         }
     }
-    
+
     private void win(Location loc) {
-    	for (String callbackId: this.callbacks)
+        for (String callbackId: this.callbacks)
         {
-        	this.owner.win(loc, callbackId);
+            this.owner.win(loc, callbackId);
         }
         this.callbacks.clear();
-        
+
         Iterator it = this.watches.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry pairs = (Map.Entry)it.next();
             this.owner.win(loc, (String)pairs.getValue());
         }
     }
-    
+
     /**
-     * Location Listener Methods 
+     * Location Listener Methods
      */
-    
-	/**
-	 * Called when the provider is disabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderDisabled(String provider) {
-		Log.d(TAG, "Location provider '" + provider + "' disabled.");
-		this.fail(POSITION_UNAVAILABLE, "GPS provider disabled.");
-	}
 
-	/**
-	 * Called when the provider is enabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderEnabled(String provider) {
-		Log.d(TAG, "Location provider "+ provider + " has been enabled");
-	}
+    /**
+     * Called when the provider is disabled by the user.
+     *
+     * @param provider
+     */
+    public void onProviderDisabled(String provider) {
+        Log.d(TAG, "Location provider '" + provider + "' disabled.");
+        this.fail(POSITION_UNAVAILABLE, "GPS provider disabled.");
+    }
 
-	/**
-	 * Called when the provider status changes. This method is called when a 
-	 * provider is unable to fetch a location or if the provider has recently 
-	 * become available after a period of unavailability.
-	 * 
-	 * @param provider
-	 * @param status
-	 * @param extras
-	 */
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-		Log.d(TAG, "The status of the provider " + provider + " has changed");
-		if (status == 0) {
-			Log.d(TAG, provider + " is OUT OF SERVICE");
-			this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "Provider " + provider + " is out of service.");
-		}
-		else if (status == 1) {
-			Log.d(TAG, provider + " is TEMPORARILY_UNAVAILABLE");
-		}
-		else {
-			Log.d(TAG, provider + " is AVAILABLE");
-		}
-	}
+    /**
+     * Called when the provider is enabled by the user.
+     *
+     * @param provider
+     */
+    public void onProviderEnabled(String provider) {
+        Log.d(TAG, "Location provider "+ provider + " has been enabled");
+    }
+
+    /**
+     * Called when the provider status changes. This method is called when a
+     * provider is unable to fetch a location or if the provider has recently
+     * become available after a period of unavailability.
+     *
+     * @param provider
+     * @param status
+     * @param extras
+     */
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+        Log.d(TAG, "The status of the provider " + provider + " has changed");
+        if (status == 0) {
+            Log.d(TAG, provider + " is OUT OF SERVICE");
+            this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "Provider " + provider + " is out of service.");
+        }
+        else if (status == 1) {
+            Log.d(TAG, provider + " is TEMPORARILY_UNAVAILABLE");
+        }
+        else {
+            Log.d(TAG, provider + " is AVAILABLE");
+        }
+    }
+
+    /**
+     * Called when the location has changed.
+     *
+     * @param location
+     */
+    public void onLocationChanged(Location location) {
+        Log.d(TAG, "The location has been updated!");
+        this.win(location);
+    }
+
+    // PUBLIC
+
+    public int size() {
+        return this.watches.size() + this.callbacks.size();
+    }
+
+    public void addWatch(String timerId, String callbackId) {
+        this.watches.put(timerId, callbackId);
+        if (this.size() == 1) {
+            this.start();
+        }
+    }
+    public void addCallback(String callbackId) {
+        this.callbacks.add(callbackId);
+        if (this.size() == 1) {
+            this.start();
+        }
+    }
+    public void clearWatch(String timerId) {
+        if (this.watches.containsKey(timerId)) {
+            this.watches.remove(timerId);
+        }
+        if (this.size() == 0) {
+            this.stop();
+        }
+    }
 
-	/**
-	 * Called when the location has changed.
-	 * 
-	 * @param location
-	 */
-	public void onLocationChanged(Location location) {
-		Log.d(TAG, "The location has been updated!");
-		this.win(location);
-	}
-	
-	// PUBLIC
-	
-	public int size() {
-		return this.watches.size() + this.callbacks.size();
-	}
-	
-	public void addWatch(String timerId, String callbackId) {
-		this.watches.put(timerId, callbackId);
-		if (this.size() == 1) {
-			this.start();
-		}
-	}
-	public void addCallback(String callbackId) {
-		this.callbacks.add(callbackId);
-		if (this.size() == 1) {
-			this.start();
-		}
-	}
-	public void clearWatch(String timerId) {
-		if (this.watches.containsKey(timerId)) {
-			this.watches.remove(timerId);
-		}
-		if (this.size() == 0) {
-			this.stop();
-		}
-	}
-    
     /**
      * Destroy listener.
      */
     public void destroy() {
-    	this.stop();
+        this.stop();
     }
-	
-	// LOCAL
-	
-	/**
-	 * Start requesting location updates.
-	 * 
-	 * @param interval
-	 */
-	protected void start() {
-		if (!this.running) {
-			if (this.locationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
-				this.running = true;
-				this.locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 60000, 10, this);
-			} else {
-				this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "Network provider is not available.");
-			}
-		}
-	}
 
-	/**
-	 * Stop receiving location updates.
-	 */
-	private void stop() {
-		if (this.running) {
-			this.locationManager.removeUpdates(this);
-			this.running = false;
-		}
-	}
+    // LOCAL
+
+    /**
+     * Start requesting location updates.
+     *
+     * @param interval
+     */
+    protected void start() {
+        if (!this.running) {
+            if (this.locationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
+                this.running = true;
+                this.locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 60000, 10, this);
+            } else {
+                this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "Network provider is not available.");
+            }
+        }
+    }
+
+    /**
+     * Stop receiving location updates.
+     */
+    private void stop() {
+        if (this.running) {
+            this.locationManager.removeUpdates(this);
+            this.running = false;
+        }
+    }
 }
diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 6bddfc35..e2bd344c 100755
--- a/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -27,7 +27,6 @@ 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;
@@ -38,35 +37,35 @@ 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 
+     * 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 != null) && this.ctx.pluginManager.onOverrideUrlLoading(url)) {
         }
-        
+
         // If dialing phone (tel:5551212)
         else if (url.startsWith(WebView.SCHEME_TEL)) {
             try {
@@ -154,11 +153,11 @@ public class CordovaWebViewClient extends WebViewClient {
         }
         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 
-     * 
+     * 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
@@ -171,27 +170,27 @@ public class CordovaWebViewClient extends WebViewClient {
     @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.  
+        // Clear history so history.back() doesn't do anything.
         // So we can reinit() native side CallbackServer & PluginManager.
-        view.clearHistory(); 
+        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.
      */
@@ -200,8 +199,8 @@ public class CordovaWebViewClient extends WebViewClient {
         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 
+         * 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.
          */
@@ -252,15 +251,15 @@ public class CordovaWebViewClient extends WebViewClient {
             this.ctx.endActivity();
         }
     }
-    
+
     /**
-     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
+     * 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. 
+     * @param failingUrl    The url that failed to load.
      */
     @Override
     public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
@@ -275,9 +274,9 @@ public class CordovaWebViewClient extends WebViewClient {
         // 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;
@@ -289,7 +288,7 @@ public class CordovaWebViewClient extends WebViewClient {
                 return;
             } else {
                 // debug = false
-                super.onReceivedSslError(view, handler, error);    
+                super.onReceivedSslError(view, handler, error);
             }
         } catch (NameNotFoundException e) {
             // When it doubt, lock it out!
@@ -299,7 +298,7 @@ public class CordovaWebViewClient extends WebViewClient {
 
     @Override
     public void doUpdateVisitedHistory(WebView view, String url, boolean isReload) {
-        /* 
+        /*
          * If you do a document.location.href the url does not get pushed on the stack
          * so we do a check here to see if the url should be pushed.
          */
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index a8433561..f3721dc4 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -41,7 +41,7 @@ public class Device extends Plugin {
     public static String cordovaVersion = "1.8.0rc1";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID
-    
+
     BroadcastReceiver telephonyReceiver = null;
 
     /**
@@ -49,11 +49,11 @@ public class Device extends Plugin {
      */
     public Device() {
     }
-    
+
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
+     *
      * @param ctx The context of the main Activity.
      */
     public void setContext(CordovaInterface ctx) {
@@ -64,7 +64,7 @@ public class Device extends Plugin {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action        The action to execute.
      * @param args          JSONArry of arguments for the plugin.
      * @param callbackId    The callback id used when calling back into JavaScript.
@@ -72,8 +72,8 @@ public class Device extends Plugin {
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.OK;
-        String result = "";     
-    
+        String result = "";
+
         try {
             if (action.equals("getDeviceInfo")) {
                 JSONObject r = new JSONObject();
@@ -95,7 +95,7 @@ public class Device extends Plugin {
 
     /**
      * Identifies if action to be executed returns a value and should be run synchronously.
-     * 
+     *
      * @param action    The action to execute
      * @return          T=returns value
      */
@@ -105,7 +105,7 @@ public class Device extends Plugin {
         }
         return false;
     }
-    
+
     /**
      * Unregister receiver.
      */
@@ -116,7 +116,7 @@ public class Device extends Plugin {
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
-    
+
     /**
      * Listen for telephony events: RINGING, OFFHOOK and IDLE
      * Send these events to all plugins using
@@ -127,10 +127,10 @@ public class Device extends Plugin {
         intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
         final CordovaInterface myctx = this.ctx;
         this.telephonyReceiver = new BroadcastReceiver() {
-            
+
             @Override
             public void onReceive(Context context, Intent intent) {
-                
+
                 // If state has changed
                 if ((intent != null) && intent.getAction().equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) {
                     if (intent.hasExtra(TelephonyManager.EXTRA_STATE)) {
@@ -151,69 +151,69 @@ public class Device extends Plugin {
                 }
             }
         };
-        
+
         // Register the receiver
         this.ctx.registerReceiver(this.telephonyReceiver, intentFilter);
     }
 
     /**
      * Get the OS name.
-     * 
+     *
      * @return
      */
     public String getPlatform() {
         return Device.platform;
     }
-    
+
     /**
      * Get the device's Universally Unique Identifier (UUID).
-     * 
+     *
      * @return
      */
-    public String getUuid() {       
+    public String getUuid() {
         String uuid = Settings.Secure.getString(this.ctx.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
         return uuid;
     }
 
     /**
      * Get the Cordova version.
-     * 
+     *
      * @return
      */
     public String getCordovaVersion() {
         return Device.cordovaVersion;
-    }   
-    
+    }
+
     public String getModel() {
         String model = android.os.Build.MODEL;
         return model;
     }
-    
+
     public String getProductName() {
         String productname = android.os.Build.PRODUCT;
         return productname;
     }
-    
+
     /**
      * Get the OS version.
-     * 
+     *
      * @return
      */
     public String getOSVersion() {
         String osversion = android.os.Build.VERSION.RELEASE;
         return osversion;
     }
-    
+
     public String getSDKVersion() {
         String sdkversion = android.os.Build.VERSION.SDK;
         return sdkversion;
     }
-    
-    
+
+
     public String getTimeZoneID() {
        TimeZone tz = TimeZone.getDefault();
         return(tz.getID());
-    } 
-    
+    }
+
 }
 
diff --git a/framework/src/org/apache/cordova/DirectoryManager.java b/framework/src/org/apache/cordova/DirectoryManager.java
index 7b8e03f8..4696d00c 100644
--- a/framework/src/org/apache/cordova/DirectoryManager.java
+++ b/framework/src/org/apache/cordova/DirectoryManager.java
@@ -25,127 +25,127 @@ import android.os.Environment;
 import android.os.StatFs;
 
 /**
- * This class provides file directory utilities.  
+ * This class provides file directory utilities.
  * All file operations are performed on the SD card.
- *   
+ *
  * It is used by the FileUtils class.
  */
 public class DirectoryManager {
-	
-	private static final String LOG_TAG = "DirectoryManager";
 
-	/**
-	 * Determine if a file or directory exists.
-	 * 
-	 * @param name				The name of the file to check.
-	 * @return					T=exists, F=not found
-	 */
-	protected static boolean testFileExists(String name) {
-		boolean status;
-		
-		// If SD card exists
-		if ((testSaveLocationExists()) && (!name.equals(""))) {
-    		File path = Environment.getExternalStorageDirectory();
+    private static final String LOG_TAG = "DirectoryManager";
+
+    /**
+     * Determine if a file or directory exists.
+     *
+     * @param name				The name of the file to check.
+     * @return					T=exists, F=not found
+     */
+    protected static boolean testFileExists(String name) {
+        boolean status;
+
+        // If SD card exists
+        if ((testSaveLocationExists()) && (!name.equals(""))) {
+            File path = Environment.getExternalStorageDirectory();
             File newPath = constructFilePaths(path.toString(), name);
             status = newPath.exists();
-    	}
-		// If no SD card
-		else{
-    		status = false;
-    	}
-		return status;
-	}
-	
-	/**
-	 * Get the free disk space
-	 * 
-	 * @return 		Size in KB or -1 if not available
-	 */
-	protected static long getFreeDiskSpace(boolean checkInternal) {
-		String status = Environment.getExternalStorageState();
-		long freeSpace = 0;
-		
-		// If SD card exists
-		if (status.equals(Environment.MEDIA_MOUNTED)) {
-			freeSpace = freeSpaceCalculation(Environment.getExternalStorageDirectory().getPath());
-		} 
-		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;
-	}	
-	
-	/**
-	 * 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) {
+        }
+        // If no SD card
+        else{
+            status = false;
+        }
+        return status;
+    }
+
+    /**
+     * Get the free disk space
+     *
+     * @return 		Size in KB or -1 if not available
+     */
+    protected static long getFreeDiskSpace(boolean checkInternal) {
+        String status = Environment.getExternalStorageState();
+        long freeSpace = 0;
+
+        // If SD card exists
+        if (status.equals(Environment.MEDIA_MOUNTED)) {
+            freeSpace = freeSpaceCalculation(Environment.getExternalStorageDirectory().getPath());
+        }
+        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;
+    }
+
+    /**
+     * 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.
-	 * 
-	 * @return				T=exists, F=not found
-	 */
-	protected static boolean testSaveLocationExists() {
-		String sDCardStatus = Environment.getExternalStorageState();
-		boolean status;
-		
-		// If SD card is mounted
-		if (sDCardStatus.equals(Environment.MEDIA_MOUNTED)) {
-			status = true;
-		}
-		
-		// If no SD card
-		else {
-			status = false;
-		}
-		return status;
-	}
-	
-	/**
-	 * Create a new file object from two file paths.
-	 * 
-	 * @param file1			Base file path
-	 * @param file2			Remaining file path
-	 * @return				File object
-	 */
-	private static File constructFilePaths (String file1, String file2) {
-		File newPath;
-		if (file2.startsWith(file1)) {
-			newPath = new File(file2);
-		}
-		else {
-			newPath = new File(file1+"/"+file2);
-		}
-		return newPath;
-	}
-    
+    }
+
     /**
-     * Determine if we can use the SD Card to store the temporary file.  If not then use 
+     * Determine if SD card exists.
+     *
+     * @return				T=exists, F=not found
+     */
+    protected static boolean testSaveLocationExists() {
+        String sDCardStatus = Environment.getExternalStorageState();
+        boolean status;
+
+        // If SD card is mounted
+        if (sDCardStatus.equals(Environment.MEDIA_MOUNTED)) {
+            status = true;
+        }
+
+        // If no SD card
+        else {
+            status = false;
+        }
+        return status;
+    }
+
+    /**
+     * Create a new file object from two file paths.
+     *
+     * @param file1			Base file path
+     * @param file2			Remaining file path
+     * @return				File object
+     */
+    private static File constructFilePaths (String file1, String file2) {
+        File newPath;
+        if (file2.startsWith(file1)) {
+            newPath = new File(file2);
+        }
+        else {
+            newPath = new File(file1+"/"+file2);
+        }
+        return newPath;
+    }
+
+    /**
+     * Determine if we can use the SD Card to store the temporary file.  If not then use
      * the internal cache directory.
-     * 
+     *
      * @return the absolute path of where to store the file
      */
     protected static String getTempDirectoryPath(Context ctx) {
         File cache = null;
-        
+
         // SD Card Mounted
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            cache = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + 
+            cache = new File(Environment.getExternalStorageDirectory().getAbsolutePath() +
                     "/Android/data/" + ctx.getPackageName() + "/cache/");
-        } 
+        }
         // Use internal storage
         else {
             cache = ctx.getCacheDir();
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 5e2586d0..ddd50a6e 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -70,29 +70,29 @@ import android.widget.LinearLayout;
  * This class is the main Android activity that represents the Cordova
  * application.  It should be extended by the user to load the specific
  * html file that contains the application.
- * 
+ *
  * As an example:
- * 
+ *
  *     package org.apache.cordova.examples;
  *     import android.app.Activity;
  *     import android.os.Bundle;
  *     import org.apache.cordova.*;
- *     
+ *
  *     public class Examples extends DroidGap {
  *       @Override
  *       public void onCreate(Bundle savedInstanceState) {
  *         super.onCreate(savedInstanceState);
- *                  
+ *
  *         // Set properties for activity
  *         super.setStringProperty("loadingDialog", "Title,Message"); // show loading dialog
  *         super.setStringProperty("errorUrl", "file:///android_asset/www/error.html"); // if error loading file in super.loadUrl().
  *
  *         // Initialize activity
  *         super.init();
- *         
+ *
  *         // Clear cache if you want
  *         super.appView.clearCache(true);
- *         
+ *
  *         // Load your application
  *         super.setIntegerProperty("splashscreen", R.drawable.splash); // load splash.jpg image from the resource drawable directory
  *         super.loadUrl("file:///android_asset/www/index.html", 3000); // show splash screen 3 sec before loading app
@@ -100,15 +100,15 @@ import android.widget.LinearLayout;
  *     }
  *
  * Properties: The application can be configured using the following properties:
- * 
- *      // Display a native loading dialog when loading app.  Format for value = "Title,Message".  
+ *
+ *      // Display a native loading dialog when loading app.  Format for value = "Title,Message".
  *      // (String - default=null)
  *      super.setStringProperty("loadingDialog", "Wait,Loading Demo...");
- * 
- *      // Display a native loading dialog when loading sub-pages.  Format for value = "Title,Message".  
+ *
+ *      // Display a native loading dialog when loading sub-pages.  Format for value = "Title,Message".
  *      // (String - default=null)
  *      super.setStringProperty("loadingPageDialog", "Loading page...");
- *  
+ *
  *      // Load a splash screen image from the resource drawable directory.
  *      // (Integer - default=0)
  *      super.setIntegerProperty("splashscreen", R.drawable.splash);
@@ -116,21 +116,21 @@ import android.widget.LinearLayout;
  *      // Set the background color.
  *      // (Integer - default=0 or BLACK)
  *      super.setIntegerProperty("backgroundColor", Color.WHITE);
- * 
+ *
  *      // Time in msec to wait before triggering a timeout error when loading
  *      // with super.loadUrl().  (Integer - default=20000)
  *      super.setIntegerProperty("loadUrlTimeoutValue", 60000);
- * 
- *      // URL to load if there's an error loading specified URL with loadUrl().  
+ *
+ *      // URL to load if there's an error loading specified URL with loadUrl().
  *      // Should be a local URL starting with file://. (String - default=null)
  *      super.setStringProperty("errorUrl", "file:///android_asset/www/error.html");
- * 
+ *
  *      // Enable app to keep running in background. (Boolean - default=true)
  *      super.setBooleanProperty("keepRunning", false);
- *      
+ *
  * Cordova.xml configuration:
  *      Cordova uses a configuration file at res/xml/cordova.xml to specify the following settings.
- *      
+ *
  *      Approved list of URLs that can be loaded into DroidGap
  *          <access origin="http://server regexp" subdomains="true" />
  *      Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
@@ -141,7 +141,7 @@ import android.widget.LinearLayout;
  *      Before using a new plugin, a new element must be added to the file.
  *          name attribute is the service name passed to Cordova.exec() in JavaScript
  *          value attribute is the Java class name to call.
- *      
+ *
  *      <plugins>
  *          <plugin name="App" value="org.apache.cordova.App"/>
  *          ...
@@ -149,7 +149,7 @@ import android.widget.LinearLayout;
  */
 public class DroidGap extends Activity implements CordovaInterface {
     public static String TAG = "DroidGap";
-    
+
     // The webview for our app
     protected WebView appView;
     protected WebViewClient webViewClient;
@@ -167,15 +167,15 @@ public class DroidGap extends Activity implements CordovaInterface {
     // ie http://server/path/index.html#abc?query
     private String url = null;
     private Stack<String> urls = new Stack<String>();
-    
+
     // Url was specified from extras (activity was started programmatically)
     private String initUrl = null;
-    
+
     private static int ACTIVITY_STARTING = 0;
     private static int ACTIVITY_RUNNING = 1;
     private static int ACTIVITY_EXITING = 2;
     private int activityState = 0;  // 0=starting, 1=running (after 1st resume), 2=shutting down
-    
+
     // The base of the initial URL for our app.
     // Does not include file name.  Ends with /
     // ie http://server/path/
@@ -187,14 +187,14 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     // Flag indicates that a loadUrl timeout occurred
     int loadUrlTimeout = 0;
-    
-    // Default background color for activity 
+
+    // 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.
      */
@@ -205,7 +205,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     // LoadUrl timeout value in msec (default of 20 sec)
     protected int loadUrlTimeoutValue = 20000;
-    
+
     // Keep app running when pause is received. (default = true)
     // If true, then the JavaScript and native code continue to run in the background
     // when another application (activity) is started.
@@ -216,7 +216,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Sets the authentication token.
-     * 
+     *
      * @param authenticationToken
      *            the authentication token
      * @param host
@@ -225,21 +225,21 @@ public class DroidGap extends Activity implements CordovaInterface {
      *            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
@@ -249,16 +249,16 @@ public class DroidGap extends Activity implements CordovaInterface {
     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
@@ -267,38 +267,38 @@ public class DroidGap extends Activity implements CordovaInterface {
      */
     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) {      
+            if(token == null) {
                 token = authenticationTokens.get("");
             }
         }
-        
+
         return token;
     }
-    
+
     /**
      * Clear all authentication tokens.
      */
     public void clearAuthenticationTokens() {
         authenticationTokens.clear();
     }
-    
-    
-    /** 
-     * Called when the activity is first created. 
-     * 
+
+
+    /**
+     * Called when the activity is first created.
+     *
      * @param savedInstanceState
      */
     @Override
@@ -324,14 +324,14 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
 
         // This builds the view.  We could probably get away with NOT having a LinearLayout, but I like having a bucket!
-        Display display = getWindowManager().getDefaultDisplay(); 
+        Display display = getWindowManager().getDefaultDisplay();
         int width = display.getWidth();
         int height = display.getHeight();
-        
+
         root = new LinearLayoutSoftKeyboardDetect(this, width, height);
         root.setOrientation(LinearLayout.VERTICAL);
         root.setBackgroundColor(this.backgroundColor);
-        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
+        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
                 ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
 
         // If url was passed in to intent, then init webview, which will load the url
@@ -345,35 +345,35 @@ public class DroidGap extends Activity implements CordovaInterface {
         // Setup the hardware volume controls to handle volume control
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
-    
+
     /**
      * Create and initialize web container with default web view objects.
      */
     public void init() {
-    	this.init(new WebView(DroidGap.this), new CordovaWebViewClient(this), new CordovaChromeClient(DroidGap.this));
+        this.init(new WebView(DroidGap.this), new CordovaWebViewClient(this), new CordovaChromeClient(DroidGap.this));
     }
-    
+
     /**
      * Initialize web container with web view objects.
-     * 
+     *
      * @param webView
      * @param webViewClient
      * @param webChromeClient
      */
     public void init(WebView webView, WebViewClient webViewClient, WebChromeClient webChromeClient) {
         LOG.d(TAG, "DroidGap.init()");
-        
+
         // Set up web container
-       	this.appView = webView;
+           this.appView = webView;
         this.appView.setId(100);
 
         this.appView.setLayoutParams(new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.FILL_PARENT,
-                ViewGroup.LayoutParams.FILL_PARENT, 
+                ViewGroup.LayoutParams.FILL_PARENT,
                 1.0F));
 
-       	this.appView.setWebChromeClient(webChromeClient);
-       	this.setWebViewClient(this.appView, webViewClient);
+           this.appView.setWebChromeClient(webChromeClient);
+           this.setWebViewClient(this.appView, webViewClient);
 
         this.appView.setInitialScale(0);
         this.appView.setVerticalScrollBarEnabled(false);
@@ -384,18 +384,18 @@ public class DroidGap extends Activity implements CordovaInterface {
         settings.setJavaScriptEnabled(true);
         settings.setJavaScriptCanOpenWindowsAutomatically(true);
         settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
-        
+
         //Set the nav dump for HTC
         settings.setNavDump(true);
 
         // Enable database
         settings.setDatabaseEnabled(true);
-        String databasePath = this.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath(); 
+        String databasePath = this.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
         settings.setDatabasePath(databasePath);
 
         // Enable DOM storage
         settings.setDomStorageEnabled(true);
-        
+
         // Enable built-in geolocation
         settings.setGeolocationEnabled(true);
 
@@ -403,17 +403,17 @@ public class DroidGap extends Activity implements CordovaInterface {
         this.appView.setVisibility(View.INVISIBLE);
         root.addView(this.appView);
         setContentView(root);
-        
+
         // Clear cancel flag
         this.cancelLoadUrl = false;
-        
+
         // Create plugin manager
-        this.pluginManager = new PluginManager(this.appView, this);        
+        this.pluginManager = new PluginManager(this.appView, this);
     }
-    
+
     /**
      * Set the WebViewClient.
-     * 
+     *
      * @param appView
      * @param client
      */
@@ -440,18 +440,18 @@ public class DroidGap extends Activity implements CordovaInterface {
         if (timeout > 0) {
             this.loadUrlTimeoutValue = timeout;
         }
-        
+
         // If keepRunning
         this.keepRunning = this.getBooleanProperty("keepRunning", true);
     }
-    
+
     /**
      * Load the url into the webview.
-     * 
+     *
      * @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);
@@ -461,10 +461,10 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.loadUrlIntoView(this.initUrl);
         }
     }
-    
+
     /**
      * Load the url into the webview.
-     * 
+     *
      * @param url
      */
     private void loadUrlIntoView(final String url) {
@@ -485,7 +485,7 @@ public class DroidGap extends Activity implements CordovaInterface {
         if (!url.startsWith("javascript:")) {
             LOG.d(TAG, "DroidGap: url=%s baseUrl=%s", url, baseUrl);
         }
-        
+
         // Load URL on UI thread
         final DroidGap me = this;
         this.runOnUiThread(new Runnable() {
@@ -502,7 +502,7 @@ public class DroidGap extends Activity implements CordovaInterface {
                 // Track URLs loaded instead of using appView history
                 me.urls.push(url);
                 me.appView.clearHistory();
-            
+
                 // Create callback server and plugin manager
                 if (me.callbackServer == null) {
                     me.callbackServer = new CallbackServer();
@@ -512,14 +512,14 @@ public class DroidGap extends Activity implements CordovaInterface {
                     me.callbackServer.reinit(url);
                 }
                 me.pluginManager.init();
-                
+
                 // 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);
                 }
                 else {
-                    loading = me.getStringProperty("loadingPageDialog", null);                  
+                    loading = me.getStringProperty("loadingPageDialog", null);
                 }
                 if (loading != null) {
 
@@ -566,16 +566,16 @@ public class DroidGap extends Activity implements CordovaInterface {
             }
         });
     }
-    
+
     /**
      * Load the url into the webview after waiting for period of time.
      * This is used to display the splashscreen for certain amount of time.
-     * 
+     *
      * @param url
      * @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);
@@ -589,7 +589,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     /**
      * Load the url into the webview after waiting for period of time.
      * This is used to display the splashscreen for certain amount of time.
-     * 
+     *
      * @param url
      * @param time              The number of ms to wait before loading webview
      */
@@ -597,30 +597,30 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         // 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);
         }
-        
+
         this.handleActivityParameters();
         if (this.splashscreen != 0) {
             this.showSplashScreen(time);
         }
         this.loadUrlIntoView(url);
     }
-    
+
     /**
      * Cancel loadUrl before it has been loaded.
      */
     public void cancelLoadUrl() {
         this.cancelLoadUrl = true;
     }
-    
+
     /**
      * Clear the resource cache.
      */
@@ -637,16 +637,16 @@ public class DroidGap extends Activity implements CordovaInterface {
     public void clearHistory() {
         this.urls.clear();
         this.appView.clearHistory();
-        
+
         // Leave current url on history stack
         if (this.url != null) {
             this.urls.push(this.url);
         }
     }
-    
+
     /**
      * Go to previous page in history.  (We manage our own history)
-     * 
+     *
      * @return true if we went back, false if we are already at top
      */
     public boolean backHistory() {
@@ -654,7 +654,7 @@ public class DroidGap extends Activity implements CordovaInterface {
         // Check webview first to see if there is a history
         // This is needed to support curPage#diffLink, since they are added to appView's history, but not our history url array (JQMobile behavior)
         if (this.appView.canGoBack()) {
-            this.appView.goBack();  
+            this.appView.goBack();
             return true;
         }
 
@@ -665,24 +665,24 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.loadUrl(url);
             return true;
         }
-        
+
         return false;
     }
 
     @Override
     /**
-     * Called by the system when the device configuration changes while your activity is running. 
-     * 
+     * Called by the system when the device configuration changes while your activity is running.
+     *
      * @param Configuration newConfig
      */
     public void onConfigurationChanged(Configuration newConfig) {
         //don't reload the current page when the orientation is changed
         super.onConfigurationChanged(newConfig);
     }
-    
+
     /**
      * Get boolean property for activity.
-     * 
+     *
      * @param name
      * @param defaultValue
      * @return
@@ -701,7 +701,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Get int property for activity.
-     * 
+     *
      * @param name
      * @param defaultValue
      * @return
@@ -720,7 +720,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Get string property for activity.
-     * 
+     *
      * @param name
      * @param defaultValue
      * @return
@@ -739,7 +739,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Get double property for activity.
-     * 
+     *
      * @param name
      * @param defaultValue
      * @return
@@ -758,27 +758,27 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Set boolean property on activity.
-     * 
+     *
      * @param name
      * @param value
      */
     public void setBooleanProperty(String name, boolean value) {
         this.getIntent().putExtra(name, value);
     }
-    
+
     /**
      * Set int property on activity.
-     * 
+     *
      * @param name
      * @param value
      */
     public void setIntegerProperty(String name, int value) {
         this.getIntent().putExtra(name, value);
     }
-    
+
     /**
      * Set string property on activity.
-     * 
+     *
      * @param name
      * @param value
      */
@@ -788,7 +788,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Set double property on activity.
-     * 
+     *
      * @param name
      * @param value
      */
@@ -798,11 +798,11 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     @Override
     /**
-     * Called when the system is about to start resuming a previous activity. 
+     * Called when the system is about to start resuming a previous activity.
      */
     protected void onPause() {
         super.onPause();
-        
+
         // Don't process pause if shutting down, since onDestroy() will be called
         if (this.activityState == ACTIVITY_EXITING) {
             return;
@@ -817,9 +817,9 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         // Forward to plugins
         if (this.pluginManager != null) {
-        	this.pluginManager.onPause(this.keepRunning);
+            this.pluginManager.onPause(this.keepRunning);
         }
-        
+
         // If app doesn't want to run in background
         if (!this.keepRunning) {
 
@@ -837,17 +837,17 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         //Forward to plugins
         if (this.pluginManager != null) {
-        	this.pluginManager.onNewIntent(intent);
+            this.pluginManager.onNewIntent(intent);
         }
     }
-    
+
     @Override
     /**
-     * Called when the activity will start interacting with the user. 
+     * Called when the activity will start interacting with the user.
      */
     protected void onResume() {
         super.onResume();
-        
+
         if (this.activityState == ACTIVITY_STARTING) {
             this.activityState = ACTIVITY_RUNNING;
             return;
@@ -862,9 +862,9 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         // Forward to plugins
         if (this.pluginManager != null) {
-        	this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
+            this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
         }
-        
+
         // If app doesn't want to run in background
         if (!this.keepRunning || this.activityResultKeepRunning) {
 
@@ -878,14 +878,14 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.appView.resumeTimers();
         }
     }
-    
+
     @Override
     /**
-     * The final call you receive before your activity is destroyed. 
+     * The final call you receive before your activity is destroyed.
      */
     public void onDestroy() {
         super.onDestroy();
-        
+
         if (this.appView != null) {
 
 
@@ -906,13 +906,13 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Send a message to all plugins. 
-     * 
+     * Send a message to all plugins.
+     *
      * @param id            The message id
      * @param data          The message data
      */
     public void postMessage(String id, Object data) {
-        
+
         // Forward to plugins
         if (this.pluginManager != null) {
             this.pluginManager.postMessage(id, data);
@@ -922,23 +922,23 @@ public class DroidGap extends Activity implements CordovaInterface {
     /**
      * @deprecated
      * Add services to res/xml/plugins.xml instead.
-     * 
+     *
      * Add a class that implements a service.
-     * 
+     *
      * @param serviceType
      * @param className
      */
     @Deprecated
     public void addService(String serviceType, String className) {
         if (this.pluginManager != null) {
-        	this.pluginManager.addService(serviceType, className);
+            this.pluginManager.addService(serviceType, className);
         }
     }
-    
+
     /**
      * Send JavaScript statement back to JavaScript.
      * (This is a convenience method)
-     * 
+     *
      * @param message
      */
     public void sendJavascript(String statement) {
@@ -949,7 +949,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Load the specified URL in the Cordova webview or a new browser instance.
-     * 
+     *
      * NOTE: If openExternal is false, only URLs listed in whitelist can be loaded.
      *
      * @param url           The url to load.
@@ -959,24 +959,24 @@ public class DroidGap extends Activity implements CordovaInterface {
      */
     public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) { //throws android.content.ActivityNotFoundException {
         LOG.d(TAG, "showWebPage(%s, %b, %b, HashMap", url, openExternal, clearHistory);
-        
+
         // If clearing history
         if (clearHistory) {
             this.clearHistory();
         }
-        
+
         // If loading into our webview
         if (!openExternal) {
-            
+
             // Make sure url is in whitelist
             if (url.startsWith("file://") || url.indexOf(this.baseUrl) == 0 || isUrlWhiteListed(url)) {
                 // TODO: What about params?
-                
+
                 // Clear out current url from history, since it will be replacing it
                 if (clearHistory) {
                     this.urls.clear();
                 }
-                
+
                 // Load new URL
                 this.loadUrl(url);
             }
@@ -992,7 +992,7 @@ public class DroidGap extends Activity implements CordovaInterface {
                 }
             }
         }
-        
+
         // Load in default view intent
         else {
             try {
@@ -1004,10 +1004,10 @@ public class DroidGap extends Activity implements CordovaInterface {
             }
         }
     }
-    
+
     /**
      * Show the spinner.  Must be called from the UI thread.
-     * 
+     *
      * @param title         Title of the dialog
      * @param message       The message of the dialog
      */
@@ -1017,8 +1017,8 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.spinnerDialog = null;
         }
         final DroidGap me = this;
-        this.spinnerDialog = ProgressDialog.show(DroidGap.this, title , message, true, true, 
-                new DialogInterface.OnCancelListener() { 
+        this.spinnerDialog = ProgressDialog.show(DroidGap.this, title , message, true, true,
+                new DialogInterface.OnCancelListener() {
             public void onCancel(DialogInterface dialog) {
                 me.spinnerDialog = null;
             }
@@ -1034,7 +1034,7 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.spinnerDialog = null;
         }
     }
-    
+
     /**
      * End this activity by calling finish for activity
      */
@@ -1042,10 +1042,10 @@ public class DroidGap extends Activity implements CordovaInterface {
         this.activityState = ACTIVITY_EXITING;
         this.finish();
     }
-    
+
     /**
      * Called when a key is de-pressed. (Key UP)
-     * 
+     *
      * @param keyCode
      * @param event
      */
@@ -1091,14 +1091,14 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Any calls to Activity.startActivityForResult must use method below, so 
-     * the result can be routed to them correctly.  
-     * 
+     * Any calls to Activity.startActivityForResult must use method below, so
+     * the result can be routed to them correctly.
+     *
      * This is done to eliminate the need to modify DroidGap.java to receive activity results.
-     * 
+     *
      * @param intent            The intent to start
      * @param requestCode       Identifies who to send the result to
-     * 
+     *
      * @throws RuntimeException
      */
     @Override
@@ -1108,9 +1108,9 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Launch an activity for which you would like a result when it finished. When this activity exits, 
+     * Launch an activity for which you would like a result when it finished. When this activity exits,
      * your onActivityResult() method will be called.
-     *  
+     *
      * @param command           The command object
      * @param intent            The intent to start
      * @param requestCode       The request code that is passed to callback to identify the activity
@@ -1118,12 +1118,12 @@ public class DroidGap extends Activity implements CordovaInterface {
     public void startActivityForResult(IPlugin command, Intent intent, int requestCode) {
         this.activityResultCallback = command;
         this.activityResultKeepRunning = this.keepRunning;
-        
+
         // If multitasking turned on, then disable it for activities that return results
         if (command != null) {
             this.keepRunning = false;
         }
-        
+
         // Start activity
         super.startActivityForResult(intent, requestCode);
     }
@@ -1131,9 +1131,9 @@ public class DroidGap extends Activity implements CordovaInterface {
      @Override
     /**
      * Called when an activity you launched exits, giving you the requestCode you started it with,
-     * the resultCode it returned, and any additional data from it. 
-     * 
-     * @param requestCode       The request code originally supplied to startActivityForResult(), 
+     * the resultCode it returned, and any additional data from it.
+     *
+     * @param requestCode       The request code originally supplied to startActivityForResult(),
      *                          allowing you to identify who this result came from.
      * @param resultCode        The integer result code returned by the child activity through its setResult().
      * @param data              An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
@@ -1143,7 +1143,7 @@ public class DroidGap extends Activity implements CordovaInterface {
          IPlugin callback = this.activityResultCallback;
          if (callback != null) {
              callback.onActivityResult(requestCode, resultCode, intent);
-         }        
+         }
      }
 
      public void setActivityResultCallback(IPlugin plugin) {
@@ -1151,12 +1151,12 @@ public class DroidGap extends Activity implements CordovaInterface {
      }
 
      /**
-      * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
+      * 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 errorCode    The error code corresponding to an ERROR_* value.
       * @param description  A String describing the error.
-      * @param failingUrl   The url that failed to load. 
+      * @param failingUrl   The url that failed to load.
       */
      public void onReceivedError(final int errorCode, final String description, final String failingUrl) {
          final DroidGap me = this;
@@ -1168,7 +1168,7 @@ public class DroidGap extends Activity implements CordovaInterface {
              // Load URL on UI thread
              me.runOnUiThread(new Runnable() {
                  public void run() {
-                     me.showWebPage(errorUrl, false, true, null); 
+                     me.showWebPage(errorUrl, false, true, null);
                  }
              });
          }
@@ -1189,7 +1189,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
      /**
       * Display an error dialog and optionally exit application.
-      * 
+      *
       * @param title
       * @param message
       * @param button
@@ -1217,8 +1217,8 @@ public class DroidGap extends Activity implements CordovaInterface {
              }
          });
      }
-     
-     
+
+
     /**
      * Load Cordova configuration from res/xml/cordova.xml.
      * Approved list of URLs that can be loaded into DroidGap
@@ -1276,7 +1276,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Add entry to approved list of URLs (whitelist)
-     * 
+     *
      * @param origin        URL regular expression to allow
      * @param subdomains    T=include all subdomains under origin
      */
@@ -1305,7 +1305,7 @@ public class DroidGap extends Activity implements CordovaInterface {
                 whiteList.add(Pattern.compile("^https?://"+origin));
               }
               LOG.d(TAG, "Origin to allow: %s", origin);
-          }    
+          }
         }
       } catch(Exception e) {
         LOG.d(TAG, "Failed to add origin %s", origin);
@@ -1314,7 +1314,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
     /**
      * Determine if URL is in approved list of URLs to load.
-     * 
+     *
      * @param url
      * @return
      */
@@ -1339,13 +1339,13 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
         return false;
     }
-    
+
     /*
      * URL stack manipulators
      */
-    
-    /** 
-     * Returns the top url on the stack without removing it from 
+
+    /**
+     * Returns the top url on the stack without removing it from
      * the stack.
      */
     public String peekAtUrlStack() {
@@ -1354,38 +1354,35 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
         return "";
     }
-    
+
     /**
      * Add a url to the stack
-     * 
+     *
      * @param url
      */
     public void pushUrl(String url) {
         urls.push(url);
     }
-    
-    /* 
+
+    /*
      * Hook in DroidGap for menu plugins
-     * 
+     *
      */
-    
+
     @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
+    public boolean onCreateOptionsMenu(Menu menu) {
         this.postMessage("onCreateOptionsMenu", menu);
         return super.onCreateOptionsMenu(menu);
     }
-    
+
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu)
-    {
+    public boolean onPrepareOptionsMenu(Menu menu) {
         this.postMessage("onPrepareOptionsMenu", menu);
         return super.onPrepareOptionsMenu(menu);
     }
-    
+
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         this.postMessage("onOptionsItemSelected", item);
         return true;
     }
@@ -1405,7 +1402,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     protected Dialog splashDialog;
-    
+
     /**
      * Removes the Dialog that displays the splash screen
      */
@@ -1415,36 +1412,36 @@ public class DroidGap extends Activity implements CordovaInterface {
             splashDialog = null;
         }
     }
-     
+
     /**
      * Shows the splash screen over the full Activity
      */
     protected void showSplashScreen(int time) {
         // Get reference to display
         Display display = getWindowManager().getDefaultDisplay();
-        
+
         // Create the layout for the dialog
         LinearLayout root = new LinearLayout(this);
         root.setMinimumHeight(display.getHeight());
         root.setMinimumWidth(display.getWidth());
         root.setOrientation(LinearLayout.VERTICAL);
         root.setBackgroundColor(this.getIntegerProperty("backgroundColor", Color.BLACK));
-        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
+        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
                 ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
         root.setBackgroundResource(this.splashscreen);
 
         // Create and show the dialog
-        splashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar);       
+        splashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar);
         splashDialog.setContentView(root);
         splashDialog.setCancelable(false);
         splashDialog.show();
-     
+
         // Set Runnable to remove splash screen just in case
         final Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
-          public void run() {
-            removeSplashScreen();
-          }
+            public void run() {
+                removeSplashScreen();
+            }
         }, time);
     }
 }
diff --git a/framework/src/org/apache/cordova/ExifHelper.java b/framework/src/org/apache/cordova/ExifHelper.java
index 88c492ab..8b4d179d 100644
--- a/framework/src/org/apache/cordova/ExifHelper.java
+++ b/framework/src/org/apache/cordova/ExifHelper.java
@@ -41,31 +41,31 @@ public class ExifHelper {
     private String make = null;
     private String model = null;
     private String orientation = null;
-    private String whiteBalance = null;    
-    
+    private String whiteBalance = null;
+
     private ExifInterface inFile = null;
     private ExifInterface outFile = null;
-    
+
     /**
      * The file before it is compressed
-     * 
-     * @param filePath 
+     *
+     * @param filePath
      * @throws IOException
      */
     public void createInFile(String filePath) throws IOException {
         this.inFile = new ExifInterface(filePath);
     }
-    
-    /** 
+
+    /**
      * The file after it has been compressed
-     * 
+     *
      * @param filePath
      * @throws IOException
      */
     public void createOutFile(String filePath) throws IOException {
         this.outFile = new ExifInterface(filePath);
     }
-    
+
     /**
      * Reads all the EXIF data from the input file.
      */
@@ -88,12 +88,12 @@ public class ExifHelper {
         this.make = inFile.getAttribute(ExifInterface.TAG_MAKE);
         this.model = inFile.getAttribute(ExifInterface.TAG_MODEL);
         this.orientation = inFile.getAttribute(ExifInterface.TAG_ORIENTATION);
-        this.whiteBalance = inFile.getAttribute(ExifInterface.TAG_WHITE_BALANCE);        
+        this.whiteBalance = inFile.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
     }
-    
+
     /**
      * Writes the previously stored EXIF data to the output file.
-     * 
+     *
      * @throws IOException
      */
     public void writeExifData() throws IOException {
@@ -101,7 +101,7 @@ public class ExifHelper {
         if (this.outFile == null) {
             return;
         }
-        
+
         if (this.aperature != null) {
             this.outFile.setAttribute(ExifInterface.TAG_APERTURE, this.aperature);
         }
@@ -159,7 +159,7 @@ public class ExifHelper {
         if (this.whiteBalance != null) {
             this.outFile.setAttribute(ExifInterface.TAG_WHITE_BALANCE, this.whiteBalance);
         }
-        
+
         this.outFile.saveAttributes();
     }
 }
diff --git a/framework/src/org/apache/cordova/FileTransfer.java b/framework/src/org/apache/cordova/FileTransfer.java
index 368d97ad..c9b13a5c 100644
--- a/framework/src/org/apache/cordova/FileTransfer.java
+++ b/framework/src/org/apache/cordova/FileTransfer.java
@@ -452,14 +452,14 @@ public class FileTransfer extends Plugin {
               URL url = new URL(source);
               connection = (HttpURLConnection) url.openConnection();
               connection.setRequestMethod("GET");
-              
+
               //Add cookie support
               String cookie = CookieManager.getInstance().getCookie(source);
               if(cookie != null)
               {
                 connection.setRequestProperty("cookie", cookie);
               }
-              
+
               connection.connect();
 
               Log.d(LOG_TAG, "Download file: " + url);
@@ -538,7 +538,7 @@ public class FileTransfer extends Plugin {
 
     /**
      * Get a File object from the passed in path
-     * 
+     *
      * @param path file path
      * @return file object
      */
diff --git a/framework/src/org/apache/cordova/FileUploadResult.java b/framework/src/org/apache/cordova/FileUploadResult.java
index b838dcab..36fae93f 100644
--- a/framework/src/org/apache/cordova/FileUploadResult.java
+++ b/framework/src/org/apache/cordova/FileUploadResult.java
@@ -25,39 +25,39 @@ import org.json.JSONObject;
  * Encapsulates the result and/or status of uploading a file to a remote server.
  */
 public class FileUploadResult {
-    
+
     private long bytesSent = 0;         // bytes sent
     private int responseCode = -1;      // HTTP response code
     private String response = null;     // HTTP response
-       
+
     public long getBytesSent() {
         return bytesSent;
     }
-    
+
     public void setBytesSent(long bytes) {
         this.bytesSent = bytes;
     }
-    
+
     public int getResponseCode() {
         return responseCode;
     }
-    
+
     public void setResponseCode(int responseCode) {
         this.responseCode = responseCode;
     }
-    
+
     public String getResponse() {
         return response;
     }
-    
+
     public void setResponse(String response) {
         this.response = response;
     }
 
     public JSONObject toJSONObject() throws JSONException {
         return new JSONObject(
-                "{bytesSent:" + bytesSent + 
-                ",responseCode:" + responseCode + 
+                "{bytesSent:" + bytesSent +
+                ",responseCode:" + responseCode +
                 ",response:" + JSONObject.quote(response) + "}");
     }
 }
diff --git a/framework/src/org/apache/cordova/FileUtils.java b/framework/src/org/apache/cordova/FileUtils.java
index 32d36784..4d2b31e4 100755
--- a/framework/src/org/apache/cordova/FileUtils.java
+++ b/framework/src/org/apache/cordova/FileUtils.java
@@ -41,7 +41,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 
@@ -727,7 +726,7 @@ public class FileUtils extends Plugin {
         filePath = stripFileProtocol(filePath);
 
         if (filePath.equals(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + ctx.getPackageName() + "/cache") ||
-                filePath.equals(Environment.getExternalStorageDirectory().getAbsolutePath()) || 
+                filePath.equals(Environment.getExternalStorageDirectory().getAbsolutePath()) ||
                 filePath.equals("/data/data/" + ctx.getPackageName())) {
             return true;
         }
@@ -736,7 +735,7 @@ public class FileUtils extends Plugin {
 
     /**
      * This method removes the "file://" from the passed in filePath
-     * 
+     *
      * @param filePath to be checked.
      * @return
      */
@@ -746,10 +745,10 @@ public class FileUtils extends Plugin {
         }
         return filePath;
     }
-    
+
     /**
      * Create a File object from the passed in path
-     * 
+     *
      * @param filePath
      * @return
      */
@@ -840,7 +839,7 @@ public class FileUtils extends Plugin {
         else {
             throw new IOException("No filesystem of type requested");
         }
- 
+
         return fs;
     }
 
@@ -974,7 +973,7 @@ public class FileUtils extends Plugin {
     /**/
     public long write(String filename, String data, int offset) throws FileNotFoundException, IOException {
         filename = stripFileProtocol(filename);
-        
+
         boolean append = false;
         if (offset > 0) {
             this.truncateFile(filename, offset);
diff --git a/framework/src/org/apache/cordova/GPSListener.java b/framework/src/org/apache/cordova/GPSListener.java
index 2b46c7cf..daaf7eeb 100755
--- a/framework/src/org/apache/cordova/GPSListener.java
+++ b/framework/src/org/apache/cordova/GPSListener.java
@@ -26,25 +26,25 @@ import android.location.LocationManager;
  *
  */
 public class GPSListener extends CordovaLocationListener {
-	public GPSListener(LocationManager locationManager, GeoBroker m) {
-		super(locationManager, m, "[Cordova GPSListener]");
-	}
+    public GPSListener(LocationManager locationManager, GeoBroker m) {
+        super(locationManager, m, "[Cordova GPSListener]");
+    }
 
-	
-	/**
-	 * Start requesting location updates.
-	 * 
-	 * @param interval
-	 */
-	@Override
-	protected void start() {
-		if (!this.running) {
-			if (this.locationManager.getProvider(LocationManager.GPS_PROVIDER) != null) {
-				this.running = true;
-				this.locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 60000, 0, this);
-			} else {
-				this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "GPS provider is not available.");
-			}
-		}
-	}
+
+    /**
+     * Start requesting location updates.
+     *
+     * @param interval
+     */
+    @Override
+    protected void start() {
+        if (!this.running) {
+            if (this.locationManager.getProvider(LocationManager.GPS_PROVIDER) != null) {
+                this.running = true;
+                this.locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 60000, 0, this);
+            } else {
+                this.fail(CordovaLocationListener.POSITION_UNAVAILABLE, "GPS provider is not available.");
+            }
+        }
+    }
 }
diff --git a/framework/src/org/apache/cordova/GeoBroker.java b/framework/src/org/apache/cordova/GeoBroker.java
index 6a150b35..6f77845b 100755
--- a/framework/src/org/apache/cordova/GeoBroker.java
+++ b/framework/src/org/apache/cordova/GeoBroker.java
@@ -30,7 +30,7 @@ import android.location.LocationManager;
 
 /*
  * This class is the interface to the Geolocation.  It's bound to the geo object.
- * 
+ *
  * This class only starts and stops various GeoListeners, which consist of a GPS and a Network Listener
  */
 
@@ -38,7 +38,7 @@ public class GeoBroker extends Plugin {
     private GPSListener gpsListener;
     private NetworkListener networkListener;
     private LocationManager locationManager;
-	
+
     /**
      * Constructor.
      */
@@ -47,74 +47,74 @@ public class GeoBroker extends Plugin {
 
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action 		The action to execute.
      * @param args 			JSONArry of arguments for the plugin.
      * @param callbackId	The callback id used when calling back into JavaScript.
      * @return 				A PluginResult object with a status and message.
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
-    	if (this.locationManager == null) {
-        	this.locationManager = (LocationManager) this.ctx.getSystemService(Context.LOCATION_SERVICE);
-        	this.networkListener = new NetworkListener(this.locationManager, this);
-        	this.gpsListener = new GPSListener(this.locationManager, this);
-    	}
+        if (this.locationManager == null) {
+            this.locationManager = (LocationManager) this.ctx.getSystemService(Context.LOCATION_SERVICE);
+            this.networkListener = new NetworkListener(this.locationManager, this);
+            this.gpsListener = new GPSListener(this.locationManager, this);
+        }
         PluginResult.Status status = PluginResult.Status.NO_RESULT;
         String message = "";
         PluginResult result = new PluginResult(status, message);
         result.setKeepCallback(true);
-        
+
         try {
             if (action.equals("getLocation")) {
-            	boolean enableHighAccuracy = args.getBoolean(0);
-            	int maximumAge = args.getInt(1);
-            	Location last = this.locationManager.getLastKnownLocation((enableHighAccuracy ? LocationManager.GPS_PROVIDER : LocationManager.NETWORK_PROVIDER));
-            	// Check if we can use lastKnownLocation to get a quick reading and use less battery
-            	if ((System.currentTimeMillis() - last.getTime()) <= maximumAge) {
-            		result = new PluginResult(PluginResult.Status.OK, this.returnLocationJSON(last));
-            	} else {
-            		this.getCurrentLocation(callbackId, enableHighAccuracy);
-            	}
+                boolean enableHighAccuracy = args.getBoolean(0);
+                int maximumAge = args.getInt(1);
+                Location last = this.locationManager.getLastKnownLocation((enableHighAccuracy ? LocationManager.GPS_PROVIDER : LocationManager.NETWORK_PROVIDER));
+                // Check if we can use lastKnownLocation to get a quick reading and use less battery
+                if ((System.currentTimeMillis() - last.getTime()) <= maximumAge) {
+                    result = new PluginResult(PluginResult.Status.OK, this.returnLocationJSON(last));
+                } else {
+                    this.getCurrentLocation(callbackId, enableHighAccuracy);
+                }
             }
             else if (action.equals("addWatch")) {
-            	String id = args.getString(0);
-            	boolean enableHighAccuracy = args.getBoolean(1);
-            	this.addWatch(id, callbackId, enableHighAccuracy);
+                String id = args.getString(0);
+                boolean enableHighAccuracy = args.getBoolean(1);
+                this.addWatch(id, callbackId, enableHighAccuracy);
             }
             else if (action.equals("clearWatch")) {
-            	String id = args.getString(0);
-            	this.clearWatch(id);
+                String id = args.getString(0);
+                this.clearWatch(id);
             }
         } catch (JSONException e) {
-        	result = new PluginResult(PluginResult.Status.JSON_EXCEPTION, e.getMessage());
+            result = new PluginResult(PluginResult.Status.JSON_EXCEPTION, e.getMessage());
         }
         return result;
     }
 
     private void clearWatch(String id) {
-		this.gpsListener.clearWatch(id);
-		this.networkListener.clearWatch(id);
-	}
-
-	private void getCurrentLocation(String callbackId, boolean enableHighAccuracy) {
-		if (enableHighAccuracy) {
-			this.gpsListener.addCallback(callbackId);
-		} else {
-			this.networkListener.addCallback(callbackId);
-		}
-	}
-    
-    private void addWatch(String timerId, String callbackId, boolean enableHighAccuracy) {
-    	if (enableHighAccuracy) {
-    		this.gpsListener.addWatch(timerId, callbackId);
-    	} else {
-    		this.networkListener.addWatch(timerId, callbackId);
-    	}
+        this.gpsListener.clearWatch(id);
+        this.networkListener.clearWatch(id);
     }
 
-	/**
+    private void getCurrentLocation(String callbackId, boolean enableHighAccuracy) {
+        if (enableHighAccuracy) {
+            this.gpsListener.addCallback(callbackId);
+        } else {
+            this.networkListener.addCallback(callbackId);
+        }
+    }
+
+    private void addWatch(String timerId, String callbackId, boolean enableHighAccuracy) {
+        if (enableHighAccuracy) {
+            this.gpsListener.addWatch(timerId, callbackId);
+        } else {
+            this.networkListener.addWatch(timerId, callbackId);
+        }
+    }
+
+    /**
      * Identifies if action to be executed returns a value and should be run synchronously.
-     * 
+     *
      * @param action	The action to execute
      * @return			T=returns value
      */
@@ -122,65 +122,65 @@ public class GeoBroker extends Plugin {
         // Starting listeners is easier to run on main thread, so don't run async.
         return true;
     }
-    
+
     /**
      * Called when the activity is to be shut down.
      * Stop listener.
      */
     public void onDestroy() {
-    	this.networkListener.destroy();
-    	this.gpsListener.destroy();
+        this.networkListener.destroy();
+        this.gpsListener.destroy();
         this.networkListener = null;
         this.gpsListener = null;
     }
 
     public JSONObject returnLocationJSON(Location loc) {
-    	JSONObject o = new JSONObject();
-    	
-    	try {
-			o.put("latitude", loc.getLatitude());
-			o.put("longitude", loc.getLongitude());
-	    	o.put("altitude", (loc.hasAltitude() ? loc.getAltitude() : null));
-	  	  	o.put("accuracy", loc.getAccuracy());
-	  	  	o.put("heading", (loc.hasBearing() ? (loc.hasSpeed() ? loc.getBearing() : null) : null));
-	  	  	o.put("speed", loc.getSpeed()); 
-			o.put("timestamp", loc.getTime()); 
-		} catch (JSONException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-    	
-    	
-    	return o;
+        JSONObject o = new JSONObject();
+
+        try {
+            o.put("latitude", loc.getLatitude());
+            o.put("longitude", loc.getLongitude());
+            o.put("altitude", (loc.hasAltitude() ? loc.getAltitude() : null));
+                o.put("accuracy", loc.getAccuracy());
+                o.put("heading", (loc.hasBearing() ? (loc.hasSpeed() ? loc.getBearing() : null) : null));
+                o.put("speed", loc.getSpeed());
+            o.put("timestamp", loc.getTime());
+        } catch (JSONException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+
+        return o;
       }
       public void win(Location loc, String callbackId) {
-    	  PluginResult result = new PluginResult(PluginResult.Status.OK, this.returnLocationJSON(loc));
-    	  this.success(result, callbackId);
+          PluginResult result = new PluginResult(PluginResult.Status.OK, this.returnLocationJSON(loc));
+          this.success(result, callbackId);
       }
       /**
        * Location failed.  Send error back to JavaScript.
-       * 
+       *
        * @param code			The error code
        * @param msg			The error message
-       * @throws JSONException 
+       * @throws JSONException
        */
       public void fail(int code, String msg, String callbackId) {
-      	JSONObject obj = new JSONObject();
-      	String backup = null;
-      	try {
-  			obj.put("code", code);
-  			obj.put("message", msg);
-      	} catch (JSONException e) {
-  			obj = null;
-  			backup = "{'code':" + code + ",'message':'" + msg.replaceAll("'", "\'") + "'}";
-  		}
-      	PluginResult result;
-      	if (obj != null) {
-      		result = new PluginResult(PluginResult.Status.ERROR, obj);
-      	} else {
-      		result = new PluginResult(PluginResult.Status.ERROR, backup);
-      	}
-      	
-      	this.error(result, callbackId);
+          JSONObject obj = new JSONObject();
+          String backup = null;
+          try {
+              obj.put("code", code);
+              obj.put("message", msg);
+          } catch (JSONException e) {
+              obj = null;
+              backup = "{'code':" + code + ",'message':'" + msg.replaceAll("'", "\'") + "'}";
+          }
+          PluginResult result;
+          if (obj != null) {
+              result = new PluginResult(PluginResult.Status.ERROR, obj);
+          } else {
+              result = new PluginResult(PluginResult.Status.ERROR, backup);
+          }
+
+          this.error(result, callbackId);
       }
 }
diff --git a/framework/src/org/apache/cordova/HttpHandler.java b/framework/src/org/apache/cordova/HttpHandler.java
index f64b5fd2..3ced2def 100755
--- a/framework/src/org/apache/cordova/HttpHandler.java
+++ b/framework/src/org/apache/cordova/HttpHandler.java
@@ -29,52 +29,52 @@ import org.apache.http.impl.client.DefaultHttpClient;
 
 public class HttpHandler {
 
-	protected Boolean get(String url, String file)
-	{
-		HttpEntity entity = getHttpEntity(url);
-		try {
-			writeToDisk(entity, file);
-		} catch (Exception e) { e.printStackTrace(); return false; }
-		try {
-			entity.consumeContent();
-		} catch (Exception e) { e.printStackTrace(); return false; }
-		return true;
-	}
-	
-	private HttpEntity getHttpEntity(String url)
-	/**
-	 * get the http entity at a given url
-	 */
-	{
-		HttpEntity entity=null;
-		try {
-			DefaultHttpClient httpclient = new DefaultHttpClient();
-			HttpGet httpget = new HttpGet(url);
-			HttpResponse response = httpclient.execute(httpget);
-			entity = response.getEntity();
-		} catch (Exception e) { e.printStackTrace(); return null; }
-		return entity;
-	}
-	
-	private void writeToDisk(HttpEntity entity, String file) throws IllegalStateException, IOException
-	/**
-	 * writes a HTTP entity to the specified filename and location on disk
-	 */
-	{  
-		int i=0;
-		String FilePath="/sdcard/" + file;
-		InputStream in = entity.getContent();
-		byte buff[] = new byte[1024];    
-		FileOutputStream out=
-			new FileOutputStream(FilePath);
-		do {
-			int numread = in.read(buff);
-			if (numread <= 0)
-				break;
-			out.write(buff, 0, numread);
-			i++;
-		} while (true);
-		out.flush();
-		out.close();	
-	}
+    protected Boolean get(String url, String file)
+    {
+        HttpEntity entity = getHttpEntity(url);
+        try {
+            writeToDisk(entity, file);
+        } catch (Exception e) { e.printStackTrace(); return false; }
+        try {
+            entity.consumeContent();
+        } catch (Exception e) { e.printStackTrace(); return false; }
+        return true;
+    }
+
+    private HttpEntity getHttpEntity(String url)
+    /**
+     * get the http entity at a given url
+     */
+    {
+        HttpEntity entity=null;
+        try {
+            DefaultHttpClient httpclient = new DefaultHttpClient();
+            HttpGet httpget = new HttpGet(url);
+            HttpResponse response = httpclient.execute(httpget);
+            entity = response.getEntity();
+        } catch (Exception e) { e.printStackTrace(); return null; }
+        return entity;
+    }
+
+    private void writeToDisk(HttpEntity entity, String file) throws IllegalStateException, IOException
+    /**
+     * writes a HTTP entity to the specified filename and location on disk
+     */
+    {
+        int i=0;
+        String FilePath="/sdcard/" + file;
+        InputStream in = entity.getContent();
+        byte buff[] = new byte[1024];
+        FileOutputStream out=
+            new FileOutputStream(FilePath);
+        do {
+            int numread = in.read(buff);
+            if (numread <= 0)
+                break;
+            out.write(buff, 0, numread);
+            i++;
+        } while (true);
+        out.flush();
+        out.close();
+    }
 }
diff --git a/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java b/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
index a024b23b..c6d93532 100755
--- a/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
+++ b/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
@@ -20,7 +20,6 @@ package org.apache.cordova;
 import org.apache.cordova.api.LOG;
 
 import android.content.Context;
-import android.view.View.MeasureSpec;
 import android.widget.LinearLayout;
 
 /**
@@ -29,15 +28,15 @@ import android.widget.LinearLayout;
 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 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);     
+        super(context);
         screenWidth = width;
         screenHeight = height;
         app = (DroidGap) context;
@@ -45,18 +44,18 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
 
     @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 
+     * 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);       
-        
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
         LOG.v(TAG, "We are in our onMeasure method");
 
         // Get the current height of the visible part of the screen.
@@ -66,7 +65,7 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
         height = MeasureSpec.getSize(heightMeasureSpec);
         width = MeasureSpec.getSize(widthMeasureSpec);
         LOG.v(TAG, "Old Height = %d", oldHeight);
-        LOG.v(TAG, "Height = %d", height);             
+        LOG.v(TAG, "Height = %d", height);
         LOG.v(TAG, "Old Width = %d", oldWidth);
         LOG.v(TAG, "Width = %d", width);
 
@@ -83,13 +82,13 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
             screenWidth = tmp_var;
             LOG.v(TAG, "Orientation Change");
         }
-        // If the height as gotten bigger then we will assume the soft keyboard has 
+        // 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("cordova.fireDocumentEvent('hidekeyboard');");
-        } 
-        // If the height as gotten smaller then we will assume the soft keyboard has 
+        }
+        // If the height as gotten smaller then we will assume the soft keyboard has
         // been displayed.
         else if (height < oldHeight) {
             if(app != null)
diff --git a/framework/src/org/apache/cordova/NetworkListener.java b/framework/src/org/apache/cordova/NetworkListener.java
index 6eaa8ac1..7d192595 100755
--- a/framework/src/org/apache/cordova/NetworkListener.java
+++ b/framework/src/org/apache/cordova/NetworkListener.java
@@ -26,7 +26,7 @@ import android.location.LocationManager;
  *
  */
 public class NetworkListener extends CordovaLocationListener {
-	public NetworkListener(LocationManager locationManager, GeoBroker m) {
-		super(locationManager, m, "[Cordova NetworkListener]");
-	}
+    public NetworkListener(LocationManager locationManager, GeoBroker m) {
+        super(locationManager, m, "[Cordova NetworkListener]");
+    }
 }
diff --git a/framework/src/org/apache/cordova/NetworkManager.java b/framework/src/org/apache/cordova/NetworkManager.java
index 058757f3..8b50869f 100755
--- a/framework/src/org/apache/cordova/NetworkManager.java
+++ b/framework/src/org/apache/cordova/NetworkManager.java
@@ -33,7 +33,7 @@ import android.net.NetworkInfo;
 import android.util.Log;
 
 public class NetworkManager extends Plugin {
-    
+
     public static int NOT_REACHABLE = 0;
     public static int REACHABLE_VIA_CARRIER_DATA_NETWORK = 1;
     public static int REACHABLE_VIA_WIFI_NETWORK = 2;
@@ -66,14 +66,14 @@ public class NetworkManager extends Plugin {
     public static final String TYPE_3G = "3g";
     public static final String TYPE_4G = "4g";
     public static final String TYPE_NONE = "none";
-    
+
     private static final String LOG_TAG = "NetworkManager";
 
     private String connectionCallbackId;
 
     ConnectivityManager sockMan;
     BroadcastReceiver receiver;
-    
+
     /**
      * Constructor.
      */
@@ -84,14 +84,14 @@ public class NetworkManager extends Plugin {
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
+     *
      * @param ctx The context of the main Activity.
      */
     public void setContext(CordovaInterface ctx) {
         super.setContext(ctx);
         this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
         this.connectionCallbackId = null;
-        
+
         // We need to listen to connectivity events to update navigator.connection
         IntentFilter intentFilter = new IntentFilter() ;
         intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
@@ -99,17 +99,17 @@ public class NetworkManager extends Plugin {
             this.receiver = new BroadcastReceiver() {
                 @Override
                 public void onReceive(Context context, Intent intent) {
-                    updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));                
+                    updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));
                 }
             };
             ctx.registerReceiver(this.receiver, intentFilter);
         }
 
     }
-    
+
     /**
      * Executes the request and returns PluginResult.
-     * 
+     *
      * @param action         The action to execute.
      * @param args             JSONArry of arguments for the plugin.
      * @param callbackId    The callback id used when calling back into JavaScript.
@@ -118,7 +118,7 @@ public class NetworkManager extends Plugin {
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
         String result = "Unsupported Operation: " + action;
-        
+
         if (action.equals("getConnectionInfo")) {
             this.connectionCallbackId = callbackId;
             NetworkInfo info = sockMan.getActiveNetworkInfo();
@@ -126,20 +126,20 @@ public class NetworkManager extends Plugin {
             pluginResult.setKeepCallback(true);
             return pluginResult;
         }
-        
+
         return new PluginResult(status, result);
     }
 
     /**
      * Identifies if action to be executed returns a value and should be run synchronously.
-     * 
+     *
      * @param action    The action to execute
      * @return            T=returns value
      */
     public boolean isSynch(String action) {
         return true;
     }
-    
+
     /**
      * Stop network receiver.
      */
@@ -160,18 +160,18 @@ public class NetworkManager extends Plugin {
 
     /**
      * Updates the JavaScript side whenever the connection changes
-     * 
+     *
      * @param info the current active network info
      * @return
      */
-    private void updateConnectionInfo(NetworkInfo info) {     
+    private void updateConnectionInfo(NetworkInfo info) {
         // send update to javascript "navigator.network.connection"
         sendUpdate(this.getConnectionInfo(info));
     }
 
-    /** 
+    /**
      * Get the latest network connection information
-     * 
+     *
      * @param info the current active network info
      * @return a JSONObject that represents the network info
      */
@@ -188,24 +188,24 @@ public class NetworkManager extends Plugin {
         }
         return type;
     }
-    
+
     /**
      * Create a new plugin result and send it back to JavaScript
-     * 
+     *
      * @param connection the network info to set as navigator.connection
      */
     private void sendUpdate(String type) {
         PluginResult result = new PluginResult(PluginResult.Status.OK, type);
         result.setKeepCallback(true);
         this.success(result, this.connectionCallbackId);
-        
+
         // Send to all plugins
         this.ctx.postMessage("networkconnection", type);
     }
-    
+
     /**
      * Determine the type of connection
-     * 
+     *
      * @param info the network info so we can determine connection type.
      * @return the type of mobile network we are on
      */
@@ -218,12 +218,12 @@ public class NetworkManager extends Plugin {
             }
             else if (type.toLowerCase().equals(MOBILE)) {
                 type = info.getSubtypeName();
-                if (type.toLowerCase().equals(GSM) || 
+                if (type.toLowerCase().equals(GSM) ||
                         type.toLowerCase().equals(GPRS) ||
                         type.toLowerCase().equals(EDGE)) {
                     return TYPE_2G;
                 }
-                else if (type.toLowerCase().startsWith(CDMA) || 
+                else if (type.toLowerCase().startsWith(CDMA) ||
                         type.toLowerCase().equals(UMTS)  ||
                         type.toLowerCase().equals(ONEXRTT) ||
                         type.toLowerCase().equals(EHRPD) ||
@@ -232,13 +232,13 @@ public class NetworkManager extends Plugin {
                         type.toLowerCase().equals(HSPA)) {
                     return TYPE_3G;
                 }
-                else if (type.toLowerCase().equals(LTE) || 
+                else if (type.toLowerCase().equals(LTE) ||
                         type.toLowerCase().equals(UMB) ||
                         type.toLowerCase().equals(HSPA_PLUS)) {
                     return TYPE_4G;
                 }
             }
-        } 
+        }
         else {
             return TYPE_NONE;
         }
diff --git a/framework/src/org/apache/cordova/Notification.java b/framework/src/org/apache/cordova/Notification.java
index b5834c3e..4c5b9298 100755
--- a/framework/src/org/apache/cordova/Notification.java
+++ b/framework/src/org/apache/cordova/Notification.java
@@ -36,11 +36,11 @@ import android.os.Vibrator;
  * This class provides access to notifications on the device.
  */
 public class Notification extends Plugin {
-  
+
   public int confirmResult = -1;
   public ProgressDialog spinnerDialog = null;
-  public ProgressDialog progressDialog = null;  
-  
+  public ProgressDialog progressDialog = null;
+
   /**
    * Constructor.
    */
@@ -49,7 +49,7 @@ public class Notification extends Plugin {
 
   /**
    * Executes the request and returns PluginResult.
-   * 
+   *
    * @param action    The action to execute.
    * @param args      JSONArry of arguments for the plugin.
    * @param callbackId  The callback id used when calling back into JavaScript.
@@ -57,8 +57,8 @@ public class Notification extends Plugin {
    */
   public PluginResult execute(String action, JSONArray args, String callbackId) {
     PluginResult.Status status = PluginResult.Status.OK;
-    String result = "";   
-    
+    String result = "";
+
     try {
       if (action.equals("beep")) {
         this.beep(args.getLong(0));
@@ -101,7 +101,7 @@ public class Notification extends Plugin {
 
   /**
    * Identifies if action to be executed returns a value and should be run synchronously.
-   * 
+   *
    * @param action  The action to execute
    * @return      T=returns value
    */
@@ -138,13 +138,13 @@ public class Notification extends Plugin {
 
   /**
    * Beep plays the default notification ringtone.
-   * 
+   *
    * @param count     Number of times to play notification
    */
   public void beep(long count) {
     Uri ringtone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
     Ringtone notification = RingtoneManager.getRingtone(this.ctx.getContext(), ringtone);
-    
+
     // If phone is not set to silent mode
     if (notification != null) {
       for (long i = 0; i < count; ++i) {
@@ -160,10 +160,10 @@ public class Notification extends Plugin {
       }
     }
   }
-  
+
   /**
    * Vibrates the device for the specified amount of time.
-   * 
+   *
    * @param time      Time to vibrate in ms.
    */
   public void vibrate(long time){
@@ -174,22 +174,22 @@ public class Notification extends Plugin {
         Vibrator vibrator = (Vibrator) this.ctx.getSystemService(Context.VIBRATOR_SERVICE);
         vibrator.vibrate(time);
   }
-  
+
   /**
    * Builds and shows a native Android alert with given Strings
    * @param message     The message the alert should display
    * @param title     The title of the alert
-   * @param buttonLabel   The label of the button 
+   * @param buttonLabel   The label of the button
    * @param callbackId  The callback id
    */
   public synchronized void alert(final String message, final String title, final String buttonLabel, final String callbackId) {
 
     final CordovaInterface ctx = this.ctx;
     final Notification notification = this;
-    
+
     Runnable runnable = new Runnable() {
       public void run() {
-    
+
         AlertDialog.Builder dlg = new AlertDialog.Builder(ctx.getContext());
         dlg.setMessage(message);
         dlg.setTitle(title);
@@ -212,7 +212,7 @@ public class Notification extends Plugin {
    * Builds and shows a native Android confirm dialog with given title, message, buttons.
    * This dialog only shows up to 3 buttons.  Any labels after that will be ignored.
    * The index of the button pressed will be returned to the JavaScript callback identified by callbackId.
-   * 
+   *
    * @param message     The message the dialog should display
    * @param title     The title of the dialog
    * @param buttonLabels  A comma separated list of button labels (Up to 3 buttons)
@@ -244,7 +244,7 @@ public class Notification extends Plugin {
 
         // Second button
         if (fButtons.length > 1) {
-          dlg.setNeutralButton(fButtons[1], 
+          dlg.setNeutralButton(fButtons[1],
               new AlertDialog.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
               dialog.dismiss();
@@ -274,7 +274,7 @@ public class Notification extends Plugin {
 
   /**
    * Show the spinner.
-   * 
+   *
    * @param title     Title of the dialog
    * @param message   The message of the dialog
    */
@@ -287,8 +287,8 @@ public class Notification extends Plugin {
     final CordovaInterface ctx = this.ctx;
     Runnable runnable = new Runnable() {
       public void run() {
-        notification.spinnerDialog = ProgressDialog.show(ctx.getContext(), title , message, true, true, 
-          new DialogInterface.OnCancelListener() { 
+        notification.spinnerDialog = ProgressDialog.show(ctx.getContext(), title , message, true, true,
+          new DialogInterface.OnCancelListener() {
             public void onCancel(DialogInterface dialog) {
               notification.spinnerDialog = null;
             }
@@ -297,7 +297,7 @@ public class Notification extends Plugin {
       };
     this.ctx.runOnUiThread(runnable);
   }
-  
+
   /**
    * Stop spinner.
    */
@@ -310,7 +310,7 @@ public class Notification extends Plugin {
 
   /**
    * Show the progress dialog.
-   * 
+   *
    * @param title     Title of the dialog
    * @param message   The message of the dialog
    */
@@ -331,7 +331,7 @@ public class Notification extends Plugin {
         notification.progressDialog.setMax(100);
         notification.progressDialog.setProgress(0);
         notification.progressDialog.setOnCancelListener(
-          new DialogInterface.OnCancelListener() { 
+          new DialogInterface.OnCancelListener() {
             public void onCancel(DialogInterface dialog) {
               notification.progressDialog = null;
             }
@@ -341,18 +341,18 @@ public class Notification extends Plugin {
     };
     this.ctx.runOnUiThread(runnable);
   }
-  
+
   /**
    * Set value of progress bar.
-   * 
+   *
    * @param value     0-100
    */
   public synchronized void progressValue(int value) {
     if (this.progressDialog != null) {
       this.progressDialog.setProgress(value);
-    }   
+    }
   }
-  
+
   /**
    * Stop progress dialog.
    */
diff --git a/framework/src/org/apache/cordova/StandAlone.java b/framework/src/org/apache/cordova/StandAlone.java
index d41771d7..a199dda8 100644
--- a/framework/src/org/apache/cordova/StandAlone.java
+++ b/framework/src/org/apache/cordova/StandAlone.java
@@ -18,18 +18,15 @@
 */
 package org.apache.cordova;
 
-import java.lang.reflect.Field;
-
-import android.app.Activity;
 import android.os.Bundle;
 
 public class StandAlone extends DroidGap {
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
-        super.loadUrl("file:///android_asset/www/index.html");                        
-    }		
-	
+
+        super.loadUrl("file:///android_asset/www/index.html");
+    }
+
 }
diff --git a/framework/src/org/apache/cordova/Storage.java b/framework/src/org/apache/cordova/Storage.java
index 8cc29b7d..18fbcaff 100755
--- a/framework/src/org/apache/cordova/Storage.java
+++ b/framework/src/org/apache/cordova/Storage.java
@@ -31,209 +31,209 @@ import android.database.Cursor;
 import android.database.sqlite.*;
 
 /**
- * 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 
+ * 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 {
 
-	// Data Definition Language
-	private static final String ALTER = "alter";
-	private static final String CREATE = "create";
-	private static final String DROP = "drop";
-	private static final String TRUNCATE = "truncate";
-	
-	SQLiteDatabase myDb = null; // Database object
-	String path = null; // Database path
-	String dbName = null; // Database name
+    // Data Definition Language
+    private static final String ALTER = "alter";
+    private static final String CREATE = "create";
+    private static final String DROP = "drop";
+    private static final String TRUNCATE = "truncate";
 
-	/**
-	 * Constructor.
-	 */
-	public Storage() {
-	}
+    SQLiteDatabase myDb = null; // Database object
+    String path = null; // Database path
+    String dbName = null; // Database name
 
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action
-	 *            The action to execute.
-	 * @param args
-	 *            JSONArry of arguments for the plugin.
-	 * @param callbackId
-	 *            The callback id used when calling back into JavaScript.
-	 * @return A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";
+    /**
+     * Constructor.
+     */
+    public Storage() {
+    }
 
-		try {
-			if (action.equals("openDatabase")) {
-				this.openDatabase(args.getString(0), args.getString(1),
-						args.getString(2), args.getLong(3));
-			} else if (action.equals("executeSql")) {
-				String[] s = null;
-				if (args.isNull(1)) {
-					s = new String[0];
-				} else {
-					JSONArray a = args.getJSONArray(1);
-					int len = a.length();
-					s = new String[len];
-					for (int i = 0; i < len; i++) {
-						s[i] = a.getString(i);
-					}
-				}
-				this.executeSql(args.getString(0), s, args.getString(2));
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
+    /**
+     * Executes the request and returns PluginResult.
+     *
+     * @param action
+     *            The action to execute.
+     * @param args
+     *            JSONArry of arguments for the plugin.
+     * @param callbackId
+     *            The callback id used when calling back into JavaScript.
+     * @return A PluginResult object with a status and message.
+     */
+    public PluginResult execute(String action, JSONArray args, String callbackId) {
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";
 
-	/**
-	 * Identifies if action to be executed returns a value and should be run
-	 * synchronously.
-	 * 
-	 * @param action
-	 *            The action to execute
-	 * @return T=returns value
-	 */
-	public boolean isSynch(String action) {
-		return true;
-	}
+        try {
+            if (action.equals("openDatabase")) {
+                this.openDatabase(args.getString(0), args.getString(1),
+                        args.getString(2), args.getLong(3));
+            } else if (action.equals("executeSql")) {
+                String[] s = null;
+                if (args.isNull(1)) {
+                    s = new String[0];
+                } else {
+                    JSONArray a = args.getJSONArray(1);
+                    int len = a.length();
+                    s = new String[len];
+                    for (int i = 0; i < len; i++) {
+                        s[i] = a.getString(i);
+                    }
+                }
+                this.executeSql(args.getString(0), s, args.getString(2));
+            }
+            return new PluginResult(status, result);
+        } catch (JSONException e) {
+            return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+        }
+    }
 
-	/**
-	 * Clean up and close database.
-	 */
-	@Override
-	public void onDestroy() {
-		if (this.myDb != null) {
-			this.myDb.close();
-			this.myDb = null;
-		}
-	}
+    /**
+     * Identifies if action to be executed returns a value and should be run
+     * synchronously.
+     *
+     * @param action
+     *            The action to execute
+     * @return T=returns value
+     */
+    public boolean isSynch(String action) {
+        return true;
+    }
 
-	// --------------------------------------------------------------------------
-	// LOCAL METHODS
-	// --------------------------------------------------------------------------
+    /**
+     * Clean up and close database.
+     */
+    @Override
+    public void onDestroy() {
+        if (this.myDb != null) {
+            this.myDb.close();
+            this.myDb = null;
+        }
+    }
 
-	/**
-	 * Open database.
-	 * 
-	 * @param db
-	 *            The name of the database
-	 * @param version
-	 *            The version
-	 * @param display_name
-	 *            The display name
-	 * @param size
-	 *            The size in bytes
-	 */
-	public void openDatabase(String db, String version, String display_name,
-			long size) {
+    // --------------------------------------------------------------------------
+    // LOCAL METHODS
+    // --------------------------------------------------------------------------
 
-		// If database is open, then close it
-		if (this.myDb != null) {
-			this.myDb.close();
-		}
+    /**
+     * Open database.
+     *
+     * @param db
+     *            The name of the database
+     * @param version
+     *            The version
+     * @param display_name
+     *            The display name
+     * @param size
+     *            The size in bytes
+     */
+    public void openDatabase(String db, String version, String display_name,
+            long size) {
 
-		// If no database path, generate from application package
-		if (this.path == null) {
-			this.path = this.ctx.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
-		}
+        // If database is open, then close it
+        if (this.myDb != null) {
+            this.myDb.close();
+        }
 
-		this.dbName = this.path + File.pathSeparator + db + ".db";
-		this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
-	}
+        // If no database path, generate from application package
+        if (this.path == null) {
+            this.path = this.ctx.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
+        }
 
-	/**
-	 * Execute SQL statement.
-	 * 
-	 * @param query
-	 *            The SQL query
-	 * @param params
-	 *            Parameters for the query
-	 * @param tx_id
-	 *            Transaction id
-	 */
-	public void executeSql(String query, String[] params, String tx_id) {
-		try {
-			if (isDDL(query)) {
-				this.myDb.execSQL(query);
-				this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', '');");
-			} 
-			else {
-				Cursor myCursor = this.myDb.rawQuery(query, params);
-				this.processResults(myCursor, tx_id);
-				myCursor.close();
-			}
-		} 
-		catch (SQLiteException ex) {
-			ex.printStackTrace();
-			System.out.println("Storage.executeSql(): Error=" +  ex.getMessage());
-			
-			// Send error message back to JavaScript
-			this.sendJavascript("cordova.require('cordova/plugin/android/storage').failQuery('" + ex.getMessage() + "','" + tx_id + "');");
-		}
-	}
+        this.dbName = this.path + File.pathSeparator + db + ".db";
+        this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
+    }
 
-	/**
-	 * Checks to see the the query is a Data Definintion command
-	 * 
-	 * @param query to be executed
-	 * @return true if it is a DDL command, false otherwise
-	 */
-	private boolean isDDL(String query) {
-		String cmd = query.toLowerCase();
-		if (cmd.startsWith(DROP) || cmd.startsWith(CREATE) || cmd.startsWith(ALTER) || cmd.startsWith(TRUNCATE)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Execute SQL statement.
+     *
+     * @param query
+     *            The SQL query
+     * @param params
+     *            Parameters for the query
+     * @param tx_id
+     *            Transaction id
+     */
+    public void executeSql(String query, String[] params, String tx_id) {
+        try {
+            if (isDDL(query)) {
+                this.myDb.execSQL(query);
+                this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', '');");
+            }
+            else {
+                Cursor myCursor = this.myDb.rawQuery(query, params);
+                this.processResults(myCursor, tx_id);
+                myCursor.close();
+            }
+        }
+        catch (SQLiteException ex) {
+            ex.printStackTrace();
+            System.out.println("Storage.executeSql(): Error=" +  ex.getMessage());
 
-	/**
-	 * Process query results.
-	 * 
-	 * @param cur
-	 *            Cursor into query results
-	 * @param tx_id
-	 *            Transaction id
-	 */
-	public void processResults(Cursor cur, String tx_id) {
+            // Send error message back to JavaScript
+            this.sendJavascript("cordova.require('cordova/plugin/android/storage').failQuery('" + ex.getMessage() + "','" + tx_id + "');");
+        }
+    }
 
-		String result = "[]";
-		// If query result has rows
+    /**
+     * Checks to see the the query is a Data Definintion command
+     *
+     * @param query to be executed
+     * @return true if it is a DDL command, false otherwise
+     */
+    private boolean isDDL(String query) {
+        String cmd = query.toLowerCase();
+        if (cmd.startsWith(DROP) || cmd.startsWith(CREATE) || cmd.startsWith(ALTER) || cmd.startsWith(TRUNCATE)) {
+            return true;
+        }
+        return false;
+    }
 
-		if (cur.moveToFirst()) {
-			JSONArray fullresult = new JSONArray();
-			String key = "";
-			String value = "";
-			int colCount = cur.getColumnCount();
+    /**
+     * Process query results.
+     *
+     * @param cur
+     *            Cursor into query results
+     * @param tx_id
+     *            Transaction id
+     */
+    public void processResults(Cursor cur, String tx_id) {
 
-			// Build up JSON result object for each row
-			do {
-				JSONObject row = new JSONObject();
-				try {
-					for (int i = 0; i < colCount; ++i) {
-						key = cur.getColumnName(i);
-						value = cur.getString(i);
-						row.put(key, value);
-					}
-					fullresult.put(row);
+        String result = "[]";
+        // If query result has rows
 
-				} catch (JSONException e) {
-					e.printStackTrace();
-				}
+        if (cur.moveToFirst()) {
+            JSONArray fullresult = new JSONArray();
+            String key = "";
+            String value = "";
+            int colCount = cur.getColumnCount();
 
-			} while (cur.moveToNext());
+            // Build up JSON result object for each row
+            do {
+                JSONObject row = new JSONObject();
+                try {
+                    for (int i = 0; i < colCount; ++i) {
+                        key = cur.getColumnName(i);
+                        value = cur.getString(i);
+                        row.put(key, value);
+                    }
+                    fullresult.put(row);
 
-			result = fullresult.toString();
-		}
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
 
-		// Let JavaScript know that there are no more rows
-		this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', " + result + ");");
-	}
+            } while (cur.moveToNext());
+
+            result = fullresult.toString();
+        }
+
+        // Let JavaScript know that there are no more rows
+        this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', " + result + ");");
+    }
 
 }
diff --git a/framework/src/org/apache/cordova/TempListener.java b/framework/src/org/apache/cordova/TempListener.java
index 93a5f821..f878256b 100755
--- a/framework/src/org/apache/cordova/TempListener.java
+++ b/framework/src/org/apache/cordova/TempListener.java
@@ -33,80 +33,80 @@ import android.hardware.SensorManager;
 import android.content.Context;
 
 public class TempListener extends Plugin implements SensorEventListener {
-	
-    Sensor mSensor;	
-	private SensorManager sensorManager;
-	
-	/**
-	 * Constructor.
-	 */
-	public TempListener() {
-	}
 
-	/**
-	 * Sets the context of the Command. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(CordovaInterface ctx) {
-		super.setContext(ctx);
+    Sensor mSensor;
+    private SensorManager sensorManager;
+
+    /**
+     * Constructor.
+     */
+    public TempListener() {
+    }
+
+    /**
+     * Sets the context of the Command. This can then be used to do things like
+     * get file paths associated with the Activity.
+     *
+     * @param ctx The context of the main Activity.
+     */
+    public void setContext(CordovaInterface ctx) {
+        super.setContext(ctx);
         this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
-	}
+    }
+
+    /**
+     * Executes the request and returns PluginResult.
+     *
+     * @param action 		The action to execute.
+     * @param args 			JSONArry of arguments for the plugin.
+     * @param callbackId	The callback id used when calling back into JavaScript.
+     * @return 				A PluginResult object with a status and message.
+     */
+    public PluginResult execute(String action, JSONArray args, String callbackId) {
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";
+
+        if (action.equals("start")) {
+            this.start();
+        }
+        else if (action.equals("stop")) {
+            this.stop();
+        }
+        return new PluginResult(status, result);
+    }
 
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		if (action.equals("start")) {
-			this.start();
-		}
-		else if (action.equals("stop")) {
-			this.stop();
-		}
-		return new PluginResult(status, result);
-	}
-    
     /**
      * Called by AccelBroker when listener is to be shut down.
      * Stop listener.
      */
     public void onDestroy() {
-    	this.stop();    	
+        this.stop();
     }
 
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
 
-	public void start()	{
-		List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_TEMPERATURE);
-		if (list.size() > 0) {
-			this.mSensor = list.get(0);
-			this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_NORMAL);
-		}
-	}
-	
-	public void stop() {
-		this.sensorManager.unregisterListener(this);
-	}
-	
-	public void onAccuracyChanged(Sensor sensor, int accuracy) {
-		// TODO Auto-generated method stub
-	}
+    public void start()	{
+        List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_TEMPERATURE);
+        if (list.size() > 0) {
+            this.mSensor = list.get(0);
+            this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        }
+    }
 
-	public void onSensorChanged(SensorEvent event) {
-		// We want to know what temp this is.
-		float temp = event.values[0];
-		this.sendJavascript("gotTemp(" + temp + ");");
-	}
+    public void stop() {
+        this.sensorManager.unregisterListener(this);
+    }
+
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO Auto-generated method stub
+    }
+
+    public void onSensorChanged(SensorEvent event) {
+        // We want to know what temp this is.
+        float temp = event.values[0];
+        this.sendJavascript("gotTemp(" + temp + ");");
+    }
 
 }
diff --git a/framework/src/org/apache/cordova/api/CordovaInterface.java b/framework/src/org/apache/cordova/api/CordovaInterface.java
index 79dbe74e..ad5e065d 100755
--- a/framework/src/org/apache/cordova/api/CordovaInterface.java
+++ b/framework/src/org/apache/cordova/api/CordovaInterface.java
@@ -20,8 +20,6 @@ package org.apache.cordova.api;
 
 import java.util.HashMap;
 
-import android.app.Activity;
-import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -30,7 +28,6 @@ import android.content.IntentFilter;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.hardware.SensorManager;
 import android.net.Uri;
 
 
@@ -43,62 +40,62 @@ public interface CordovaInterface {
     /**
      * @deprecated
      * Add services to res/xml/plugins.xml instead.
-     * 
+     *
      * Add a class that implements a service.
-     * 
+     *
      * @param serviceType
      * @param className
      */
     @Deprecated
     abstract public void addService(String serviceType, String className);
-    
+
     /**
      * Send JavaScript statement back to JavaScript.
-     * 
+     *
      * @param message
      */
     abstract public void sendJavascript(String statement);
 
     /**
-     * Launch an activity for which you would like a result when it finished. When this activity exits, 
+     * Launch an activity for which you would like a result when it finished. When this activity exits,
      * your onActivityResult() method will be called.
-     *  
+     *
      * @param command			The command object
      * @param intent			The intent to start
      * @param requestCode		The request code that is passed to callback to identify the activity
      */
     abstract public void startActivityForResult(IPlugin command, Intent intent, int requestCode);
-    
+
     /**
-     * Launch an activity for which you would not like a result when it finished. 
-     *  
+     * Launch an activity for which you would not like a result when it finished.
+     *
      * @param intent            The intent to start
      */
     abstract public void startActivity(Intent intent);
-    
+
     /**
      * Set the plugin to be called when a sub-activity exits.
-     * 
+     *
      * @param plugin			The plugin on which onActivityResult is to be called
      */
     abstract public void setActivityResultCallback(IPlugin plugin);
 
     /**
      * Load the specified URL in the Cordova webview.
-     * 
+     *
      * @param url				The URL to load.
      */
     abstract public void loadUrl(String url);
-    
+
     /**
-     * Send a message to all plugins. 
-     * 
+     * Send a message to all plugins.
+     *
      * @param id            The message id
      * @param data          The message data
      */
     abstract public void postMessage(String id, Object data);
-    
-    
+
+
     public abstract Resources getResources();
 
     public abstract String getPackageName();
@@ -106,7 +103,7 @@ public interface CordovaInterface {
     public abstract Object getSystemService(String service);
 
     public abstract Context getContext();
-    
+
     public abstract Context getBaseContext();
 
     public abstract Intent registerReceiver(BroadcastReceiver receiver,
@@ -118,7 +115,7 @@ public interface CordovaInterface {
 
     public abstract Cursor managedQuery(Uri uri, String[] projection, String selection,
         String[] selectionArgs, String sortOrder);
-    
+
     public abstract void runOnUiThread(Runnable runnable);
 
     public abstract AssetManager getAssets();
@@ -143,5 +140,5 @@ public interface CordovaInterface {
     public abstract Context getApplicationContext();
 
     public abstract boolean isUrlWhiteListed(String source);
- 
+
 }
diff --git a/framework/src/org/apache/cordova/api/IPlugin.java b/framework/src/org/apache/cordova/api/IPlugin.java
index 44349ee0..c23cc3a7 100755
--- a/framework/src/org/apache/cordova/api/IPlugin.java
+++ b/framework/src/org/apache/cordova/api/IPlugin.java
@@ -28,68 +28,68 @@ import android.webkit.WebView;
  * The execute method is called by the PluginManager.
  */
 public interface IPlugin {
-		
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	PluginResult execute(String action, JSONArray args, String callbackId);
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action);
-
-	/**
-	 * Sets the context of the Plugin. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	void setContext(CordovaInterface ctx);
-
-	/**
-	 * Sets the main View of the application, this is the WebView within which 
-	 * a Cordova app runs.
-	 * 
-	 * @param webView The Cordova WebView
-	 */
-	void setView(WebView webView);
 
     /**
-     * Called when the system is about to start resuming a previous activity. 
-     * 
+     * Executes the request and returns PluginResult.
+     *
+     * @param action 		The action to execute.
+     * @param args 			JSONArry of arguments for the plugin.
+     * @param callbackId	The callback id used when calling back into JavaScript.
+     * @return 				A PluginResult object with a status and message.
+     */
+    PluginResult execute(String action, JSONArray args, String callbackId);
+
+    /**
+     * Identifies if action to be executed returns a value and should be run synchronously.
+     *
+     * @param action	The action to execute
+     * @return			T=returns value
+     */
+    public boolean isSynch(String action);
+
+    /**
+     * Sets the context of the Plugin. This can then be used to do things like
+     * get file paths associated with the Activity.
+     *
+     * @param ctx The context of the main Activity.
+     */
+    void setContext(CordovaInterface ctx);
+
+    /**
+     * Sets the main View of the application, this is the WebView within which
+     * a Cordova app runs.
+     *
+     * @param webView The Cordova WebView
+     */
+    void setView(WebView webView);
+
+    /**
+     * Called when the system is about to start resuming a previous activity.
+     *
      * @param multitasking		Flag indicating if multitasking is turned on for app
      */
     void onPause(boolean multitasking);
 
     /**
-     * Called when the activity will start interacting with the user. 
-     * 
+     * Called when the activity will start interacting with the user.
+     *
      * @param multitasking		Flag indicating if multitasking is turned on for app
      */
     void onResume(boolean multitasking);
-    
+
     /**
-     * Called when the activity receives a new intent. 
+     * Called when the activity receives a new intent.
      */
     void onNewIntent(Intent intent);
 
     /**
-     * The final call you receive before your activity is destroyed. 
+     * The final call you receive before your activity is destroyed.
      */
     void onDestroy();
-	
+
     /**
-     * Called when a message is sent to plugin. 
-     * 
+     * Called when a message is sent to plugin.
+     *
      * @param id            The message id
      * @param data          The message data
      */
@@ -97,9 +97,9 @@ public interface IPlugin {
 
     /**
      * Called when an activity you launched exits, giving you the requestCode you started it with,
-     * the resultCode it returned, and any additional data from it. 
-     * 
-     * @param requestCode		The request code originally supplied to startActivityForResult(), 
+     * the resultCode it returned, and any additional data from it.
+     *
+     * @param requestCode		The request code originally supplied to startActivityForResult(),
      * 							allowing you to identify who this result came from.
      * @param resultCode		The integer result code returned by the child activity through its setResult().
      * @param data				An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
@@ -108,7 +108,7 @@ public interface IPlugin {
 
     /**
      * By specifying a <url-filter> in plugins.xml you can map a URL (using startsWith atm) to this method.
-     * 
+     *
      * @param url				The URL that is trying to be loaded in the Cordova webview.
      * @return					Return true to prevent the URL from loading. Default is false.
      */
diff --git a/framework/src/org/apache/cordova/api/LOG.java b/framework/src/org/apache/cordova/api/LOG.java
index 4e3956b3..91f035b9 100755
--- a/framework/src/org/apache/cordova/api/LOG.java
+++ b/framework/src/org/apache/cordova/api/LOG.java
@@ -22,12 +22,12 @@ import android.util.Log;
 
 /**
  * Log to Android logging system.
- * 
+ *
  * Log message can be a string or a printf formatted string with arguments.
  * See http://developer.android.com/reference/java/util/Formatter.html
  */
 public class LOG {
-    
+
     public static final int VERBOSE = Log.VERBOSE;
     public static final int DEBUG = Log.DEBUG;
     public static final int INFO = Log.INFO;
@@ -36,20 +36,20 @@ public class LOG {
 
     // Current log level
     public static int LOGLEVEL = Log.ERROR;
-    
+
     /**
      * Set the current log level.
-     * 
+     *
      * @param logLevel
      */
     public static void setLogLevel(int logLevel) {
         LOGLEVEL = logLevel;
         Log.i("CordovaLog", "Changing log level to " + logLevel);
     }
-    
+
     /**
      * Set the current log level.
-     * 
+     *
      * @param logLevel
      */
     public static void setLogLevel(String logLevel) {
@@ -63,7 +63,7 @@ public class LOG {
 
     /**
      * Determine if log level will be logged
-     * 
+     *
      * @param logLevel
      * @return
      */
@@ -73,7 +73,7 @@ public class LOG {
 
     /**
      * Verbose log message.
-     * 
+     *
      * @param tag
      * @param s
      */
@@ -83,17 +83,17 @@ public class LOG {
 
     /**
      * Debug log message.
-     * 
+     *
      * @param tag
      * @param s
      */
     public static void d(String tag, String s) {
         if (LOG.DEBUG >= LOGLEVEL) Log.d(tag, s);
     }
-    
+
     /**
      * Info log message.
-     * 
+     *
      * @param tag
      * @param s
      */
@@ -103,7 +103,7 @@ public class LOG {
 
     /**
      * Warning log message.
-     * 
+     *
      * @param tag
      * @param s
      */
@@ -113,7 +113,7 @@ public class LOG {
 
     /**
      * Error log message.
-     * 
+     *
      * @param tag
      * @param s
      */
@@ -123,7 +123,7 @@ public class LOG {
 
     /**
      * Verbose log message.
-     * 
+     *
      * @param tag
      * @param s
      * @param e
@@ -134,7 +134,7 @@ public class LOG {
 
     /**
      * Debug log message.
-     * 
+     *
      * @param tag
      * @param s
      * @param e
@@ -142,10 +142,10 @@ public class LOG {
     public static void d(String tag, String s, Throwable e) {
         if (LOG.DEBUG >= LOGLEVEL) Log.d(tag, s, e);
     }
-    
+
     /**
      * Info log message.
-     * 
+     *
      * @param tag
      * @param s
      * @param e
@@ -156,7 +156,7 @@ public class LOG {
 
     /**
      * Warning log message.
-     * 
+     *
      * @param tag
      * @param s
      * @param e
@@ -167,7 +167,7 @@ public class LOG {
 
     /**
      * Error log message.
-     * 
+     *
      * @param tag
      * @param s
      * @param e
@@ -178,7 +178,7 @@ public class LOG {
 
     /**
      * Verbose log message with printf formatting.
-     * 
+     *
      * @param tag
      * @param s
      * @param args
@@ -189,7 +189,7 @@ public class LOG {
 
     /**
      * Debug log message with printf formatting.
-     * 
+     *
      * @param tag
      * @param s
      * @param args
@@ -200,7 +200,7 @@ public class LOG {
 
     /**
      * Info log message with printf formatting.
-     * 
+     *
      * @param tag
      * @param s
      * @param args
@@ -208,10 +208,10 @@ public class LOG {
     public static void i(String tag, String s, Object... args) {
         if (LOG.INFO >= LOGLEVEL) Log.i(tag, String.format(s, args));
     }
-    
+
     /**
      * Warning log message with printf formatting.
-     * 
+     *
      * @param tag
      * @param s
      * @param args
@@ -219,10 +219,10 @@ public class LOG {
     public static void w(String tag, String s, Object... args) {
         if (LOG.WARN >= LOGLEVEL) Log.w(tag, String.format(s, args));
     }
-    
+
     /**
      * Error log message with printf formatting.
-     * 
+     *
      * @param tag
      * @param s
      * @param args
diff --git a/framework/src/org/apache/cordova/api/Plugin.java b/framework/src/org/apache/cordova/api/Plugin.java
index 648e86d6..05c880f9 100755
--- a/framework/src/org/apache/cordova/api/Plugin.java
+++ b/framework/src/org/apache/cordova/api/Plugin.java
@@ -31,81 +31,81 @@ import android.webkit.WebView;
  */
 public abstract class Plugin implements IPlugin {
 
-	public String id;
+    public String id;
     public WebView webView;					// WebView object
     public CordovaInterface ctx;			// CordovaActivity object
 
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public abstract PluginResult execute(String action, JSONArray args, String callbackId);
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		return false;
-	}
-
-	/**
-	 * Sets the context of the Plugin. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(CordovaInterface ctx) {
-		this.ctx = ctx;
-	}
-
-	/**
-	 * Sets the main View of the application, this is the WebView within which 
-	 * a Cordova app runs.
-	 * 
-	 * @param webView The Cordova WebView
-	 */
-	public void setView(WebView webView) {
-		this.webView = webView;
-	}
-	
     /**
-     * Called when the system is about to start resuming a previous activity. 
-     * 
+     * Executes the request and returns PluginResult.
+     *
+     * @param action 		The action to execute.
+     * @param args 			JSONArry of arguments for the plugin.
+     * @param callbackId	The callback id used when calling back into JavaScript.
+     * @return 				A PluginResult object with a status and message.
+     */
+    public abstract PluginResult execute(String action, JSONArray args, String callbackId);
+
+    /**
+     * Identifies if action to be executed returns a value and should be run synchronously.
+     *
+     * @param action	The action to execute
+     * @return			T=returns value
+     */
+    public boolean isSynch(String action) {
+        return false;
+    }
+
+    /**
+     * Sets the context of the Plugin. This can then be used to do things like
+     * get file paths associated with the Activity.
+     *
+     * @param ctx The context of the main Activity.
+     */
+    public void setContext(CordovaInterface ctx) {
+        this.ctx = ctx;
+    }
+
+    /**
+     * Sets the main View of the application, this is the WebView within which
+     * a Cordova app runs.
+     *
+     * @param webView The Cordova WebView
+     */
+    public void setView(WebView webView) {
+        this.webView = webView;
+    }
+
+    /**
+     * Called when the system is about to start resuming a previous activity.
+     *
      * @param multitasking		Flag indicating if multitasking is turned on for app
      */
     public void onPause(boolean multitasking) {
     }
 
     /**
-     * Called when the activity will start interacting with the user. 
-     * 
+     * Called when the activity will start interacting with the user.
+     *
      * @param multitasking		Flag indicating if multitasking is turned on for app
      */
     public void onResume(boolean multitasking) {
     }
-    
+
     /**
-     * Called when the activity receives a new intent. 
+     * Called when the activity receives a new intent.
      */
     public void onNewIntent(Intent intent) {
     }
-    
+
     /**
-     * The final call you receive before your activity is destroyed. 
+     * The final call you receive before your activity is destroyed.
      */
     public void onDestroy() {
     }
-	
+
     /**
-     * Called when a message is sent to plugin. 
-     * 
+     * Called when a message is sent to plugin.
+     *
      * @param id            The message id
      * @param data          The message data
      */
@@ -114,9 +114,9 @@ public abstract class Plugin implements IPlugin {
 
     /**
      * Called when an activity you launched exits, giving you the requestCode you started it with,
-     * the resultCode it returned, and any additional data from it. 
-     * 
-     * @param requestCode		The request code originally supplied to startActivityForResult(), 
+     * the resultCode it returned, and any additional data from it.
+     *
+     * @param requestCode		The request code originally supplied to startActivityForResult(),
      * 							allowing you to identify who this result came from.
      * @param resultCode		The integer result code returned by the child activity through its setResult().
      * @param data				An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
@@ -126,85 +126,85 @@ public abstract class Plugin implements IPlugin {
 
     /**
      * By specifying a <url-filter> in plugins.xml you can map a URL (using startsWith atm) to this method.
-     * 
+     *
      * @param url				The URL that is trying to be loaded in the Cordova webview.
      * @return					Return true to prevent the URL from loading. Default is false.
      */
     public boolean onOverrideUrlLoading(String url) {
-    	return false;
+        return false;
     }
 
     /**
      * Send generic JavaScript statement back to JavaScript.
      * success(...) and error(...) should be used instead where possible.
-     * 
+     *
      * @param statement
      */
     public void sendJavascript(String statement) {
-    	this.ctx.sendJavascript(statement);
+        this.ctx.sendJavascript(statement);
     }
 
     /**
      * Call the JavaScript success callback for this plugin.
-     * 
+     *
      * This can be used if the execute code for the plugin is asynchronous meaning
      * that execute should return null and the callback from the async operation can
      * call success(...) or error(...)
-     * 
+     *
      * @param pluginResult		The result to return.
-	 * @param callbackId		The callback id used when calling back into JavaScript.
+     * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void success(PluginResult pluginResult, String callbackId) {
-    	this.ctx.sendJavascript(pluginResult.toSuccessCallbackString(callbackId));
+        this.ctx.sendJavascript(pluginResult.toSuccessCallbackString(callbackId));
     }
 
     /**
      * Helper for success callbacks that just returns the Status.OK by default
-     * 
+     *
      * @param message			The message to add to the success result.
      * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void success(JSONObject message, String callbackId) {
-    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
+        this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
     }
 
     /**
      * Helper for success callbacks that just returns the Status.OK by default
-     * 
+     *
      * @param message			The message to add to the success result.
      * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void success(String message, String callbackId) {
-    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
+        this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
     }
-    
+
     /**
      * Call the JavaScript error callback for this plugin.
-     * 
+     *
      * @param pluginResult		The result to return.
-	 * @param callbackId		The callback id used when calling back into JavaScript.
+     * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void error(PluginResult pluginResult, String callbackId) {
-    	this.ctx.sendJavascript(pluginResult.toErrorCallbackString(callbackId));
+        this.ctx.sendJavascript(pluginResult.toErrorCallbackString(callbackId));
     }
 
     /**
      * Helper for error callbacks that just returns the Status.ERROR by default
-     * 
+     *
      * @param message			The message to add to the error result.
      * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void error(JSONObject message, String callbackId) {
-    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
+        this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
     }
 
     /**
      * Helper for error callbacks that just returns the Status.ERROR by default
-     * 
+     *
      * @param message			The message to add to the error result.
      * @param callbackId		The callback id used when calling back into JavaScript.
      */
     public void error(String message, String callbackId) {
-    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
+        this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
     }
 }
diff --git a/framework/src/org/apache/cordova/api/PluginEntry.java b/framework/src/org/apache/cordova/api/PluginEntry.java
index 450fa4cb..5cbba08d 100755
--- a/framework/src/org/apache/cordova/api/PluginEntry.java
+++ b/framework/src/org/apache/cordova/api/PluginEntry.java
@@ -43,13 +43,13 @@ public class PluginEntry {
     public IPlugin plugin = null;
 
     /**
-     * Flag that indicates the plugin object should be created when PluginManager is initialized. 
+     * Flag that indicates the plugin object should be created when PluginManager is initialized.
      */
     public boolean onload = false;
 
     /**
      * Constructor
-     * 
+     *
      * @param service               The name of the service
      * @param pluginClass           The plugin class name
      * @param onload                Create plugin object when HTML page is loaded
@@ -63,7 +63,7 @@ public class PluginEntry {
     /**
      * Create plugin object.
      * If plugin is already created, then just return it.
-     * 
+     *
      * @return                      The plugin object
      */
     @SuppressWarnings("unchecked")
@@ -88,7 +88,7 @@ public class PluginEntry {
 
     /**
      * Get the class.
-     * 
+     *
      * @param clazz
      * @return
      * @throws ClassNotFoundException
@@ -105,7 +105,7 @@ public class PluginEntry {
     /**
      * Get the interfaces that a class implements and see if it implements the
      * org.apache.cordova.api.Plugin interface.
-     * 
+     *
      * @param c                     The class to check the interfaces of.
      * @return                      Boolean indicating if the class implements org.apache.cordova.api.Plugin
      */
diff --git a/framework/src/org/apache/cordova/api/PluginManager.java b/framework/src/org/apache/cordova/api/PluginManager.java
index b2534278..486ff29d 100755
--- a/framework/src/org/apache/cordova/api/PluginManager.java
+++ b/framework/src/org/apache/cordova/api/PluginManager.java
@@ -33,7 +33,7 @@ import android.webkit.WebView;
 
 /**
  * PluginManager is exposed to JavaScript in the Cordova WebView.
- * 
+ *
  * Calling native plugin code can be done by calling PluginManager.exec(...)
  * from JavaScript.
  */
@@ -55,7 +55,7 @@ public class PluginManager {
 
     /**
      * Constructor.
-     * 
+     *
      * @param app
      * @param ctx
      */
@@ -148,23 +148,23 @@ public class PluginManager {
     /**
      * Receives a request for execution and fulfills it by finding the appropriate
      * Java class and calling it's execute method.
-     * 
-     * PluginManager.exec can be used either synchronously or async. In either case, a JSON encoded 
+     *
+     * PluginManager.exec can be used either synchronously or async. In either case, a JSON encoded
      * string is returned that will indicate if any errors have occurred when trying to find
      * or execute the class denoted by the clazz argument.
-     * 
+     *
      * @param service       String containing the service to run
      * @param action        String containt the action that the class is supposed to perform. This is
-     *                      passed to the plugin execute method and it is up to the plugin developer 
+     *                      passed to the plugin execute method and it is up to the plugin developer
      *                      how to deal with it.
      * @param callbackId    String containing the id of the callback that is execute in JavaScript if
      *                      this is an async plugin call.
      * @param args          An Array literal string containing any arguments needed in the
      *                      plugin execute method.
      * @param async         Boolean indicating whether the calling JavaScript code is expecting an
-     *                      immediate return value. If true, either Cordova.callbackSuccess(...) or 
+     *                      immediate return value. If true, either Cordova.callbackSuccess(...) or
      *                      Cordova.callbackError(...) is called once the plugin code has executed.
-     * 
+     *
      * @return              JSON encoded string with a response message and status.
      */
     @SuppressWarnings("unchecked")
@@ -232,10 +232,10 @@ public class PluginManager {
     }
 
     /**
-     * Get the plugin object that implements the service. 
-     * If the plugin object does not already exist, then create it. 
+     * Get the plugin object that implements the service.
+     * If the plugin object does not already exist, then create it.
      * If the service doesn't exist, then return null.
-     * 
+     *
      * @param service       The name of the service.
      * @return              IPlugin or null
      */
@@ -252,9 +252,9 @@ public class PluginManager {
     }
 
     /**
-     * Add a plugin class that implements a service to the service entry table. 
+     * Add a plugin class that implements a service to the service entry table.
      * This does not create the plugin object instance.
-     * 
+     *
      * @param service           The service name
      * @param className         The plugin class name
      */
@@ -264,9 +264,9 @@ public class PluginManager {
     }
 
     /**
-     * Add a plugin class that implements a service to the service entry table. 
+     * Add a plugin class that implements a service to the service entry table.
      * This does not create the plugin object instance.
-     * 
+     *
      * @param entry             The plugin entry
      */
     public void addService(PluginEntry entry) {
@@ -275,7 +275,7 @@ public class PluginManager {
 
     /**
      * Called when the system is about to start resuming a previous activity.
-     * 
+     *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
     public void onPause(boolean multitasking) {
@@ -288,7 +288,7 @@ public class PluginManager {
 
     /**
      * Called when the activity will start interacting with the user.
-     * 
+     *
      * @param multitasking      Flag indicating if multitasking is turned on for app
      */
     public void onResume(boolean multitasking) {
@@ -312,7 +312,7 @@ public class PluginManager {
 
     /**
      * Send a message to all plugins.
-     * 
+     *
      * @param id                The message id
      * @param data              The message data
      */
@@ -337,7 +337,7 @@ public class PluginManager {
 
     /**
      * Called when the URL of the webview changes.
-     * 
+     *
      * @param url               The URL that is being changed to.
      * @return                  Return false to allow the URL to load, return true to prevent the URL from loading.
      */
diff --git a/framework/src/org/apache/cordova/api/PluginResult.java b/framework/src/org/apache/cordova/api/PluginResult.java
index 73efab9a..8c1b7750 100755
--- a/framework/src/org/apache/cordova/api/PluginResult.java
+++ b/framework/src/org/apache/cordova/api/PluginResult.java
@@ -21,99 +21,97 @@ package org.apache.cordova.api;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import android.util.Log;
-
 public class PluginResult {
-	private final int status;
-	private final String message;
-	private boolean keepCallback = false;
-	
-	public PluginResult(Status status) {
-		this.status = status.ordinal();
-		this.message = "'" + PluginResult.StatusMessages[this.status] + "'";
-	}
-	
-	public PluginResult(Status status, String message) {
-		this.status = status.ordinal();
-		this.message = JSONObject.quote(message);
-	}
+    private final int status;
+    private final String message;
+    private boolean keepCallback = false;
 
-	public PluginResult(Status status, JSONArray message) {
-		this.status = status.ordinal();
-		this.message = message.toString();
-	}
+    public PluginResult(Status status) {
+        this.status = status.ordinal();
+        this.message = "'" + PluginResult.StatusMessages[this.status] + "'";
+    }
 
-	public PluginResult(Status status, JSONObject message) {
-		this.status = status.ordinal();
-		this.message = message.toString();
-	}
+    public PluginResult(Status status, String message) {
+        this.status = status.ordinal();
+        this.message = JSONObject.quote(message);
+    }
 
-	public PluginResult(Status status, int i) {
-		this.status = status.ordinal();
-		this.message = ""+i;
-	}
+    public PluginResult(Status status, JSONArray message) {
+        this.status = status.ordinal();
+        this.message = message.toString();
+    }
 
-	public PluginResult(Status status, float f) {
-		this.status = status.ordinal();
-		this.message = ""+f;
-	}
+    public PluginResult(Status status, JSONObject message) {
+        this.status = status.ordinal();
+        this.message = message.toString();
+    }
 
-	public PluginResult(Status status, boolean b) {
-		this.status = status.ordinal();
-		this.message = ""+b;
-	}
-	
-	public void setKeepCallback(boolean b) {
-		this.keepCallback = b;
-	}
-	
-	public int getStatus() {
-		return status;
-	}
+    public PluginResult(Status status, int i) {
+        this.status = status.ordinal();
+        this.message = ""+i;
+    }
 
-	public String getMessage() {
-		return message;
-	}
-	
-	public boolean getKeepCallback() {
-		return this.keepCallback;
-	}
-	
-	public String getJSONString() {
-		return "{\"status\":" + this.status + ",\"message\":" + this.message + ",\"keepCallback\":" + this.keepCallback + "}";
-	}
-	
-	public String toSuccessCallbackString(String callbackId) {
-		return "cordova.callbackSuccess('"+callbackId+"',"+this.getJSONString()+");";
-	}
-	
-	public String toErrorCallbackString(String callbackId) {
-		return "cordova.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
-	}
-	
-	public static String[] StatusMessages = new String[] {
-		"No result",
-		"OK",
-		"Class not found",
-		"Illegal access",
-		"Instantiation error",
-		"Malformed url",
-		"IO error",
-		"Invalid action",
-		"JSON error",
-		"Error"
-	};
-	
-	public enum Status {
-		NO_RESULT,
-		OK,
-		CLASS_NOT_FOUND_EXCEPTION,
-		ILLEGAL_ACCESS_EXCEPTION,
-		INSTANTIATION_EXCEPTION,
-		MALFORMED_URL_EXCEPTION,
-		IO_EXCEPTION,
-		INVALID_ACTION,
-		JSON_EXCEPTION,
-		ERROR
-	}
+    public PluginResult(Status status, float f) {
+        this.status = status.ordinal();
+        this.message = ""+f;
+    }
+
+    public PluginResult(Status status, boolean b) {
+        this.status = status.ordinal();
+        this.message = ""+b;
+    }
+
+    public void setKeepCallback(boolean b) {
+        this.keepCallback = b;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public boolean getKeepCallback() {
+        return this.keepCallback;
+    }
+
+    public String getJSONString() {
+        return "{\"status\":" + this.status + ",\"message\":" + this.message + ",\"keepCallback\":" + this.keepCallback + "}";
+    }
+
+    public String toSuccessCallbackString(String callbackId) {
+        return "cordova.callbackSuccess('"+callbackId+"',"+this.getJSONString()+");";
+    }
+
+    public String toErrorCallbackString(String callbackId) {
+        return "cordova.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
+    }
+
+    public static String[] StatusMessages = new String[] {
+        "No result",
+        "OK",
+        "Class not found",
+        "Illegal access",
+        "Instantiation error",
+        "Malformed url",
+        "IO error",
+        "Invalid action",
+        "JSON error",
+        "Error"
+    };
+
+    public enum Status {
+        NO_RESULT,
+        OK,
+        CLASS_NOT_FOUND_EXCEPTION,
+        ILLEGAL_ACCESS_EXCEPTION,
+        INSTANTIATION_EXCEPTION,
+        MALFORMED_URL_EXCEPTION,
+        IO_EXCEPTION,
+        INVALID_ACTION,
+        JSON_EXCEPTION,
+        ERROR
+    }
 }
diff --git a/framework/src/org/apache/cordova/file/EncodingException.java b/framework/src/org/apache/cordova/file/EncodingException.java
index 4dbbd5e8..a32e18ea 100644
--- a/framework/src/org/apache/cordova/file/EncodingException.java
+++ b/framework/src/org/apache/cordova/file/EncodingException.java
@@ -21,8 +21,8 @@ package org.apache.cordova.file;
 
 public class EncodingException extends Exception {
 
-	public EncodingException(String message) {
-		super(message);
-	}
-	
+    public EncodingException(String message) {
+        super(message);
+    }
+
 }
diff --git a/framework/src/org/apache/cordova/file/FileExistsException.java b/framework/src/org/apache/cordova/file/FileExistsException.java
index af246e5f..18aa7ea0 100644
--- a/framework/src/org/apache/cordova/file/FileExistsException.java
+++ b/framework/src/org/apache/cordova/file/FileExistsException.java
@@ -21,8 +21,8 @@ package org.apache.cordova.file;
 
 public class FileExistsException extends Exception {
 
-	public FileExistsException(String msg) {
-		super(msg);
-	}
+    public FileExistsException(String msg) {
+        super(msg);
+    }
 
 }
diff --git a/framework/src/org/apache/cordova/file/InvalidModificationException.java b/framework/src/org/apache/cordova/file/InvalidModificationException.java
index 10672659..aebab4d7 100644
--- a/framework/src/org/apache/cordova/file/InvalidModificationException.java
+++ b/framework/src/org/apache/cordova/file/InvalidModificationException.java
@@ -22,8 +22,8 @@ package org.apache.cordova.file;
 
 public class InvalidModificationException extends Exception {
 
-	public InvalidModificationException(String message) {
-		super(message);
-	}
+    public InvalidModificationException(String message) {
+        super(message);
+    }
 
 }
diff --git a/framework/src/org/apache/cordova/file/NoModificationAllowedException.java b/framework/src/org/apache/cordova/file/NoModificationAllowedException.java
index e441a532..8cae1151 100644
--- a/framework/src/org/apache/cordova/file/NoModificationAllowedException.java
+++ b/framework/src/org/apache/cordova/file/NoModificationAllowedException.java
@@ -21,8 +21,8 @@ package org.apache.cordova.file;
 
 public class NoModificationAllowedException extends Exception {
 
-	public NoModificationAllowedException(String message) {
-		super(message);
-	}
+    public NoModificationAllowedException(String message) {
+        super(message);
+    }
 
 }
diff --git a/framework/src/org/apache/cordova/file/TypeMismatchException.java b/framework/src/org/apache/cordova/file/TypeMismatchException.java
index ea55e307..0ea5993f 100644
--- a/framework/src/org/apache/cordova/file/TypeMismatchException.java
+++ b/framework/src/org/apache/cordova/file/TypeMismatchException.java
@@ -22,8 +22,8 @@ package org.apache.cordova.file;
 
 public class TypeMismatchException extends Exception {
 
-	public TypeMismatchException(String message) {
-		super(message);
-	}
+    public TypeMismatchException(String message) {
+        super(message);
+    }
 
 }

From 58c3f9a1874dee924bbae934327b5cb8f4b58218 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Tue, 5 Jun 2012 14:26:02 -0700
Subject: [PATCH 2/2] Updating the JS and the version for tagging

---
 VERSION                                       |   2 +-
 .../templates/project/assets/www/index.html   |   2 +-
 framework/assets/js/cordova.android.js        | 152 +++++++++---------
 framework/assets/www/index.html               |   2 +-
 framework/src/org/apache/cordova/Device.java  |   2 +-
 5 files changed, 77 insertions(+), 83 deletions(-)

diff --git a/VERSION b/VERSION
index 92f201f4..27f9cd32 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.0rc1
+1.8.0
diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
index 39368e0d..8e46f620 100644
--- a/bin/templates/project/cordova/templates/project/assets/www/index.html
+++ b/bin/templates/project/cordova/templates/project/assets/www/index.html
@@ -23,7 +23,7 @@
     <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">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.8.0rc1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 09881515..3e59432e 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit 95f199e1c207dc89b84e79a9a7b27d6a3cc8fe14
+// commit ac0a3990438f4a89faa993316fb5614f61cf3be6
 
-// File generated at :: Thu May 24 2012 21:36:17 GMT-0400 (EDT)
+// File generated at :: Tue Jun 05 2012 14:14:16 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -77,7 +77,7 @@ var channel = require('cordova/channel');
 document.addEventListener('DOMContentLoaded', function() {
     channel.onDOMContentLoaded.fire();
 }, false);
-if (document.readyState == 'complete') {
+if (document.readyState == 'complete' || document.readyState == 'interactive') {
     channel.onDOMContentLoaded.fire();
 }
 
@@ -99,7 +99,11 @@ var documentEventHandlers = {},
 document.addEventListener = function(evt, handler, capture) {
     var e = evt.toLowerCase();
     if (typeof documentEventHandlers[e] != 'undefined') {
-        documentEventHandlers[e].subscribe(handler);
+        if (evt === 'deviceready') {
+            documentEventHandlers[e].subscribeOnce(handler);
+        } else {
+            documentEventHandlers[e].subscribe(handler);
+        }
     } else {
         m_document_addEventListener.call(document, evt, handler, capture);
     }
@@ -504,7 +508,7 @@ var Channel = function(type, opts) {
     this.type = type;
     this.handlers = {};
     this.numHandlers = 0;
-    this.guid = 0;
+    this.guid = 1;
     this.fired = false;
     this.enabled = true;
     this.events = {
@@ -595,12 +599,21 @@ Channel.prototype.subscribe = function(f, c, g) {
     var func = f;
     if (typeof c == "object") { func = utils.close(c, f); }
 
-    g = g || func.observer_guid || f.observer_guid || this.guid++;
+    g = g || func.observer_guid || f.observer_guid;
+    if (!g) {
+        // first time we've seen this subscriber
+        g = this.guid++;
+    }
+    else {
+        // subscriber already handled; dont set it twice
+        return g;
+    }
     func.observer_guid = g;
     f.observer_guid = g;
     this.handlers[g] = func;
     this.numHandlers++;
     if (this.events.onSubscribe) this.events.onSubscribe.call(this);
+    if (this.fired) func.call(this);
     return g;
 };
 
@@ -637,6 +650,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (typeof g == 'function') { g = g.observer_guid; }
     var handler = this.handlers[g];
     if (handler) {
+        if (handler.observer_guid) handler.observer_guid=null;
         this.handlers[g] = null;
         delete this.handlers[g];
         this.numHandlers--;
@@ -779,6 +793,9 @@ module.exports = {
         Camera:{
             path: 'cordova/plugin/CameraConstants'
         },
+        CameraPopoverOptions: {
+            path: 'cordova/plugin/CameraPopoverOptions'
+        },
         CaptureError: {
             path: 'cordova/plugin/CaptureError'
         },
@@ -1088,7 +1105,7 @@ module.exports = {
 
         // Patch localStorage if necessary
         if (typeof window.localStorage == 'undefined' || window.localStorage === null) {
-            window.localStorage = new storage.CupCakeLocalStorage();
+            window.localStorage = new storage.CupcakeLocalStorage();
         }
 
         // Let native code know we are all done on the JS side.
@@ -1259,8 +1276,12 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     } else if (typeof options.saveToPhotoAlbum == "number") {
         saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
+    var popoverOptions = null;
+    if (typeof options.popoverOptions == "object") {
+        popoverOptions = options.popoverOptions;
+    }
 
-    exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
+    exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum, popoverOptions]);
 };
 
 module.exports = cameraExport;
@@ -1286,10 +1307,37 @@ module.exports = {
     PHOTOLIBRARY : 0,    // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
     CAMERA : 1,          // Take picture from camera
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
+  },
+  PopoverArrowDirection:{
+      ARROW_UP : 1,        // matches iOS UIPopoverArrowDirection constants to specify arrow location on popover
+      ARROW_DOWN : 2,
+      ARROW_LEFT : 4,
+      ARROW_RIGHT : 8,
+      ARROW_ANY : 15
   }
 };
 });
 
+// file: lib/common/plugin/CameraPopoverOptions.js
+define("cordova/plugin/CameraPopoverOptions", function(require, exports, module) {
+var Camera = require('cordova/plugin/CameraConstants');
+
+/**
+ * Encapsulates options for iOS Popover image picker
+ */
+var CameraPopoverOptions = function(x,y,width,height,arrowDir){
+    // information of rectangle that popover should be anchored to
+    this.x = x || 0;
+    this.y = y || 32;
+    this.width = width || 320;
+    this.height = height || 480;
+    // The direction of the popover arrow
+    this.arrowDir = arrowDir || Camera.PopoverArrowDirection.ARROW_ANY;
+};
+
+module.exports = CameraPopoverOptions;
+});
+
 // file: lib/common/plugin/CaptureAudioOptions.js
 define("cordova/plugin/CaptureAudioOptions", function(require, exports, module) {
 /**
@@ -3288,7 +3336,7 @@ var Position = function(coords, timestamp) {
     } else {
         this.coords = new Coordinates();
     }
-    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date();
 };
 
 module.exports = Position;
@@ -4853,7 +4901,7 @@ var geolocation = {
                     velocity:p.velocity,
                     altitudeAccuracy:p.altitudeAccuracy
                 },
-                p.timestamp || new Date()
+                (p.timestamp === undefined ? new Date() : ((p.timestamp instanceof Date) ? p.timestamp : new Date(p.timestamp)))
             );
             geolocation.lastPosition = pos;
             successCallback(pos);
@@ -4937,7 +4985,7 @@ var geolocation = {
                     velocity:p.velocity,
                     altitudeAccuracy:p.altitudeAccuracy
                 },
-                p.timestamp || new Date()
+                (p.timestamp === undefined ? new Date() : ((p.timestamp instanceof Date) ? p.timestamp : new Date(p.timestamp)))
             );
             geolocation.lastPosition = pos;
             successCallback(pos);
@@ -5426,68 +5474,6 @@ var splashscreen = {
 module.exports = splashscreen;
 });
 
-// file: lib/common/plugin/widget.js
-define("cordova/plugin/widget", function(require, exports, module) {
-var exec = require('cordova/exec'),
-    cordova = require('cordova'),
-    channel = require('cordova/channel');
-
-var Widget = function () {
-    this.author = null;
-    this.description = null;
-    this.name = null;
-    this.shortName = null;
-    this.version = null;
-    this.id = null;
-    this.authorEmail = null;
-    this.authorHref = null;
-    this._firstRun = true;
-
-    var me = this;
-
-    channel.onCordovaReady.subscribeOnce(function() {
-        me.getInfo(function (info) {
-            me.author = info.author;
-            me.description = info.description;
-            me.name = info.name;
-            me.shortName = info.shortName;
-            me.version = info.version;
-            me.id = info.id;
-            me.authorEmail = info.authorEmail;
-            me.authorHref = info.authorHref;
-
-            // should only fire this once
-            if (me._firstRun) {
-                me._firstRun = false;
-                channel.onCordovaAppInfoReady.fire();
-            }
-        },
-        function (e) {
-            // If we can't get the network info we should still tell Cordova
-            // to fire the deviceready event.
-            if (me._firstRun) {
-                me._firstRun = false;
-                channel.onCordovaAppInfoReady.fire();
-            }
-            console.log("Error initializing Widget: " + e);
-        });
-    });
-};
-
-/**
- * Get connection info
- *
- * @param {Function} successCallback The function to call when the Connection data is available
- * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
- */
-Widget.prototype.getInfo = function (successCallback, errorCallback) {
-    // Get info
-    exec(successCallback, errorCallback, "Widget", "getApplicationInfo", []);
-};
-
-module.exports = new Widget();
-});
-
 // file: lib/common/utils.js
 define("cordova/utils", function(require, exports, module) {
 var utils = exports;
@@ -5613,9 +5599,10 @@ utils.format = function(formatString /* ,... */) {
 utils.vformat = function(formatString, args) {
     if (formatString === null || formatString === undefined) return "";
     if (arguments.length == 1) return formatString.toString();
+    if (typeof formatString != "string") return formatString.toString();
 
     var pattern = /(.*?)%(.)(.*)/;
-    var rest    = formatString.toString();
+    var rest    = formatString;
     var result  = [];
 
     while (args.length) {
@@ -5658,13 +5645,20 @@ function UUIDcreatePart(length) {
 //------------------------------------------------------------------------------
 function formatted(object, formatChar) {
 
-    switch(formatChar) {
-        case 'j':
-        case 'o': return JSON.stringify(object);
-        case 'c': return '';
+    try {
+        switch(formatChar) {
+            case 'j':
+            case 'o': return JSON.stringify(object);
+            case 'c': return '';
+        }
+    }
+    catch (e) {
+        return "error JSON.stringify()ing argument: " + e;
     }
 
-    if (null === object) return Object.prototype.toString.call(object);
+    if ((object === null) || (object === undefined)) {
+        return Object.prototype.toString.call(object);
+    }
 
     return object.toString();
 }
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 1a51674f..3791f9fd 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.8.0rc1.js"></script>
+    <script src="cordova-1.8.0.js"></script>
   </head>
   <body>
 
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index f3721dc4..2c2f1179 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
 public class Device extends Plugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "1.8.0rc1";              // Cordova version
+    public static String cordovaVersion = "1.8.0";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID