From b443b6efea884a9b4022ff7e76ab90669e9bfba1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 21 Nov 2017 17:48:35 +0100 Subject: [PATCH] Updated submodules, chat rooms broken --- src/android/org/linphone/chat/GroupChatFragment.java | 5 +++++ src/android/org/linphone/chat/GroupInfoFragment.java | 5 +++++ submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/oRTP | 2 +- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index 51a30d8cf..995a6c796 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -554,6 +554,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con mEventsAdapter.addToHistory(event); } + @Override + public void onConferenceAddressGeneration(ChatRoom cr) { + + } + @Override public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) { final Address from = msg.getFromAddress(); diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java index 7077f085d..bc0d9ab2c 100644 --- a/src/android/org/linphone/chat/GroupInfoFragment.java +++ b/src/android/org/linphone/chat/GroupInfoFragment.java @@ -363,6 +363,11 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener { } + @Override + public void onConferenceAddressGeneration(ChatRoom cr) { + + } + @Override public void onChatMessageReceived(ChatRoom cr, EventLog event_log) { diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 2adc98d22..81867f1d8 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 2adc98d22e70e9ca74631a04854cfe1e289e18fb +Subproject commit 81867f1d8c26a10db632f9d0c1a61afa14d58432 diff --git a/submodules/belle-sip b/submodules/belle-sip index 51906fb43..a30ce5f12 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 51906fb43d56a698f86f5d72b3fe0ead4ad22910 +Subproject commit a30ce5f124df96575a1f7aadd68f57f73a19c75c diff --git a/submodules/linphone b/submodules/linphone index 54ed67984..6611f820f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 54ed679844063cefecbbf1a581b8c9bf64342d04 +Subproject commit 6611f820f3f48a11291e3d3802f8cdc29b0a7aa0 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index eeac01685..f82450663 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit eeac016851352b9919a902be43460ba0a94c8fb7 +Subproject commit f82450663f3d89aa6aa4dc4bae7d060b3a5be495 diff --git a/submodules/oRTP b/submodules/oRTP index 8c1bcc3b0..3319a460d 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 8c1bcc3b0f66808c2a45769d5fc75b2f13e3e249 +Subproject commit 3319a460d5f55b343899c091cb15c395a4f3fea4