diff options
| author | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
| commit | 27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch) | |
| tree | 20740102fb6502dd6b130f51054a681275f44431 /src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java | |
| parent | 86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index cc2806f9..91dd32d9 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -191,7 +191,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer if (Intent.ACTION_SEND.equals(action)) { final String text = intent.getStringExtra(Intent.EXTRA_TEXT); final Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM); - if (type != null && uri != null && text == null) { + if (type != null && uri != null && (text == null || !type.equals("text/plain"))) { this.share.uris.clear(); this.share.uris.add(uri); this.share.image = type.startsWith("image/") || isImage(uri); |