2 files changed, 4 insertions(+), 9 deletions(-)

M build.gradle
M src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java

@@ 40,6 40,7 @@ dependencies {
     implementation 'com.soundcloud.android:android-crop:1.0.1@aar'
     implementation "com.android.support:support-v13:$supportLibVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation "com.android.support:support-emoji-appcompat:$supportLibVersion"
     implementation "com.android.support:support-emoji:$supportLibVersion"
     freeImplementation "com.android.support:support-emoji-bundled:$supportLibVersion"
     implementation 'org.bouncycastle:bcmail-jdk15on:1.58'

@@ 1,6 1,6 @@
 package eu.siacs.conversations.ui.widget;
 
-import android.support.text.emoji.widget.EmojiEditText;
+import android.support.text.emoji.widget.EmojiAppCompatEditText;
 import android.support.v13.view.inputmethod.EditorInfoCompat;
 import android.support.v13.view.inputmethod.InputConnectionCompat;
 import android.support.v13.view.inputmethod.InputContentInfoCompat;


@@ 19,15 19,9 @@ import android.view.inputmethod.InputConnection;
 
 import eu.siacs.conversations.Config;
 
-public class EditMessage extends EmojiEditText {
+public class EditMessage extends EmojiAppCompatEditText {
 
-	private static final InputFilter SPAN_FILTER = new InputFilter() {
-
-		@Override
-		public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-			return source instanceof Spanned ? source.toString() : source;
-		}
-	};
+	private static final InputFilter SPAN_FILTER = (source, start, end, dest, dstart, dend) -> source instanceof Spanned ? source.toString() : source;
 	protected Handler mTypingHandler = new Handler();
 	protected KeyboardListener keyboardListener;
 	private OnCommitContentListener mCommitContentListener = null;