From 2bce2738b30b3d15670f325ad6eb501836dead80 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 12 Apr 2021 12:02:41 +1000 Subject: [PATCH] media saved notification is sent only when incoming media are saved --- .../org/thoughtcrime/securesms/MediaOverviewActivity.java | 7 +++++-- .../org/thoughtcrime/securesms/MediaPreviewActivity.java | 6 ++++-- .../securesms/conversation/ConversationFragment.java | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java index 762d88b81c..fe6f249b0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -353,8 +353,11 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity { saveTask.executeOnExecutor(THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[attachments.size()])); actionMode.finish(); - // Sending a Data extraction notification - sendMediaSavedNotificationIfNeeded(); + // Sending a Data extraction notification (for incoming attachments only) + boolean containsIncoming = mediaRecords.parallelStream().anyMatch(m -> !m.isOutgoing()); + if (containsIncoming) { + sendMediaSavedNotificationIfNeeded(); + } } }.execute(); }) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 8bc53250a4..03e1c6b4f9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -357,8 +357,10 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im saveTask.executeOnExecutor( AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null)); - // Sending a Data extraction notification - sendMediaSavedNotificationIfNeeded(); + // Sending a Data extraction notification (for incoming attachments only) + if(!mediaItem.outgoing) { + sendMediaSavedNotificationIfNeeded(); + } }) .execute(); }); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index d69574c4d1..32668cb247 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -746,8 +746,10 @@ public class ConversationFragment extends Fragment if (!Util.isEmpty(attachments)) { SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity()); saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[0])); - // Sending a Data extraction notification - sendMediaSavedNotificationIfNeeded(); + // Sending a Data extraction notification (for incoming attachments only) + if(!message.isOutgoing()) { + sendMediaSavedNotificationIfNeeded(); + } return; }