From da46f3384483e2a4d89914130620b7dad22c816a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 1 Nov 2017 18:13:18 +0100 Subject: [PATCH] Fixed send message button enabled when it shouldn't and disabled when it shoudln't --- src/android/org/linphone/chat/GroupChatFragment.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index c3dc468ff..b8c80c7e5 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -215,6 +215,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con }); mSendMessageButton = view.findViewById(R.id.send_message); + mSendMessageButton.setEnabled(false); mSendMessageButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -229,7 +230,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con @Override public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - mSendMessageButton.setEnabled(mMessageTextToSend.getText().length() > 0); + mSendMessageButton.setEnabled(mMessageTextToSend.getText().length() > 0 || mFilesUploadLayout.getChildCount() > 0); if (mChatRoom != null) { mChatRoom.compose(); } @@ -505,12 +506,14 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con View pendingImage = (View)view.getTag(); mFilesUploadLayout.removeView(pendingImage); mAttachImageButton.setEnabled(true); + mSendMessageButton.setEnabled(mMessageTextToSend.getText().length() > 0 || mFilesUploadLayout.getChildCount() > 0); } }); mFilesUploadLayout.addView(pendingFile); mAttachImageButton.setEnabled(false); // For now limit file per message to 1 + mSendMessageButton.setEnabled(true); } private void addImageToPendingList(String path) { @@ -530,12 +533,14 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con View pendingImage = (View)view.getTag(); mFilesUploadLayout.removeView(pendingImage); mAttachImageButton.setEnabled(true); + mSendMessageButton.setEnabled(mMessageTextToSend.getText().length() > 0 || mFilesUploadLayout.getChildCount() > 0); } }); mFilesUploadLayout.addView(pendingImage); mAttachImageButton.setEnabled(false); // For now limit file per message to 1 + mSendMessageButton.setEnabled(true); } private void sendMessage() {