11 files changed, 106 insertions(+), 11 deletions(-)

M build.gradle
A src/free/java/eu/siacs/conversations/ui/service/EmojiService.java
M src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
M src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
A src/main/java/eu/siacs/conversations/ui/service/AbstractEmojiService.java
M src/main/java/eu/siacs/conversations/ui/widget/CopyTextView.java
R src/main/java/eu/siacs/conversations/ui/{EditMessage.java => widget/EditMessage.java}
M src/main/res/layout/conversation_list_row.xml
M src/main/res/layout/fragment_conversation.xml
A src/playstore/java/eu/siacs/conversations/ui/service/EmojiService.java
A src/playstore/res/values/font_certs.xml

@@ 21,10 21,11 @@ repositories {
 
 configurations {
     playstoreCompile
+    freeCompile
 }
 
 ext {
-    supportLibVersion = '25.4.0'
+    supportLibVersion = '26.1.0'
 }
 
 dependencies {


@@ 34,6 35,8 @@ dependencies {
     compile 'com.soundcloud.android:android-crop:1.0.1@aar'
     compile "com.android.support:support-v13:$supportLibVersion"
     compile "com.android.support:appcompat-v7:$supportLibVersion"
+    compile "com.android.support:support-emoji:$supportLibVersion"
+    freeCompile "com.android.support:support-emoji-bundled:$supportLibVersion"
     compile 'org.bouncycastle:bcprov-jdk15on:1.52'
     compile 'org.bouncycastle:bcmail-jdk15on:1.52'
     compile 'org.jitsi:org.otr4j:0.22'


@@ 59,7 62,7 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion "26.0.2"
 
     defaultConfig {

@@ 0,0 1,17 @@
+package eu.siacs.conversations.ui.service;
+
+import android.content.Context;
+import android.support.text.emoji.EmojiCompat;
+import android.support.text.emoji.bundled.BundledEmojiCompatConfig;
+
+public class EmojiService extends AbstractEmojiService {
+
+	public EmojiService(Context context) {
+		super(context);
+	}
+
+	@Override
+	protected EmojiCompat.Config buildConfig() {
+		return new BundledEmojiCompatConfig(context);
+	}
+}<
\ No newline at end of file

@@ 62,6 62,7 @@ import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
 import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate;
 import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
+import eu.siacs.conversations.ui.service.EmojiService;
 import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;


@@ 178,6 179,7 @@ public class ConversationActivity extends XmppActivity
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		new EmojiService(this).init();
 		if (savedInstanceState != null) {
 			mOpenConversation = savedInstanceState.getString(STATE_OPEN_CONVERSATION, null);
 			mPanelOpen = savedInstanceState.getBoolean(STATE_PANEL_OPEN, true);

@@ 70,6 70,7 @@ import eu.siacs.conversations.ui.XmppActivity.OnValueEdited;
 import eu.siacs.conversations.ui.adapter.MessageAdapter;
 import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureClicked;
 import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureLongClicked;
+import eu.siacs.conversations.ui.widget.EditMessage;
 import eu.siacs.conversations.ui.widget.ListSelectionManager;
 import eu.siacs.conversations.utils.NickValidityChecker;
 import eu.siacs.conversations.utils.UIHelper;

@@ 0,0 1,21 @@
+package eu.siacs.conversations.ui.service;
+
+import android.content.Context;
+import android.support.text.emoji.EmojiCompat;
+
+public abstract class AbstractEmojiService {
+
+	protected final Context context;
+
+	public AbstractEmojiService(Context context) {
+		this.context = context;
+	}
+
+	protected abstract EmojiCompat.Config buildConfig();
+
+	public void init() {
+		final EmojiCompat.Config config = buildConfig();
+		config.setReplaceAll(true);
+		EmojiCompat.init(config);
+	}
+}

@@ 5,10 5,10 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
+import android.support.text.emoji.widget.EmojiTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
-public class CopyTextView extends TextView {
+public class CopyTextView extends EmojiTextView {
 
 	public CopyTextView(Context context) {
 		super(context);

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


@@ 15,11 16,10 @@ import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
-import android.widget.EditText;
 
 import eu.siacs.conversations.Config;
 
-public class EditMessage extends EditText {
+public class EditMessage extends EmojiEditText {
 
 	public interface OnCommitContentListener {
 		boolean onCommitContent(InputContentInfoCompat inputContentInfo, int flags, Bundle opts, String[] mimeTypes);

@@ 37,7 37,7 @@
                 android:layout_toRightOf="@+id/conversation_image"
                 android:paddingLeft="8dp">
 
-                <TextView
+                <android.support.text.emoji.widget.EmojiTextView
                     android:id="@+id/conversation_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"


@@ 79,7 79,7 @@
                                   android:layout_alignWithParentIfMissing="true"
                                   android:layout_toLeftOf="@+id/notification_status"
                                   android:id="@+id/txt_img_wrapper">
-                        <TextView
+                        <android.support.text.emoji.widget.EmojiTextView
                             android:id="@+id/conversation_lastmsg"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"

@@ 29,7 29,7 @@
         android:layout_alignParentLeft="true"
         android:background="?attr/color_background_primary" >
 
-        <eu.siacs.conversations.ui.EditMessage
+        <eu.siacs.conversations.ui.widget.EditMessage
             android:id="@+id/textinput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"


@@ 48,7 48,7 @@
             android:textColor="?attr/color_text_primary" >
 
             <requestFocus />
-        </eu.siacs.conversations.ui.EditMessage>
+        </eu.siacs.conversations.ui.widget.EditMessage>
 
         <ImageButton
             android:id="@+id/textSendButton"

@@ 0,0 1,45 @@
+package eu.siacs.conversations.ui.service;
+
+import android.content.Context;
+import android.support.text.emoji.EmojiCompat;
+import android.support.text.emoji.FontRequestEmojiCompatConfig;
+import android.support.v4.provider.FontRequest;
+import android.util.Log;
+
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
+
+public class EmojiService extends AbstractEmojiService {
+
+
+	private final EmojiCompat.InitCallback initCallback = new EmojiCompat.InitCallback() {
+		@Override
+		public void onInitialized() {
+			super.onInitialized();
+			Log.d(Config.LOGTAG,"EmojiService succeeded in loading fonts");
+
+		}
+
+		@Override
+		public void onFailed(Throwable throwable) {
+			super.onFailed(throwable);
+			Log.d(Config.LOGTAG,"EmojiService failed to load fonts",throwable);
+		}
+	};
+
+	public EmojiService(Context context) {
+		super(context);
+	}
+
+	@Override
+	protected EmojiCompat.Config buildConfig() {
+		final FontRequest fontRequest = new FontRequest(
+				"com.google.android.gms.fonts",
+				"com.google.android.gms",
+				"Noto Color Emoji Compat",
+				R.array.font_certs);
+		FontRequestEmojiCompatConfig fontRequestEmojiCompatConfig = new FontRequestEmojiCompatConfig(context, fontRequest);
+		fontRequestEmojiCompatConfig.registerInitCallback(initCallback);
+		return fontRequestEmojiCompatConfig;
+	}
+}<
\ No newline at end of file

@@ 0,0 1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="font_certs">
+        <item>MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK</item>
+    </string-array>
+</resources><
\ No newline at end of file