RubyGems - mobile_template - Versions diffs - 0.0.1 → 0.0.2 - Mend

mobile_template 0.0.1 → 0.0.2

Files changed (123) hide show

data/templates/cordova_android/framework/assets/www/index.html CHANGED Viewed

@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.5.0.js"></script>
+    <script src="cordova-1.7.0.js"></script>
   </head>
   <body>

data/templates/cordova_android/framework/build.xml CHANGED Viewed

@@ -108,40 +108,6 @@
     -->
    <import file="${sdk.dir}/tools/ant/build.xml" />
-    <target name="check-javascript" depends="build-javascript">
-        <!--
-        <delete dir="assets/lib"/>
-        <mkdir dir="assets/lib"/>
-        <echo file="assets/lib/lint.js">var alert=function(){},device={},Element={},debug={};</echo>
-        <concat destfile="assets/lib/cordova-lint.js" append="true">
-            <fileset dir="assets/lib">
-                <include name="lint.js" />
-            </fileset>
-            <fileset dir="assets/www">
-                <include name="cordova-${version}.js" />
-            </fileset>
-        </concat>
-        <exec executable="cmd" os="Windows 7">
-            <arg value="/c"/>
-            <arg value="java"/>
-            <arg value="-cp"/>
-            <arg value="${basedir}/util/js.jar"/>
-            <arg value="org.mozilla.javascript.tools.shell.Main"/>
-            <arg value="${basedir}/util/jslint.js"/>
-            <arg value="${basedir}/js/lib/cordova-lint.js"/>
-        </exec>
-        <exec executable="java" os="Mac OS X">
-            <arg value="-cp"/>
-            <arg value="../util/js.jar"/>
-            <arg value="org.mozilla.javascript.tools.shell.Main"/>
-            <arg value="../util/jslint.js"/>
-            <arg value="assets/lib/cordova-lint.js"/>
-        </exec>
-        -->
-    </target>
     <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
     <target name="build-javascript" depends="clean">
@@ -151,24 +117,18 @@
       <!-- Create uncompressed JS file -->
       <concat destfile="assets/www/cordova-${version}.js">
         <filelist dir="assets/js" files="cordova.android.js"/>
-        <!--
-        <filelist dir="assets/js" files="cordova.js.base,device.js"/>
-        <fileset dir="assets/js" includes="*.js" excludes="cordova.js.base,device.js"/>
-        -->
       </concat>
       <!-- 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/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 -->
       <replaceregexp match="cordovaVersion = [\u0022].*[\u0022];" replace='cordovaVersion = ${dblQuote}${version}${dblQuote};' byline="true">
         <fileset file="src/org/apache/cordova/Device.java" />
       </replaceregexp>
-      <!-- Delete temp file -->
-      <!--<delete file="assets/www/cordova-tmp.js"/>-->
     </target>
     <!-- Build Cordova jar file that includes all native code, and Cordova JS file

data/templates/cordova_android/framework/project.properties CHANGED Viewed

@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:15
+target=android-15
 apk-configurations=

data/templates/cordova_android/framework/res/drawable/splash.png CHANGED Viewed

Binary file

data/templates/cordova_android/framework/res/drawable-hdpi/icon.png ADDED Viewed

Binary file

data/templates/cordova_android/framework/res/drawable-ldpi/icon.png ADDED Viewed

Binary file

data/templates/cordova_android/framework/res/drawable-mdpi/icon.png ADDED Viewed

Binary file

data/templates/cordova_android/framework/res/xml/plugins.xml CHANGED Viewed

@@ -27,11 +27,12 @@
     <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
     <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
     <plugin name="File" value="org.apache.cordova.FileUtils"/>
-    <plugin name="Network Status" value="org.apache.cordova.NetworkManager"/>
+    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
     <plugin name="Notification" value="org.apache.cordova.Notification"/>
     <plugin name="Storage" value="org.apache.cordova.Storage"/>
     <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
     <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
     <plugin name="Capture" value="org.apache.cordova.Capture"/>
     <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
+    <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
 </plugins>

data/templates/cordova_android/framework/src/com/phonegap/api/PluginManager.java CHANGED Viewed

@@ -1,4 +1,5 @@
 /*
+       Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
        regarding copyright ownership.  The ASF licenses this file

data/templates/cordova_android/framework/src/org/apache/cordova/AudioPlayer.java CHANGED Viewed

@@ -28,6 +28,7 @@ import android.os.Environment;
 import android.util.Log;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 /**
@@ -116,7 +117,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	public void startRecording(String file) {
 		if (this.mPlayer != null) {
 			Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
 		}
 		// Make sure we're not already recording
@@ -137,11 +138,11 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+			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("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
 		}
 	}
@@ -183,7 +184,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	public void startPlaying(String file) {
 		if (this.recorder != null) {
 		    Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+			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
@@ -215,9 +216,16 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 						android.content.res.AssetFileDescriptor fd = this.handler.ctx.getBaseContext().getAssets().openFd(f);
 						this.mPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
 					}
-					else {
-						this.mPlayer.setDataSource("/sdcard/" + file);
-					}
+                    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();
@@ -228,7 +236,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			}
 			catch (Exception e) {
 				e.printStackTrace();
-				this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
 			}
 		}
@@ -242,7 +250,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			}
 			else {
 			    Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
-				this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
+				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
 			}
 		}
 	}
@@ -254,7 +262,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		if (this.mPlayer != null) {
 		    this.mPlayer.seekTo(milliseconds);
 		    Log.d(LOG_TAG, "Send a onStatus update for the new seek");
-		    this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
+		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
 		}
 	}
@@ -270,7 +278,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		}
 		else {
 		    Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
+			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");
 		}
 	}
@@ -284,7 +292,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		}
 		else {
 		    Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
+			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");
 		}
 	}
@@ -305,7 +313,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	public long getCurrentPosition() {
 		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
 		    int curPos = this.mPlayer.getCurrentPosition();
-		    this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
+		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
 			return curPos;
 		}
 		else {
@@ -384,7 +392,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		this.prepareOnly = false;
 		// Send status notification to JavaScript
-		this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
+		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
 	}
@@ -413,7 +421,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		this.mPlayer.release();
 		// Send error notification to JavaScript
-		this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", "+arg1+");");
+		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', { \"code\":"+arg1+"});");
 		return false;
 	}
@@ -424,7 +432,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	 */
 	private void setState(int state) {
 		if (this.state != state) {
-			this.handler.sendJavascript("require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
+			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
 		}
 		this.state = state;

data/templates/cordova_android/framework/src/org/apache/cordova/CameraLauncher.java CHANGED Viewed

@@ -31,14 +31,13 @@ import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Bitmap;
+import android.graphics.Matrix;
 import android.graphics.Bitmap.CompressFormat;
 import android.net.Uri;
 import android.provider.MediaStore;
@@ -114,6 +113,7 @@ public class CameraLauncher extends Plugin {
                 this.targetWidth = args.getInt(3);
                 this.targetHeight = args.getInt(4);
                 this.encodingType = args.getInt(5);
+                this.mediaType = args.getInt(6);
                 if (srcType == CAMERA) {
                     this.takePicture(destType, encodingType);
@@ -272,19 +272,24 @@ public class CameraLauncher extends Plugin {
         // 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 {
+         if (this.encodingType == JPEG) {
+            exif.createInFile(DirectoryManager.getTempDirectoryPath(ctx.getContext()) + "/Pic.jpg");
+            exif.readExifData();
+         }
+     } catch (IOException e) {
+         e.printStackTrace();
+     }
         // If CAMERA
         if (srcType == CAMERA) {
             // If image available
             if (resultCode == Activity.RESULT_OK) {
                 try {
-                    // Create an ExifHelper to save the exif data that is lost during compression
-                    ExifHelper exif = new ExifHelper();
-                    if (this.encodingType == JPEG) {
-                        exif.createInFile(DirectoryManager.getTempDirectoryPath(ctx.getContext()) + "/Pic.jpg");
-                        exif.readExifData();
-                    }
                     // Read in bitmap of captured image
                     Bitmap bitmap;
                     try {
@@ -375,6 +380,20 @@ public class CameraLauncher extends Plugin {
                     if (destType == DATA_URL) {
                         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,
+                                         null, null, null);
+                 if (cursor != null) {
+                 cursor.moveToPosition(0);
+                 rotate = cursor.getInt(0);
+                 cursor.close();
+                 }
+                 if (rotate != 0) {
+                 Matrix matrix = new Matrix();
+                 matrix.setRotate(rotate);
+                 bitmap = bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+                 }
                             bitmap = scaleBitmap(bitmap);
                             this.processPicture(bitmap);
                             bitmap.recycle();
@@ -399,6 +418,12 @@ public class CameraLauncher extends Plugin {
                                 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));
+                                    exif.writeExifData();
+                                }
                                 bitmap.recycle();
                                 bitmap = null;
@@ -497,4 +522,4 @@ public class CameraLauncher extends Plugin {
     public void failPicture(String err) {
         this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
     }
-}
+}

data/templates/cordova_android/framework/src/org/apache/cordova/ContactAccessor.java CHANGED Viewed

@@ -84,7 +84,8 @@ public abstract class ContactAccessor {
               map.put("displayName", true);
             }
             else if (key.startsWith("name")) {
-              map.put("name", true);
+                map.put("displayName", true);
+                map.put("name", true);
             }
             else if (key.startsWith("nickname")) {
               map.put("nickname", true);

data/templates/cordova_android/framework/src/org/apache/cordova/ContactAccessorSdk5.java CHANGED Viewed

@@ -1649,71 +1649,73 @@ public class ContactAccessorSdk5 extends ContactAccessor {
    */
   private int getPhoneType(String string) {
     int type = ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
-    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 (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;
+    	}
     }
     return type;
   }

data/templates/cordova_android/framework/src/org/apache/cordova/ContactManager.java CHANGED Viewed

@@ -26,52 +26,42 @@ import org.json.JSONObject;
 import android.util.Log;
 public class ContactManager extends Plugin {
     private ContactAccessor contactAccessor;
-  private static final String LOG_TAG = "Contact Query";
+    private static final String LOG_TAG = "Contact Query";
+    public static final int UNKNOWN_ERROR = 0;
+    public static final int INVALID_ARGUMENT_ERROR = 1;
+    public static final int TIMEOUT_ERROR = 2;
+    public static final int PENDING_OPERATION_ERROR = 3;
+    public static final int IO_ERROR = 4;
+    public static final int NOT_SUPPORTED_ERROR = 5;
+    public static final int PERMISSION_DENIED_ERROR = 20;
-  public static final int UNKNOWN_ERROR = 0;
-  public static final int INVALID_ARGUMENT_ERROR = 1;
-  public static final int TIMEOUT_ERROR = 2;
-  public static final int PENDING_OPERATION_ERROR = 3;
-  public static final int IO_ERROR = 4;
-  public static final int NOT_SUPPORTED_ERROR = 5;
-  public static final int PERMISSION_DENIED_ERROR = 20;
+    /**
+     * Constructor.
+     */
+    public ContactManager() {
+    }
-  /**
-   * Constructor.
-   */
-  public ContactManager() {
-  }
-  /**
-   * 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) {
+    /**
+     * 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 = "";
+        String result = "";
         /**
          * 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.")) {
-            JSONObject res = null;
-            try {
-                res = new JSONObject();
-                res.put("code", NOT_SUPPORTED_ERROR);
-                res.put("message", "Contacts are not supported in Android 1.X devices");
-            } catch (JSONException e) {
-                // This should never happen
-                Log.e(LOG_TAG, e.getMessage(), e);
-            }
-            return new PluginResult(PluginResult.Status.ERROR, res);
+            return new PluginResult(PluginResult.Status.ERROR, ContactManager.NOT_SUPPORTED_ERROR);
         }
         /**
@@ -81,33 +71,31 @@ public class ContactManager extends Plugin {
         if (this.contactAccessor == null) {
             this.contactAccessor = new ContactAccessorSdk5(this.webView, this.ctx.getContext());
         }
-    try {
-      if (action.equals("search")) {
-        JSONArray res = contactAccessor.search(args.getJSONArray(0), args.optJSONObject(1));
-        return new PluginResult(status, res);
-      }
-      else if (action.equals("save")) {
-          String id = contactAccessor.save(args.getJSONObject(0));
-        if (id != null) {
-                  JSONObject res = contactAccessor.getContactById(id);
-                  if (res != null) {
-                      return new PluginResult(status, res);
-                  }
-        }
-      }
-      else if (action.equals("remove")) {
-        if (contactAccessor.remove(args.getString(0))) {
-          return new PluginResult(status, result);
+        try {
+            if (action.equals("search")) {
+                JSONArray res = contactAccessor.search(args.getJSONArray(0), args.optJSONObject(1));
+                return new PluginResult(status, res);
+            }
+            else if (action.equals("save")) {
+                String id = contactAccessor.save(args.getJSONObject(0));
+                if (id != null) {
+                    JSONObject res = contactAccessor.getContactById(id);
+                    if (res != null) {
+                        return new PluginResult(status, res);
+                    }
+                }
+            }
+            else if (action.equals("remove")) {
+                if (contactAccessor.remove(args.getString(0))) {
+                    return new PluginResult(status, result);
+                }
+            }
+            // If we get to this point an error has occurred
+            return new PluginResult(PluginResult.Status.ERROR, ContactManager.UNKNOWN_ERROR);
+        } catch (JSONException e) {
+          Log.e(LOG_TAG, e.getMessage(), e);
+          return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
         }
-      }
-      // If we get to this point an error has occurred
-            JSONObject r = new JSONObject();
-            r.put("code", UNKNOWN_ERROR);
-            return new PluginResult(PluginResult.Status.ERROR, r);
-    } catch (JSONException e) {
-      Log.e(LOG_TAG, e.getMessage(), e);
-      return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
     }
-  }
 }