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

Updated linphone

Browse source
This commit is contained in:
Sylvain Berfini 2017-12-05 12:01:27 +01:00
parent 838724ccee
commit 502af0ae40
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -512,7 +512,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
String text = mMessageTextToSend.getText().toString(); String text = mMessageTextToSend.getText().toString();
ChatMessage msg; 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) { if (mFilesUploadLayout.getChildCount() > 0) {
String filePath = (String) mFilesUploadLayout.getChildAt(0).getTag(); String filePath = (String) mFilesUploadLayout.getChildAt(0).getTag();
String fileName = filePath.substring(filePath.lastIndexOf("/") + 1); String fileName = filePath.substring(filePath.lastIndexOf("/") + 1);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 979082687f22dd787d5ebaab11b5b72ad9f1281a Subproject commit 385aeb3357513bdc7d92dcb03a194036854be629