Fixed quotes not being cleared when forwarding.

Fixes #8748
Fixes #7935
master
Greyson Parrelli 2019-04-09 09:35:47 -04:00
parent ecdc285378
commit bceb9b4972
2 changed files with 8 additions and 0 deletions

View File

@ -2542,6 +2542,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
searchViewItem.collapseActionView();
}
@Override
public void onForwardClicked() {
inputPanel.clearQuote();
}
@Override
public void onAttachmentChanged() {
handleSecurityChange(isSecureText, isDefaultSms);

View File

@ -520,6 +520,8 @@ public class ConversationFragment extends Fragment
}
private void handleForwardMessage(MessageRecord message) {
listener.onForwardClicked();
SimpleTask.run(getLifecycle(), () -> {
Intent composeIntent = new Intent(getActivity(), ShareActivity.class);
composeIntent.putExtra(Intent.EXTRA_TEXT, message.getDisplayBody(requireContext()).toString());
@ -803,6 +805,7 @@ public class ConversationFragment extends Fragment
void setThreadId(long threadId);
void handleReplyMessage(MessageRecord messageRecord);
void onMessageActionToolbarOpened();
void onForwardClicked();
}
private class ConversationScrollListener extends OnScrollListener {