From bbb8ac113ba0a516668b1166e2e0641af348e821 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Tue, 17 Jan 2017 20:46:20 -0800 Subject: [PATCH] Disable image keyboards for SDK < 5.0 Fixes #6045 // FREEBIE --- src/org/thoughtcrime/securesms/components/ComposeText.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java index 100244e40a..1f678f5e38 100644 --- a/src/org/thoughtcrime/securesms/components/ComposeText.java +++ b/src/org/thoughtcrime/securesms/components/ComposeText.java @@ -131,9 +131,9 @@ public class ComposeText extends EmojiEditText { editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION; } - if (Build.VERSION.SDK_INT <= 13) return inputConnection; - if (mediaListener == null) return inputConnection; - if (inputConnection == null) return null; + if (Build.VERSION.SDK_INT < 21) return inputConnection; + if (mediaListener == null) return inputConnection; + if (inputConnection == null) return null; EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] {"image/jpeg", "image/png", "image/gif"}); return InputConnectionCompat.createWrapper(inputConnection, editorInfo, new CommitContentListener(mediaListener));