Fixes and improvements

src/org/linphone/ContactEditorFragment.java

@@ -33,7 +33,6 @@ import android.app.Dialog;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -41,7 +40,6 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
 import android.provider.MediaStore;
-import android.support.v4.content.CursorLoader;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -67,7 +65,7 @@ public class ContactEditorFragment extends Fragment {
 	private static final int ADD_PHOTO = 1337;
 	private static final int PHOTO_SIZE = 128;
 	
-	private boolean isNewContact = true;
+	private boolean isNewContact;
 	private LinphoneContact contact;
 	private List<NewOrUpdatedNumberOrAddress> numbersAndAddresses;
 	private int firstSipAddressIndex = -1;
@@ -80,6 +78,8 @@ public class ContactEditorFragment extends Fragment {
 		this.inflater = inflater;
 		
 		contact = null;
+		isNewContact = true;
+		
 		if (getArguments() != null) {
 			Serializable obj = getArguments().getSerializable("Contact");
 			if (obj != null) {
@@ -88,10 +88,8 @@ public class ContactEditorFragment extends Fragment {
 				if (getArguments().getString("NewSipAdress") != null) {
 					newSipOrNumberToAdd = getArguments().getString("NewSipAdress");
 				}
-
 			} else if (getArguments().getString("NewSipAdress") != null) {
 				newSipOrNumberToAdd = getArguments().getString("NewSipAdress");
-				isNewContact = true;
 			}
 		}
 
@@ -257,7 +255,11 @@ public class ContactEditorFragment extends Fragment {
 		}
 
 		contactPicture = (ImageView) view.findViewById(R.id.contact_picture);
+		if (contact != null) {
 			LinphoneUtils.setImagePictureFromUri(getActivity(), contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
+		} else {
+			contactPicture.setImageResource(R.drawable.avatar);
+		}
 
 		contactPicture.setOnClickListener(new OnClickListener() {
 			@Override
@@ -341,19 +343,6 @@ public class ContactEditorFragment extends Fragment {
 		startActivityForResult(chooserIntent, ADD_PHOTO);
 	}
 
-	public String getRealPathFromURI(Uri contentUri) {
-		String[] proj = {MediaStore.Images.Media.DATA};
-		CursorLoader loader = new CursorLoader(getActivity(), contentUri, proj, null, null, null);
-		Cursor cursor = loader.loadInBackground();
-		if (cursor != null && cursor.moveToFirst()) {
-			int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-			String result = cursor.getString(column_index);
-			cursor.close();
-			return result;
-		}
-		return null;
-	}
-
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {

src/org/linphone/LinphoneContact.java

@@ -123,6 +123,7 @@ public class LinphoneContact implements Serializable {
 				}
 			} else {
 				String id = findDataId(getAndroidId());
+				if (id != null) {
 					changesToCommit.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
 						.withSelection(ContactsContract.Data._ID + "= ?", new String[] { id })
 						.withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
@@ -131,6 +132,7 @@ public class LinphoneContact implements Serializable {
 				}
 			}
 		}
+	}
 
 	public void addNumberOrAddress(LinphoneNumberOrAddress noa) {
 		if (noa == null) return;
@@ -171,8 +173,7 @@ public class LinphoneContact implements Serializable {
 	}
 	
 	public void save() {
-		if (ContactsManager.getInstance().hasContactsAccess()) {
+		if (isAndroidContact() && ContactsManager.getInstance().hasContactsAccess() && changesToCommit.size() > 0) {
-			if (isAndroidContact()) {
 			try {
 				ContactsManager.getInstance().getContentResolver().applyBatch(ContactsContract.AUTHORITY, changesToCommit);
 			} catch (Exception e) {
@@ -180,7 +181,6 @@ public class LinphoneContact implements Serializable {
 			} finally {
 				changesToCommit = new ArrayList<ContentProviderOperation>();
 			}
-			}
 		} else {
 			if (friend == null) {
 				friend = LinphoneCoreFactory.instance().createLinphoneFriend();
@@ -193,16 +193,8 @@ public class LinphoneContact implements Serializable {
 		if (isAndroidContact()) {
 			String select = ContactsContract.Data.CONTACT_ID + " = ?";
 			String[] args = new String[] { getAndroidId() };
-	
+			changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI).withSelection(select, args).build());
-			ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+			save();
-			ops.add(ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI).withSelection(select, args).build());
-	
-			ContentResolver cr = ContactsManager.getInstance().getContentResolver();
-			try {
-				cr.applyBatch(ContactsContract.AUTHORITY, ops);
-			} catch (Exception e) {
-				Log.e(e);
-			}
 		}
 		deleteFriend();
 	}