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

assure that after sharing multiple files sharing state gets properly reset

Browse source
This commit is contained in:
cyBerta 2019-06-24 11:50:59 +02:00 • committed by B. Petersen
parent 6af9d59829
commit 2b41c25434
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,6 +1060,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
protected Void doInBackground(Void... voids) { protected Void doInBackground(Void... voids) {
Activity activity = activityRef.get(); Activity activity = activityRef.get();
if (activity == null) {
return null;
}
activity.setResult(RESULT_OK);
if (isForwarding(activity)) { if (isForwarding(activity)) {
handleForwarding(activity); handleForwarding(activity);
} else if (isSharing(activity)) { } else if (isSharing(activity)) {
@ -1068,14 +1073,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
return null; return null;
} }
@Override
protected void onPostExecute(Void aVoid) {
super.onPostExecute(aVoid);
Activity activity = activityRef.get();
if (activity != null) {
activity.setResult(RESULT_OK);
}
}
private void handleForwarding(Activity activity) { private void handleForwarding(Activity activity) {
DcContext dcContext = DcHelper.getContext(activity); DcContext dcContext = DcHelper.getContext(activity);