Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Almost finished contact edition

Browse source
This commit is contained in:
Sylvain Berfini 2018-12-08 16:20:39 +01:00
parent 46319c6e20
commit a18c2262dc
1 changed files with 93 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
app/src/main/java/org/linphone/contacts/AndroidContact.java
View file

@ -232,7 +232,7 @@ class AndroidContact implements Serializable {
}
if (oldValueToReplace != null) {
if (mAndroidId != null) {
if (mAndroidId == null) {
Log.e("[Contact] Can't update a number or address in non existing contact");
return;
}
@ -244,7 +244,63 @@ class AndroidContact implements Serializable {
+ value
+ " in contact "
+ mAndroidId);
// TODO
if (isSIP) {
String select =
ContactsContract.Data.CONTACT_ID
+ "=? AND ("
+ ContactsContract.Data.MIMETYPE
+ "=? OR "
+ ContactsContract.Data.MIMETYPE
+ "=? OR "
+ ContactsContract.Data.MIMETYPE
+ "=?) AND data1=?";
String[] args =
new String[] {
mAndroidId,
"vnd.android.cursor.item/org.linphone.profile", // Old value
ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type),
ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
oldValueToReplace
};
addChangesToCommit(
ContentProviderOperation.newUpdate(Data.CONTENT_URI)
.withSelection(select, args)
.withValue(
Data.MIMETYPE,
ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type))
.withValue("data1", value) // Value
.withValue(
"data2",
ContactsManager.getInstance()
.getString(R.string.app_name)) // Summary
.withValue("data3", value) // Detail
.build());
} else {
String select =
ContactsContract.Data.CONTACT_ID
+ "=? AND "
+ ContactsContract.Data.MIMETYPE
+ "=? AND data1=?";
String[] args =
new String[] {
mAndroidId,
ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
oldValueToReplace
};
addChangesToCommit(
ContentProviderOperation.newUpdate(Data.CONTENT_URI)
.withSelection(select, args)
.withValue(Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
.withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, value)
.withValue(
ContactsContract.CommonDataKinds.Phone.TYPE,
CommonDataKinds.Phone.TYPE_MOBILE)
.build());
}
} else {
if (mAndroidId == null) {
Log.i("[Contact] Adding number or address " + value + " to new contact.");
@ -281,6 +337,33 @@ class AndroidContact implements Serializable {
+ value
+ " to existing contact "
+ mAndroidId);
if (isSIP) {
addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValue(ContactsContract.Data.RAW_CONTACT_ID, mAndroidRawId)
.withValue(
Data.MIMETYPE,
ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type))
.withValue("data1", value) // Value
.withValue(
"data2",
ContactsManager.getInstance()
.getString(R.string.app_name)) // Summary
.withValue("data3", value) // Detail
.build());
} else {
addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValue(ContactsContract.Data.RAW_CONTACT_ID, mAndroidRawId)
.withValue(
Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
.withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, value)
.withValue(
ContactsContract.CommonDataKinds.Phone.TYPE,
CommonDataKinds.Phone.TYPE_MOBILE)
.build());
}
}
}
}
@ -303,14 +386,20 @@ class AndroidContact implements Serializable {
if (isSIP) {
String select =
ContactsContract.Data.CONTACT_ID
+ "=? AND "
+ "=? AND ("
+ ContactsContract.Data.MIMETYPE
+ "=? AND data1=?";
+ "=? OR "
+ ContactsContract.Data.MIMETYPE
+ "=? OR "
+ ContactsContract.Data.MIMETYPE
+ "=?) AND data1=?";
String[] args =
new String[] {
mAndroidId,
"vnd.android.cursor.item/org.linphone.profile", // Old value
ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type),
ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
noa
};