diff options
author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-03 16:06:59 +0100 |
---|---|---|
committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-03 16:06:59 +0100 |
commit | be7de054be6b31b82947b9c641c8b1d5bbefb284 (patch) | |
tree | 31c7f444f0a2c8a655a436cda804d53485263e22 /src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java | |
parent | 960b7343d3bf2511be4a6da838b9cf4a0f0a3c43 (diff) |
record voice and attachment refactor
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index c80755148..5e770376b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -13,7 +13,10 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import android.widget.Toast; +import java.io.UnsupportedEncodingException; import java.net.URLConnection; +import java.net.URLDecoder; +import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; import java.util.List; @@ -133,13 +136,17 @@ public class ShareWithActivity extends XmppActivity { final String type = getIntent().getType(); if (type != null && !type.startsWith("text/")) { this.share.uri = (Uri) getIntent().getParcelableExtra(Intent.EXTRA_STREAM); - this.share.image = type.startsWith("image/") || URLConnection.guessContentTypeFromName(share.uri.getPath()).startsWith("image/"); + try { + this.share.image = type.startsWith("image/") + || URLConnection.guessContentTypeFromName(this.share.uri.toString()).startsWith("image/"); + } catch (final StringIndexOutOfBoundsException ignored) { + this.share.image = false; + } } else { this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT); } if (xmppConnectionServiceBound) { - xmppConnectionService.populateWithOrderedConversations( - mConversations, this.share.uri == null); + xmppConnectionService.populateWithOrderedConversations(mConversations, this.share.uri == null); } super.onStart(); } |