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

More performances improvements for contacts

Browse source
This commit is contained in:
Sylvain Berfini 2017-01-17 17:36:05 +01:00
parent 6b7f5c789c
commit 6f3059444f
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/org/linphone/ContactsManager.java
View file

@ -328,6 +328,13 @@ public class ContactsManager extends ContentObserver {
} else { } else {
Log.w("[Permission] Read contacts permission wasn't granted, only fetch LinphoneFriends"); Log.w("[Permission] Read contacts permission wasn't granted, only fetch LinphoneFriends");
} }
long timeElapsed = (new Date()).getTime() - contactsTime.getTime();
String time = String.format("%02d:%02d",
TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
Log.i("[ContactsManager] got " + contacts.size() + " contacts names and pictures in " + time);
//We need to check sometimes to know if Linphone was destroyed //We need to check sometimes to know if Linphone was destroyed
if (this.isCancelled()) { if (this.isCancelled()) {
return null; return null;
@ -387,12 +394,12 @@ public class ContactsManager extends ContentObserver {
} }
Collections.sort(contacts); Collections.sort(contacts);
long timeElapsed = (new Date()).getTime() - contactsTime.getTime(); timeElapsed = (new Date()).getTime() - contactsTime.getTime();
String time = String.format("%02d:%02d", time = String.format("%02d:%02d",
TimeUnit.MILLISECONDS.toMinutes(timeElapsed), TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
TimeUnit.MILLISECONDS.toSeconds(timeElapsed) - TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed))); TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
Log.i("[ContactsManager] minimal informations for " + contacts.size() + " contacts gathered in " + time); Log.i("[ContactsManager] organization, SIP and phone numbers for " + contacts.size() + " contacts fetched in " + time);
// Public the current list of contacts without all the informations populated // Public the current list of contacts without all the informations populated
publishProgress(contacts); publishProgress(contacts);
@ -409,7 +416,7 @@ public class ContactsManager extends ContentObserver {
TimeUnit.MILLISECONDS.toMinutes(timeElapsed), TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
TimeUnit.MILLISECONDS.toSeconds(timeElapsed) - TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed))); TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
Log.i("[ContactsManager] complete informations for " + contacts.size() + " contacts gathered in " + time); Log.i("[ContactsManager] linphone friends for " + contacts.size() + " contacts created in " + time);
return contacts; return contacts;
} }

6
src/org/linphone/LinphoneContact.java
View file

@ -392,6 +392,8 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
public void setAndroidId(String id) { public void setAndroidId(String id) {
androidId = id; androidId = id;
setThumbnailUri(getContactThumbnailPictureUri());
setPhotoUri(getContactPictureUri());
} }
public String getAndroidId() { public String getAndroidId() {
@ -419,9 +421,9 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
if (lc == null) return; if (lc == null) return;
friend.edit(); friend.edit();
friend.setName(fullName);
friend.setFamilyName(lastName); friend.setFamilyName(lastName);
friend.setGivenName(firstName); friend.setGivenName(firstName);
friend.setName(fullName);
for (LinphoneAddress address : friend.getAddresses()) { for (LinphoneAddress address : friend.getAddresses()) {
friend.removeAddress(address); friend.removeAddress(address);
@ -504,8 +506,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
if (isAndroidContact()) { if (isAndroidContact()) {
getContactNames(); getContactNames();
getNativeContactOrganization(); getNativeContactOrganization();
setThumbnailUri(getContactThumbnailPictureUri());
setPhotoUri(getContactPictureUri());
for (LinphoneNumberOrAddress noa : getAddressesAndNumbersForAndroidContact()) { for (LinphoneNumberOrAddress noa : getAddressesAndNumbersForAndroidContact()) {
addNumberOrAddress(noa); addNumberOrAddress(noa);

1
src/org/linphone/LinphoneUtils.java
View file

@ -269,7 +269,6 @@ public final class LinphoneUtils {
try { try {
bm = MediaStore.Images.Media.getBitmap(c.getContentResolver(),tUri); bm = MediaStore.Images.Media.getBitmap(c.getContentResolver(),tUri);
} catch (IOException e) { } catch (IOException e) {
Log.e(e.getMessage());
} }
if (bm != null) { if (bm != null) {
view.setImageBitmap(bm); view.setImageBitmap(bm);

2
submodules/belcard

@ -1 +1 @@
Subproject commit f5a8603f8e379486d3a4bfa4d74861b0a2d880dd Subproject commit ebd037585965ce80f01be5290abc7e5455009eb8

2
submodules/linphone

@ -1 +1 @@
Subproject commit 289d4bb36501671f7cc96cafa134e019faf3d108 Subproject commit c5bce292df15812c68cc2c0487b836e28d76250c