From 502af0ae40fb357ed8ac942ab7964e8684fb42a8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 5 Dec 2017 12:01:27 +0100 Subject: [PATCH] Updated linphone --- src/android/org/linphone/chat/GroupChatFragment.java | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index 5a9c5ac69..3a0cf59af 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -512,7 +512,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con String text = mMessageTextToSend.getText().toString(); ChatMessage msg; - // For now we have to either send the picture or the text but not both + //TODO: rework when we'll send multiple files at once if (mFilesUploadLayout.getChildCount() > 0) { String filePath = (String) mFilesUploadLayout.getChildAt(0).getTag(); String fileName = filePath.substring(filePath.lastIndexOf("/") + 1); diff --git a/submodules/linphone b/submodules/linphone index 979082687..385aeb335 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 979082687f22dd787d5ebaab11b5b72ad9f1281a +Subproject commit 385aeb3357513bdc7d92dcb03a194036854be629