diff options
author | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
commit | 927dde01a827a91a24495bd868575cefd981f8c2 (patch) | |
tree | f09ed178937f28b85d1499951cff3faa64988250 /src/main/java/eu/siacs/conversations/xmpp | |
parent | 67eb44af3c5012cdc2da3af4ae94cf7fa51a3ef1 (diff) | |
parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 7 |
1 files changed, 1 insertions, 6 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 dcb13c233..e3eec6471 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -1,7 +1,5 @@ package eu.siacs.conversations.xmpp.jingle; -import android.content.Intent; -import android.net.Uri; import android.util.Log; import android.util.Pair; @@ -9,7 +7,6 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -111,9 +108,7 @@ public class JingleConnection implements Transferable { } Log.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); + mXmppConnectionService.getFileBackend().updateMediaScanner(file); } else { account.getPgpDecryptionService().add(message); } |