yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

do no clear controls on saving drafts, we save drafts in onPause() now and the activity may be resumed

Browse source
This commit is contained in:
B. Petersen 2020-01-25 23:17:18 +01:00
parent c0837b4799
commit 1b836af961
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -953,7 +953,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
} }
//////// send message //////// send message or save draft
protected static final int ACTION_SEND_OUT = 1; protected static final int ACTION_SEND_OUT = 1;
protected static final int ACTION_SAVE_DRAFT = 2; protected static final int ACTION_SAVE_DRAFT = 2;
@ -971,10 +971,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
DcMsg msg = null; DcMsg msg = null;
Integer recompress = 0; Integer recompress = 0;
composeText.setText(""); // for a quick ui feedback, we clear the related controls immediately on sending messages.
// for drafts, however, we do not change the controls, the activity may be resumed.
if (action==ACTION_SEND_OUT) {
composeText.setText("");
}
if(slideDeck!=null) { if(slideDeck!=null) {
attachmentManager.clear(glideRequests, false);
if (action==ACTION_SEND_OUT) {
attachmentManager.clear(glideRequests, false);
}
try { try {
List<Attachment> attachments = slideDeck.asAttachments(); List<Attachment> attachments = slideDeck.asAttachments();