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

Fixed tester compil

Browse source
This commit is contained in:
Sylvain Berfini 2017-01-20 10:01:47 +01:00
parent 67ab580bf5
commit 6dc7daa8f9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,7 +296,7 @@ public class ContactsManager extends ContentObserver {
} }
public synchronized void refreshSipContact(LinphoneFriend lf) { public synchronized void refreshSipContact(LinphoneFriend lf) {
LinphoneContact contact = ((LinphoneFriendImpl)lf).getLinphoneContact(); LinphoneContact contact = (LinphoneContact)((LinphoneFriendImpl)lf).getUserData();
if (!sipContacts.contains(contact)) { if (!sipContacts.contains(contact)) {
sipContacts.add(contact); sipContacts.add(contact);
} }

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

@ -416,7 +416,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
if (isAndroidContact()) { if (isAndroidContact()) {
friend.setRefKey(getAndroidId()); friend.setRefKey(getAndroidId());
} }
((LinphoneFriendImpl)friend).setLinphoneContact(this); ((LinphoneFriendImpl)friend).setUserData(this);
created = true; created = true;
} }
if (isLinphoneFriend()) { if (isLinphoneFriend()) {
@ -573,7 +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); ((LinphoneFriendImpl)friend).setUserData(this);
} }
public void getAndroidIds() { public void getAndroidIds() {
@ -705,7 +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); ((LinphoneFriendImpl)friend).setUserData(contact);
return contact; return contact;
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 5500c7455d75f083a8dd3bbaebd42fb13f40b626 Subproject commit e2a58c43ef0193b33346272ee3a2a9aadd53b7b5