diff options
author | lookshe <github@lookshe.org> | 2016-03-25 20:13:51 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-25 20:13:51 +0100 |
commit | 711ab9f2b1b625373a7046774c7b78e59f826589 (patch) | |
tree | adbfec9c7f9cac33351b1b09c4f5057c6ef674b5 /src/main/java/de/thedevstack/conversationsplus/xmpp/jingle | |
parent | d25ab854dae2be0d5286d46b5038494d503dd367 (diff) | |
parent | 27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (diff) |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java index eff9a947..618d75ee 100644 --- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java @@ -115,9 +115,7 @@ public class JingleConnection implements Transferable { } Logging.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")"); if (message.getEncryption() != Message.ENCRYPTION_PGP) { - Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); - intent.setData(Uri.fromFile(file)); - mXmppConnectionService.sendBroadcast(intent); + FileBackend.updateMediaScanner(file, mXmppConnectionService); } else { account.getPgpDecryptionService().add(message); } |