mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fix for contacts

Browse source
This commit is contained in:
Sylvain Berfini 2019-05-24 10:33:16 +02:00
parent 89806eee7a
commit c6efca38c3
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,9 @@ class AndroidContact implements Serializable {
protected AndroidContact() {
mChangesToCommit = new ArrayList<>();
mAndroidId = null;
mAndroidRawId = null;
mAndroidLookupKey = null;
isAndroidRawIdLinphone = false;
}

17
app/src/main/java/org/linphone/contacts/LinphoneContact.java
View file

@ -51,10 +51,14 @@ public class LinphoneContact extends AndroidContact
public LinphoneContact() {
super();
mAddresses = new ArrayList<>();
mFullName = null;
mFirstName = null;
mLastName = null;
mOrganization = null;
mAndroidId = null;
mAndroidLookupKey = null;
mThumbnailUri = null;
mAddresses = new ArrayList<>();
mPhotoUri = null;
mHasSipAddress = false;
}
@ -491,7 +495,7 @@ public class LinphoneContact extends AndroidContact
.query(
ContactsContract.Data.CONTENT_URI,
AsyncContactsLoader.PROJECTION,
ContactsContract.Data.IN_VISIBLE_GROUP
ContactsContract.Data.IN_DEFAULT_DIRECTORY
+ " == 1 AND "
+ ContactsContract.Data.CONTACT_ID
+ " == "
@ -517,8 +521,13 @@ public class LinphoneContact extends AndroidContact
String data4 = c.getString(c.getColumnIndex("data4"));
String lookupKey = c.getString(c.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));
setAndroidLookupKey(lookupKey);
setFullName(displayName);
if (getAndroidLookupKey() == null) {
setAndroidLookupKey(lookupKey);
}
if (getFullName() == null) {
setFullName(displayName);
}
if (ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(mime)) {
addNumberOrAddress(new LinphoneNumberOrAddress(data1, data4));