put images into MessageStyle notifications

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java
index 1c1a995a9..8f01c6982 100644
--- a/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java
+++ b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java
@@ -135,6 +135,7 @@ public class PgpDecryptionService {
     }
 
     private void executeApi(Message message) {
+        boolean skipNotificationPush = false;
         synchronized (message) {
             Intent params = userInteractionResult != null ? userInteractionResult : new Intent();
             params.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
@@ -209,8 +210,9 @@ public class PgpDecryptionService {
                             mXmppConnectionService.getFileBackend().updateFileParams(message, url);
                             message.setEncryption(Message.ENCRYPTION_DECRYPTED);
                             inputFile.delete();
-                            mXmppConnectionService.getFileBackend().updateMediaScanner(outputFile);
                             mXmppConnectionService.updateMessage(message);
+                            skipNotificationPush = true;
+                            mXmppConnectionService.getFileBackend().updateMediaScanner(outputFile, () -> notifyIfPending(message));
                             break;
                         case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
                             synchronized (PgpDecryptionService.this) {
@@ -231,7 +233,9 @@ public class PgpDecryptionService {
                 }
             }
         }
-        notifyIfPending(message);
+        if (!skipNotificationPush) {
+            notifyIfPending(message);
+        }
     }
 
     private synchronized void notifyIfPending(Message message) {