From 509cede35fac6d1866fc3ad44575e19bb2422dd2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 15 Oct 2015 21:50:37 +0200 Subject: [PATCH 1/7] update submodules --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 1ced63785..2b7d1ea10 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1ced637855bb052f2475847c867f648338b84376 +Subproject commit 2b7d1ea10e3080e06c58869c47dbd58ecccb32fd diff --git a/submodules/linphone b/submodules/linphone index d3bd19d39..a14f79290 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d3bd19d39ddeee28505c12b9013088d0c3a67204 +Subproject commit a14f7929053bd24b26759014dc4bb06b47629d01 From 4a8c19e9f02352ec16e7ec5b3d141ee2488f1d5d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 18 Oct 2015 17:38:28 +0200 Subject: [PATCH 2/7] update linphone and belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 2b7d1ea10..92d92a52a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 2b7d1ea10e3080e06c58869c47dbd58ecccb32fd +Subproject commit 92d92a52a0d5af71bb2135146b36ed4167deade0 diff --git a/submodules/linphone b/submodules/linphone index a14f79290..08d0a6089 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a14f7929053bd24b26759014dc4bb06b47629d01 +Subproject commit 08d0a6089c16aea378521eb0264866938b87958a From 04fb7ad03cddf17838c6b00639cbc59e18cefb78 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 19 Oct 2015 15:04:52 +0200 Subject: [PATCH 3/7] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 92d92a52a..611b6c3b1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 92d92a52a0d5af71bb2135146b36ed4167deade0 +Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783 diff --git a/submodules/linphone b/submodules/linphone index 08d0a6089..bef54eb2f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 08d0a6089c16aea378521eb0264866938b87958a +Subproject commit bef54eb2f00f51362b857e8e78c512d37d7f3b8c From 48fde80cd1617b1dc0dbf473ea131f4f9c955ba6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 19 Oct 2015 16:20:26 +0200 Subject: [PATCH 4/7] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bef54eb2f..c1f90bf28 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bef54eb2f00f51362b857e8e78c512d37d7f3b8c +Subproject commit c1f90bf28303de890bcd2e5de9eb090de97cbe55 From 1ae1e7778bde1a6d4921d572493257030336cc0c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Oct 2015 15:00:14 +0200 Subject: [PATCH 5/7] Updated linphone submodule to fix crash in call with audio, video and text --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c1f90bf28..d2581d19f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c1f90bf28303de890bcd2e5de9eb090de97cbe55 +Subproject commit d2581d19f26bff8db9eeb490900bb8b4692b0865 From 505f4274d5f94191dddc589d17434afc957b5a1a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Oct 2015 22:47:42 +0200 Subject: [PATCH 6/7] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d2581d19f..847f56bb4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d2581d19f26bff8db9eeb490900bb8b4692b0865 +Subproject commit 847f56bb4c91032c44335df53fb10bdb1001f8d6 From c2482410b7352f1e065b5dac6efa8a9c1f170b84 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 22 Oct 2015 08:59:08 +0200 Subject: [PATCH 7/7] Prevent crash when remote provisioning contains linphone friends --- src/org/linphone/Contact.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/linphone/Contact.java b/src/org/linphone/Contact.java index ac9b04c4b..803799d9a 100644 --- a/src/org/linphone/Contact.java +++ b/src/org/linphone/Contact.java @@ -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()); }