From 8124bf2e2bfea2a4f936904ca1cf5ff99fa16152 Mon Sep 17 00:00:00 2001
From: Riko Sakurauchi <lijiahao99131@gmail.com>
Date: Tue, 18 Jun 2019 13:48:13 +0800
Subject: [PATCH] emoji and connection

---
 .../java/org/telegram/messenger/Emoji.java    | 21 ++++++++++++++++++-
 .../telegram/tgnet/ConnectionsManager.java    |  7 ++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
index f9b62f987..916ee9e6d 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
@@ -8,6 +8,8 @@
 
 package org.telegram.messenger;
 
+import org.telegram.ui.ActionBar.Theme;
+
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -27,6 +29,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Spannable;
 import android.text.Spanned;
+import android.text.TextPaint;
 import android.text.style.DynamicDrawableSpan;
 import android.text.style.ImageSpan;
 import android.view.View;
@@ -245,6 +248,7 @@ public class Emoji {
         private boolean fullSize = false;
         private static Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG);
         private static Rect rect = new Rect();
+        private static TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
 
         public EmojiDrawable(DrawableInfo i) {
             info = i;
@@ -271,6 +275,18 @@ public class Emoji {
                 canvas.drawText(EmojiData.data[info.page][info.emojiIndex], getBounds().left, getBounds().bottom, textPaint);
                 return;
             }*/
+            if (SharedConfig.useSystemEmoji) {
+                String emoji = EmojiData.data[info.page][info.emojiIndex];
+                if (EmojiData.emojiToFE0FMap.containsKey(emoji.charAt(0))) {
+                    emoji = emoji.substring(0, 1) + "\uFE0F" + emoji.substring(1);
+                }
+                textPaint.setColor(Theme.getColor(Theme.key_chat_emojiPanelIcon));
+                textPaint.setTextSize(getBounds().width() * 4.0f);
+                textPaint.setTextSize(getBounds().width() * 0.7f * 4.0f * Math.min(0.3f, getBounds().width() / textPaint.measureText(emoji)));
+                textPaint.setTextAlign(Paint.Align.CENTER);
+                canvas.drawText(emoji, getBounds().left + getBounds().width() / 2.0f, getBounds().bottom - getBounds().height() / 5.0f, textPaint);
+                return;
+            }
             if (emojiBmp[info.page][info.page2] == null) {
                 if (loadingEmoji[info.page][info.page2]) {
                     return;
@@ -340,7 +356,7 @@ public class Emoji {
     }
 
     public static CharSequence replaceEmoji(CharSequence cs, Paint.FontMetricsInt fontMetrics, int size, boolean createNew, int[] emojiOnly) {
-        if (SharedConfig.useSystemEmoji || cs == null || cs.length() == 0) {
+        if (cs == null || cs.length() == 0) {
             return cs;
         }
         Spannable s;
@@ -349,6 +365,9 @@ public class Emoji {
         } else {
             s = Spannable.Factory.getInstance().newSpannable(cs.toString());
         }
+        if (SharedConfig.useSystemEmoji) {
+            return s;
+        }
         long buf = 0;
         int emojiCount = 0;
         char c;
diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java b/TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
index ccddde1e2..dd1d41e36 100644
--- a/TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
+++ b/TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
@@ -29,6 +29,8 @@ import org.telegram.messenger.StatsController;
 import org.telegram.messenger.UserConfig;
 import org.telegram.messenger.Utilities;
 
+import tw.nekomimi.nekogram.NekoConfig;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.InputStream;
@@ -607,6 +609,9 @@ public class ConnectionsManager {
         if (Build.VERSION.SDK_INT < 19) {
             return false;
         }
+        if(!NekoConfig.useIPv6){
+            return false;
+        }
         if (BuildVars.LOGS_ENABLED) {
             try {
                 NetworkInterface networkInterface;
@@ -665,7 +670,7 @@ public class ConnectionsManager {
                     }
                 }
             }
-            if (!hasIpv4 && hasIpv6) {
+            if (hasIpv6) {
                 return true;
             }
         } catch (Throwable e) {