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

Merge remote-tracking branch 'android-master/master' into 3.0.X

Browse source
This commit is contained in:
Margaux Clerc 2015-10-27 09:40:46 +01:00
commit b9f082496a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public class Contact implements Serializable {
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if(lc != null && lc.getFriendList() != null) {
for (LinphoneFriend friend :lc.getFriendList()){
if (friend.getRefKey().equals(id)) {
if (id.equals(friend.getRefKey())) {
hasFriends = true;
this.numbersOrAddresses.add(friend.getAddress().asStringUriOnly());
}

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 1ced637855bb052f2475847c867f648338b84376
Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783

2
submodules/linphone

@ -1 +1 @@
Subproject commit d3bd19d39ddeee28505c12b9013088d0c3a67204
Subproject commit 847f56bb4c91032c44335df53fb10bdb1001f8d6