aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-20 19:30:38 +0200
committerChristian S <christian@pix-art.de>2015-10-20 19:30:38 +0200
commit9d6b7bc032e600cbac12d0f9253cbf67c7b5cc93 (patch)
tree05e623a346581f8255a1ca5a96f53ef799d13477 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parenteb8a7d660eb190a67b48d258cb6a354ec80a3e46 (diff)
parentf4a33a007c777eaacd6d55048346b2a4be850ee5 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 16ccceb28..1982781fd 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -541,7 +541,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
String mime = message.getMimeType();
if (mime == null) {
- mime = "image/jpeg";
+ mime = "*/*";
}
shareIntent.setType(mime);
}