rhodes 2.0.0 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+## 2.0.1
+* #4049590 - Android 2.2, rhodes rc2: take picture hangs
+* #4103477 - Android 2.2: can't write to DB
+* #3985537 - Android: cannot build with 2.2 sdk only
+* #4038658 - Get free listening port on iphone
+
 ## 2.0.0
 * #4053947 - Android: FindClass always return NULL when called outside of JNI_OnLoad
 * #4060638 - reset functions don't wipe client_id

data/Manifest.txt

@@ -342,6 +342,9 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
@@ -3550,7 +3553,6 @@ res/generators/templates/spec/app/mspec.rb
 res/generators/templates/spec/app/spec_runner.rb
 res/generators/templates/spec/app/SpecRunner/controller.rb
 res/generators/templates/spec/app/SpecRunner/index.erb
-rhobuild.yml
 rhobuild.yml.example
 rhodes.gemspec
 spec/framework_spec/app/Account/account.rb

data/bin/rhodes-setup

@@ -55,38 +55,7 @@ if ENV['ANDROID_HOME']
   android = ENV['ANDROID_HOME']
 end
 
-while true
-  android = prompt_for("Android SDK path", android, false)
-  break if android.nil?
-
-  android = android.gsub(/\\/,"/")
-  apilevel = -1
-  android_platform_dir = "/platforms/android-1.5"
-  Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
-    props = File.join(dir, 'source.properties')
-    next unless File.file? props
-    File.open(props, 'r') do |f|
-      while line = f.gets
-        next if line !~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
-        apilevel = $1.to_i
-        break
-      end
-    end
-
-    if apilevel == 3
-      android_platform_dir = dir[android.length..-1]
-      break
-    end
-  end
-  android = "" if apilevel == -1
-
-  unless File.directory? File.join(android, android_platform_dir)
-    puts "Invalid Android SDK path"
-    next
-  end
-
-  break
-end
+android = prompt_for("Android SDK path", android, false)
 
 # try to detect android ndk
 ndk = ""

data/lib/framework/erb.rb

@@ -750,11 +750,11 @@ class ERB
   # setup of an ERB _compiler_ object.
   #
   def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.concat"
-    compiler.insert_cmd = "#{eoutvar}.concat"
+    compiler.put_cmd = "#{eoutvar}.force_encoding('utf-8');#{eoutvar}.concat"
+    compiler.insert_cmd = "#{eoutvar}.force_encoding('utf-8');#{eoutvar}.concat"
 
     cmd = []
-    cmd.push "#{eoutvar} = ''"
+    cmd.push "#{eoutvar} = '';#{eoutvar}.force_encoding('utf-8')"
     
     compiler.pre_cmd = cmd
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.0.0'
+    VERSION = '2.0.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.5'
+    DBVERSION = '2.0.2'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.0.0'
+    VERSION = '2.0.2'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '2.0.0'
+    DBVERSION = '2.0.2'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.0.0'
+    VERSION = '2.0.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.5'
+    DBVERSION = '2.0.2'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="20"
-      android:versionName="2.0.0">
+      android:versionCode="22"
+      android:versionName="2.0.2">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"
@@ -35,4 +35,5 @@
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
 </manifest> 

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_Rhodes.h

@@ -16,10 +16,10 @@ extern "C" {
 /*
  * Class:     com_rhomobile_rhodes_Rhodes
  * Method:    createRhodesApp
- * Signature: (Ljava/lang/String;)V
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_createRhodesApp
-  (JNIEnv *, jobject, jstring);
+  (JNIEnv *, jobject, jstring, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_Rhodes

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -20,7 +20,8 @@ const char *rho_java_class[] = {
 #undef RHODES_DEFINE_JAVA_CLASS
 };
 
-static rho::String g_rootPath;
+static std::string g_root_path;
+static std::string g_sqlite_journals_path;
 
 static pthread_key_t g_thrkey;
 
@@ -179,7 +180,7 @@ jmethodID getJNIClassStaticMethod(JNIEnv *env, jclass cls, const char *name, con
 
 const char* rho_native_rhopath()
 {
-    return g_rootPath.c_str();
+    return g_root_path.c_str();
 }
 
 jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
@@ -328,14 +329,15 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_initClassLoader
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_createRhodesApp
-  (JNIEnv *env, jobject, jstring path)
+  (JNIEnv *env, jobject, jstring root_path, jstring sqlite_journals_path)
 {
     if (!set_capabilities(env)) return;
 
-    g_rootPath = rho_cast<std::string>(path);
+    g_root_path = rho_cast<std::string>(root_path);
+    g_sqlite_journals_path = rho_cast<std::string>(sqlite_journals_path);
 
     // Init SQLite temp directory
-    sqlite3_temp_directory = (char*)"/sqlite_stmt_journals";
+    sqlite3_temp_directory = (char*)g_sqlite_journals_path.c_str();
 
     const char* szRootPath = rho_native_rhopath();
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java

@@ -2,11 +2,13 @@ package com.rhomobile.rhodes;
 
 public class Capabilities {
 	
+	public static boolean AUDIO_ENABLED = true;
 	public static boolean CAMERA_ENABLED = true;
 	public static boolean GPS_ENABLED = true;
 	public static boolean NETWORK_STATE_ENABLED = true;
 	public static boolean PHONE_ENABLED = true;
 	public static boolean PIM_ENABLED = true;
+	public static boolean RECORD_AUDIO_ENABLED = true;
 	public static boolean VIBRATE_ENABLED = true;
 	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java

@@ -120,7 +120,7 @@ public class Rhodes extends Activity {
 		
 	private String rootPath = null;
 	
-	public native void createRhodesApp(String path);
+	public native void createRhodesApp(String rootPath, String sqliteJournalsPath);
 	public native void startRhodesApp();
 	public native void stopRhodesApp();
 	
@@ -155,17 +155,26 @@ public class Rhodes extends Activity {
 		return rootPath;
 	}
 	
-	private String phoneMemoryRootPath() {
+	private ApplicationInfo getAppInfo() {
 		String pkgName = getPackageName();
 		try {
 			ApplicationInfo info = getPackageManager().getApplicationInfo(pkgName, 0);
-			String path = info.dataDir + "/rhodata/";
-			return path;
+			return info;
 		} catch (NameNotFoundException e) {
 			throw new RuntimeException("Internal error: package " + pkgName + " not found: " + e.getMessage());
 		}
 	}
 	
+	private String getSqliteJournalsPath() {
+		String path = getAppInfo().dataDir + "/sqlite_stmt_journals/";
+		new File(path).mkdirs();
+		return path;
+	}
+	
+	private String phoneMemoryRootPath() {
+		return getAppInfo().dataDir + "/rhodata/";
+	}
+	
 	private String sdcardRootPath() {
 		String sdPath = Environment.getExternalStorageDirectory().getAbsolutePath();
 		String pkgName = getPackageName();
@@ -174,7 +183,7 @@ public class Rhodes extends Activity {
 	}
 	
 	public static String getBlobPath() {
-		return RhodesInstance.getInstance().getRootPath() + "db/db-files";
+		return RhodesInstance.getInstance().getRootPath() + "/db/db-files";
 	}
 	
 	private RhoLogConf m_rhoLogConf = new RhoLogConf();
@@ -491,7 +500,7 @@ public class Rhodes extends Activity {
 			finish();
 			return;
 		}
-		createRhodesApp(getRootPath());
+		createRhodesApp(getRootPath(), getSqliteJournalsPath());
 		
 		boolean fullScreen = true;
 		if (RhoConf.isExist("full_screen"))

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java

@@ -41,6 +41,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
@@ -64,7 +65,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 		super.onCreate(icicle);
 		Logger.D(TAG, "onCreate");
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		getWindow().setFormat(PixelFormat.TRANSLUCENT);
 		setContentView(AndroidR.layout.camera);
 		
@@ -137,7 +138,9 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 				camera.stopPreview();
 			}
 			Camera.Parameters p = camera.getParameters();
-			p.setPreviewSize(w, h);
+			int newW = (w >> 3) << 3;
+			int newH = (h >> 3) << 3;
+			p.setPreviewSize(newW, newH);
 			camera.setParameters(p);
 			camera.setPreviewDisplay(holder);
 			camera.startPreview();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java

@@ -26,6 +26,7 @@ import java.util.Map;
 
 public class Contact {
 	
+	private String id = null;
 	private Map<String, ContactField> fields = new HashMap<String, ContactField>();
 	private Iterator<ContactField> iter = null;
 	
@@ -43,11 +44,16 @@ public class Contact {
 		if ( fields.containsKey(key) )
 			return fields.get(key).getValue();
 		
-		return "";
+		return null;
+	}
+	
+	public void setId(String v) {
+		id = v;
+		setField(Phonebook.PB_ID, "{" + v + "}");
 	}
 	
 	public String id() {
-		return getField(Phonebook.PB_ID);
+		return id;
 	}
 	
 	public void moveToBegin() {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java

@@ -0,0 +1,11 @@
+package com.rhomobile.rhodes.phonebook;
+
+import java.util.Map;
+
+public interface ContactAccessor {
+	
+	public Map<String, Contact> getAll() throws Exception;
+	public void save(Contact contact) throws Exception;
+	public void remove(Contact contact);
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java

@@ -0,0 +1,310 @@
+package com.rhomobile.rhodes.phonebook;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhodesInstance;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
+
+public class ContactAccessorNew implements ContactAccessor {
+	
+	//private static final String TAG = "ContactsAccessorNew";
+	
+	private static final String PB_ID = Phonebook.PB_ID;
+	private static final String PB_FIRST_NAME = Phonebook.PB_FIRST_NAME;
+	private static final String PB_LAST_NAME = Phonebook.PB_LAST_NAME;
+	private static final String PB_MOBILE_NUMBER = Phonebook.PB_MOBILE_NUMBER;
+	private static final String PB_HOME_NUMBER = Phonebook.PB_HOME_NUMBER;
+	private static final String PB_BUSINESS_NUMBER = Phonebook.PB_BUSINESS_NUMBER;
+	private static final String PB_EMAIL_ADDRESS = Phonebook.PB_EMAIL_ADDRESS;
+	private static final String PB_COMPANY_NAME = Phonebook.PB_COMPANY_NAME;
+	
+	private ContentResolver cr;
+	private String accName;
+	private String accType;
+	
+	public ContactAccessorNew() throws Exception {
+		Rhodes r = RhodesInstance.getInstance();
+		
+		Account[] accounts = AccountManager.get(r).getAccounts();
+		if (accounts.length == 0) {
+			accName = "rhodes@rhomobile.com";
+			accType = "com.rhomobile";
+		}
+		else {
+			Account acnt = accounts[0];
+			accName = acnt.name;
+			accType = acnt.type;
+		}
+		
+		cr = r.getContentResolver();
+	}
+	
+	private void fillName(String id, Contact contact) {
+		contact.setField(PB_FIRST_NAME, "");
+		contact.setField(PB_LAST_NAME, "");
+		
+		Cursor cursor = cr.query(Data.CONTENT_URI,
+				new String[] {StructuredName.DISPLAY_NAME},
+				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
+				new String[] {id, StructuredName.CONTENT_ITEM_TYPE},
+				null);
+		try {
+			if (!cursor.moveToFirst())
+				return;
+			
+			String name = cursor.getString(cursor.getColumnIndex(StructuredName.DISPLAY_NAME));
+			if (name != null) {
+				String[] names = name.split(" ");
+				if (names.length == 1) {
+					contact.setField(PB_FIRST_NAME, name);
+				}
+				else {
+					contact.setField(PB_FIRST_NAME, names[0]);
+					contact.setField(PB_LAST_NAME, names[1]);
+				}
+			}
+		}
+		finally {
+			cursor.close();
+		}
+	}
+	
+	private void fillPhones(String id, Contact contact) {
+		Cursor cursor = cr.query(Data.CONTENT_URI,
+				new String[] {Phone.NUMBER, Phone.TYPE},
+				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
+				new String[] {id, Phone.CONTENT_ITEM_TYPE},
+				null);
+		try {
+			if (!cursor.moveToFirst())
+				return;
+			
+			int numColumn = cursor.getColumnIndex(Phone.NUMBER);
+			int typeColumn = cursor.getColumnIndex(Phone.TYPE);
+			do {
+				switch (cursor.getInt(typeColumn)) {
+				case Phone.TYPE_HOME:
+					contact.setField(PB_HOME_NUMBER, cursor.getString(numColumn));
+					break;
+				case Phone.TYPE_WORK:
+					contact.setField(PB_BUSINESS_NUMBER, cursor.getString(numColumn));
+					break;
+				case Phone.TYPE_MOBILE:
+					contact.setField(PB_MOBILE_NUMBER, cursor.getString(numColumn));
+					break;
+				}
+			} while (cursor.moveToNext());
+		}
+		finally {
+			cursor.close();
+		}
+	}
+	
+	private void fillEmails(String id, Contact contact) {
+		Cursor cursor = cr.query(Data.CONTENT_URI,
+				new String[] {Email.DATA},
+				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
+				new String[] {id, Email.CONTENT_ITEM_TYPE},
+				null);
+		try {
+			if (!cursor.moveToFirst())
+				return;
+			
+			String data = cursor.getString(cursor.getColumnIndex(Email.DATA));
+			contact.setField(PB_EMAIL_ADDRESS, data);
+		}
+		finally {
+			cursor.close();
+		}
+	}
+	
+	private void fillCompany(String id, Contact contact) {
+		Cursor cursor = cr.query(Data.CONTENT_URI,
+				new String[] {Organization.COMPANY},
+				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
+				new String[] {id, Organization.CONTENT_ITEM_TYPE},
+				null);
+		try {
+			if (!cursor.moveToFirst())
+				return;
+			String company = cursor.getString(cursor.getColumnIndex(Organization.COMPANY));
+			contact.setField(PB_COMPANY_NAME, company);
+		}
+		finally {
+			cursor.close();
+		}
+	}
+
+	public Map<String, Contact> getAll() throws Exception {
+		Map<String, Contact> contacts = new HashMap<String, Contact>();
+		
+		Cursor cursor = cr.query(RawContacts.CONTENT_URI,
+				new String[] {RawContacts._ID},
+				RawContacts.DELETED + "=0", null, null);
+		try {
+			if (!cursor.moveToFirst())
+				return contacts;
+			
+			do {
+				Contact contact = new Contact();
+				
+				String id = cursor.getString(cursor.getColumnIndex(RawContacts._ID));
+				contact.setId(id);
+				
+				fillName(id, contact);
+				fillPhones(id, contact);
+				fillEmails(id, contact);
+				fillCompany(id, contact);
+				
+				contacts.put(contact.getField(PB_ID), contact);
+			} while (cursor.moveToNext());
+		}
+		finally {
+			cursor.close();
+		}
+		
+		return contacts;
+	}
+	
+	private void create(Contact contact) throws Exception {
+		String id = contact.id();
+		
+		if (id == null || id.length() == 0) {
+			ContentValues values = new ContentValues();
+			values.put(RawContacts.ACCOUNT_NAME, accName);
+			values.put(RawContacts.ACCOUNT_TYPE, accType);
+			values.put(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_DISABLED);
+			Uri uri = cr.insert(RawContacts.CONTENT_URI, values);
+			id = String.valueOf(ContentUris.parseId(uri));
+			contact.setId(id);
+		}
+	}
+	
+	private void saveData(Contact contact, ContentValues values, String where, String[] whereValues) throws Exception {
+		String id = contact.id();
+		values.put(Data.RAW_CONTACT_ID, Long.parseLong(id));
+		
+		// Search is there is already record with the same raw_contact_id and mimetype
+		long dataId = 0;
+		
+		StringBuilder w = new StringBuilder();
+		w.append(Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?");
+		if (where != null)
+			w.append(" AND " + where);
+		where = w.toString();
+		
+		String mimetype = (String)values.get(Data.MIMETYPE);
+		int wvSize = 2;
+		if (whereValues != null)
+			wvSize += whereValues.length;
+		String[] wv = new String[wvSize];
+		wv[0] = id;
+		wv[1] = mimetype;
+		if (whereValues != null)
+			System.arraycopy(whereValues, 0, wv, 2, whereValues.length);
+		
+		Cursor cursor = cr.query(Data.CONTENT_URI, new String[] {Data._ID}, where, wv, null);
+		try {
+			if (cursor.moveToFirst())
+				dataId = cursor.getLong(cursor.getColumnIndex(Data._ID));
+		}
+		finally {
+			cursor.close();
+		}
+		
+		// Do update if found, insert otherwise
+		if (dataId != 0)
+			cr.update(Data.CONTENT_URI, values,
+					Data._ID + "=?", new String[] {String.valueOf(dataId)});
+		else
+			cr.insert(Data.CONTENT_URI, values);
+	}
+	
+	private void saveData(Contact contact, ContentValues values) throws Exception {
+		saveData(contact, values, null, null);
+	}
+	
+	private void updateName(Contact contact) throws Exception {
+		String firstName = contact.getField(PB_FIRST_NAME);
+		String lastName = contact.getField(PB_LAST_NAME);
+
+		ContentValues values = new ContentValues();
+		values.put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
+		values.put(StructuredName.DISPLAY_NAME, firstName + " " + lastName);
+		values.put(StructuredName.GIVEN_NAME, firstName);
+		values.put(StructuredName.FAMILY_NAME, lastName);
+		saveData(contact, values);
+	}
+	
+	private void updatePhones(Contact contact) throws Exception {
+		String[] phones = {PB_MOBILE_NUMBER, PB_HOME_NUMBER, PB_BUSINESS_NUMBER};
+		int[] types = {Phone.TYPE_MOBILE, Phone.TYPE_HOME, Phone.TYPE_WORK};
+		
+		for (int i = 0; i < phones.length; ++i) {
+			String phName = phones[i];
+			String value = contact.getField(phName);
+			if (value == null || value.length() == 0)
+				continue;
+			
+			ContentValues values = new ContentValues();
+			values.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
+			values.put(Phone.NUMBER, value);
+			values.put(Phone.TYPE, types[i]);
+			saveData(contact, values, Phone.TYPE + "=?", new String[] {String.valueOf(types[i])});
+		}
+	}
+	
+	private void updateEmails(Contact contact) throws Exception {
+		String value = contact.getField(PB_EMAIL_ADDRESS);
+		if (value == null || value.length() == 0)
+			return;
+		
+		ContentValues values = new ContentValues();
+		values.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+		values.put(Email.DATA, value);
+		saveData(contact, values);
+	}
+	
+	private void updateCompany(Contact contact) throws Exception {
+		String value = contact.getField(PB_COMPANY_NAME);
+		if (value == null || value.length() == 0)
+			return;
+		
+		ContentValues values = new ContentValues();
+		values.put(Data.MIMETYPE, Organization.CONTENT_ITEM_TYPE);
+		values.put(Organization.COMPANY, value);
+		saveData(contact, values);
+	}
+
+	public void save(Contact contact) throws Exception {
+		create(contact);
+		
+		updateName(contact);
+		updatePhones(contact);
+		updateEmails(contact);
+		updateCompany(contact);
+	}
+	
+	public void remove(Contact contact) {
+		String id = contact.id();
+		if (id == null || id.length() == 0)
+			return;
+		cr.delete(RawContacts.CONTENT_URI, RawContacts._ID + "=?", new String[] {id});
+	}
+
+}