From 0a6eb6630612cda0ce6a9ec896d81281efd9631f Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 24 Jan 2019 20:51:43 +0100
Subject: put images into MessageStyle notifications

---
 .../java/de/pixart/messenger/http/HttpDownloadConnection.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java')

diff --git a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
index cf867d796..b20e57e3f 100644
--- a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
+++ b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
@@ -146,7 +146,6 @@ public class HttpDownloadConnection implements Transferable {
     }
 
     private void finish() {
-        mXmppConnectionService.getFileBackend().updateMediaScanner(file);
         message.setTransferable(null);
         mHttpConnectionManager.finishConnection(this);
         boolean notify = acceptedAutomatically && !message.isRead();
@@ -154,9 +153,12 @@ public class HttpDownloadConnection implements Transferable {
             notify = message.getConversation().getAccount().getPgpDecryptionService().decrypt(message, notify);
         }
         mHttpConnectionManager.updateConversationUi(true);
-        if (notify) {
-            mXmppConnectionService.getNotificationService().push(message);
-        }
+        final boolean notifyAfterScan = notify;
+        mXmppConnectionService.getFileBackend().updateMediaScanner(file, () -> {
+            if (notifyAfterScan) {
+                mXmppConnectionService.getNotificationService().push(message);
+            }
+        });
     }
 
     private void changeStatus(int status) {
-- 
cgit v1.2.3