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

Fixed contact compareTo()

Browse source
This commit is contained in:
Sylvain Berfini 2020-02-21 11:00:00 +01:00
parent 10d99dd596
commit 2d5ddf869d
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,26 +90,29 @@ public class LinphoneContact extends AndroidContact
String contactFullName = contact.getFullName() != null ? contact.getFullName() : ""; String contactFullName = contact.getFullName() != null ? contact.getFullName() : "";
if (fullName.equals(contactFullName)) { if (fullName.equals(contactFullName)) {
if (getAndroidId() != null) { String id = getAndroidId() != null ? getAndroidId() : "";
if (contact.getAndroidId() != null) { String contactId = contact.getAndroidId() != null ? contact.getAndroidId() : "";
int idComp = getAndroidId().compareTo(contact.getAndroidId());
if (idComp == 0) return 0; if (id.equals(contactId)) {
List<LinphoneNumberOrAddress> noas1 = getNumbersOrAddresses(); List<LinphoneNumberOrAddress> noas1 = getNumbersOrAddresses();
List<LinphoneNumberOrAddress> noas2 = contact.getNumbersOrAddresses(); List<LinphoneNumberOrAddress> noas2 = contact.getNumbersOrAddresses();
if (noas1.size() == noas2.size() && noas1.size() > 0) {
if (noas1.size() == noas2.size()) { if (!noas1.containsAll(noas2) || !noas2.containsAll(noas1)) {
if (noas1.containsAll(noas2) && noas2.containsAll(noas1)) { for (int i = 0; i < noas1.size(); i++) {
return 0; int compare = noas1.get(i).compareTo(noas2.get(i));
if (compare != 0) return compare;
} }
return -1;
} }
} else {
return Integer.compare(noas1.size(), noas2.size()); return Integer.compare(noas1.size(), noas2.size());
} }
return -1;
String org = getOrganization() != null ? getOrganization() : "";
String contactOrg =
contact.getOrganization() != null ? contact.getOrganization() : "";
return org.compareTo(contactOrg);
} }
if (contact.getAndroidId() != null) return 1; return id.compareTo(contactId);
return 0;
} }
return fullName.compareTo(contactFullName); return fullName.compareTo(contactFullName);
} }