aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
committerlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
commit27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch)
tree20740102fb6502dd6b130f51054a681275f44431 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
parent86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff)
parent46be514b4db1cb8c17037ac6cd307078e4794a12 (diff)
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 8185c8e1..22f5dca9 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/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);
}