Clear reply after image as well as text reply
(cherry picked from commit 017b77489adf24f019ad92e631f837f27f6b5da6)
This commit is contained in:
parent
78dc6c3ec7
commit
22dbc22393
1 changed files with 1 additions and 2 deletions
|
@ -1223,7 +1223,6 @@ public class ConversationFragment extends XmppFragment
|
||||||
reactionBuilder.addAll(aggregated.ourReactions);
|
reactionBuilder.addAll(aggregated.ourReactions);
|
||||||
reactionBuilder.add(body.toString().replaceAll("\\s", ""));
|
reactionBuilder.add(body.toString().replaceAll("\\s", ""));
|
||||||
activity.xmppConnectionService.sendReactions(conversation.getReplyTo(), reactionBuilder.build());
|
activity.xmppConnectionService.sendReactions(conversation.getReplyTo(), reactionBuilder.build());
|
||||||
setupReply(null);
|
|
||||||
messageSent();
|
messageSent();
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1287,7 +1286,6 @@ public class ConversationFragment extends XmppFragment
|
||||||
if (message.getStatus() == Message.STATUS_WAITING) {
|
if (message.getStatus() == Message.STATUS_WAITING) {
|
||||||
if (sendAt != null) message.setTime(sendAt);
|
if (sendAt != null) message.setTime(sendAt);
|
||||||
activity.xmppConnectionService.updateMessage(message);
|
activity.xmppConnectionService.updateMessage(message);
|
||||||
setupReply(null);
|
|
||||||
messageSent();
|
messageSent();
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
@ -4386,6 +4384,7 @@ public class ConversationFragment extends XmppFragment
|
||||||
binding.textinputSubject.setText("");
|
binding.textinputSubject.setText("");
|
||||||
binding.textinputSubject.setVisibility(View.GONE);
|
binding.textinputSubject.setVisibility(View.GONE);
|
||||||
setThread(null);
|
setThread(null);
|
||||||
|
setupReply(null);
|
||||||
conversation.setUserSelectedThread(false);
|
conversation.setUserSelectedThread(false);
|
||||||
mSendingPgpMessage.set(false);
|
mSendingPgpMessage.set(false);
|
||||||
this.binding.textinput.setText("");
|
this.binding.textinput.setText("");
|
||||||
|
|
Loading…
Reference in a new issue