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

Updated submodules for other performance improvements

Browse source
This commit is contained in:
Sylvain Berfini 2017-01-19 17:53:03 +01:00
parent 06da98f191
commit 67ab580bf5
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneFriendImpl;
import org.linphone.core.LinphoneFriendList; import org.linphone.core.LinphoneFriendList;
import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneProxyConfig;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
@ -295,14 +296,10 @@ public class ContactsManager extends ContentObserver {
} }
public synchronized void refreshSipContact(LinphoneFriend lf) { public synchronized void refreshSipContact(LinphoneFriend lf) {
for (LinphoneContact contact : contacts) { LinphoneContact contact = ((LinphoneFriendImpl)lf).getLinphoneContact();
if (contact.getLinphoneFriend() == lf) { if (!sipContacts.contains(contact)) {
if (contact.isInLinphoneFriendList() && !sipContacts.contains(contact)) {
sipContacts.add(contact); sipContacts.add(contact);
} }
break;
}
}
Collections.sort(sipContacts); Collections.sort(sipContacts);
for (ContactsUpdatedListener listener : contactsUpdatedListeners) { for (ContactsUpdatedListener listener : contactsUpdatedListeners) {

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

@ -28,6 +28,7 @@ import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneFriendImpl;
import org.linphone.core.LinphoneFriend.SubscribePolicy; import org.linphone.core.LinphoneFriend.SubscribePolicy;
import org.linphone.core.PresenceBasicStatus; import org.linphone.core.PresenceBasicStatus;
import org.linphone.core.PresenceModel; import org.linphone.core.PresenceModel;
@ -415,6 +416,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
if (isAndroidContact()) { if (isAndroidContact()) {
friend.setRefKey(getAndroidId()); friend.setRefKey(getAndroidId());
} }
((LinphoneFriendImpl)friend).setLinphoneContact(this);
created = true; created = true;
} }
if (isLinphoneFriend()) { if (isLinphoneFriend()) {
@ -571,6 +573,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
public void setFriend(LinphoneFriend f) { public void setFriend(LinphoneFriend f) {
friend = f; friend = f;
((LinphoneFriendImpl)friend).setLinphoneContact(this);
} }
public void getAndroidIds() { public void getAndroidIds() {
@ -702,6 +705,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
friend.enableSubscribes(false); friend.enableSubscribes(false);
friend.setIncSubscribePolicy(SubscribePolicy.SPDeny); friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
contact.friend = friend; contact.friend = friend;
((LinphoneFriendImpl)friend).setLinphoneContact(contact);
return contact; return contact;
} }

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84 Subproject commit 0e43266edc3360de55113c540444fb3fcbc44cf3

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit b1695fb52ede996ed0b50167aab787d1373f49e4 Subproject commit 13e7e7d933daeb697946816f5c81a355bf47c219

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2b407fabfae4db9029190444b3c59ffee39b1efd Subproject commit 5500c7455d75f083a8dd3bbaebd42fb13f40b626