TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed quotes not being cleared when forwarding.

Browse Source 
Fixes #8748
Fixes #7935
This commit is contained in:
Greyson Parrelli 2019-04-09 09:35:47 -04:00
parent ecdc285378
commit bceb9b4972
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

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

3
src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

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