From 837879dffe287ae4d15bb4fd24b741d20738064e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 19 Mar 2018 17:11:59 +0100
Subject: [PATCH] Update linphone and mediastreamer2, re-enable ice. [--force]
 because I switch submodules/linphone to dev_refactor_cpp branch

---
 res/raw/linphonerc_factory                      |  2 +-
 .../org/linphone/chat/GroupChatFragment.java    | 17 ++++++++++++-----
 .../org/linphone/chat/GroupInfoFragment.java    | 17 ++++++++++++-----
 submodules/linphone                             |  2 +-
 submodules/mediastreamer2                       |  2 +-
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 815e1ce9d..c3550c3cb 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -7,7 +7,7 @@ mtu=1300
 #Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
 download_bw=0
 upload_bw=0
-force_ice_disablement=1
+force_ice_disablement=0
 
 [sip]
 guess_hostname=1
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index f6bc5a414..076bddd50 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -608,6 +608,18 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	public void onConferenceAddressGeneration(ChatRoom cr) {
 
 	}
+	
+	@Override
+	public void onParticipantDeviceFetchRequested(ChatRoom cr, Address addr) {
+
+	}
+	@Override
+	public void onParticipantRegistrationSubscriptionRequested(ChatRoom cr, Address participantAddr){
+	}
+	
+	@Override
+	public void onParticipantRegistrationUnsubscriptionRequested(ChatRoom cr, Address participantAddr){
+	}
 
 	@Override
 	public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) {
@@ -760,11 +772,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	}
 
-	@Override
-	public void onParticipantDeviceFetched(ChatRoom cr, Address participantAddr) {
-
-	}
-
 	@Override
 	public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
 		if (mChatRoom.hasBeenLeft()) {
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index ee0ee8ed8..45579b9e5 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -449,11 +449,6 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 
 	}
 
-	@Override
-	public void onParticipantDeviceFetched(ChatRoom cr, Address participantAddr) {
-
-	}
-
 	@Override
 	public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) {
 
@@ -463,4 +458,16 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 	public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
 
 	}
+	
+	@Override
+	public void onParticipantDeviceFetchRequested(ChatRoom cr, Address addr) {
+
+	}
+	@Override
+	public void onParticipantRegistrationSubscriptionRequested(ChatRoom cr, Address participantAddr){
+	}
+	
+	@Override
+	public void onParticipantRegistrationUnsubscriptionRequested(ChatRoom cr, Address participantAddr){
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index 6d6ee9691..6c7c56271 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6d6ee9691c19febf5e8a092239fa7d1e0cd5388b
+Subproject commit 6c7c56271a261af359a587a06916d8309f47003f
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index e20c2ed9a..f49b3d5ea 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111
+Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765