lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

emoji and connection

This commit is contained in:
Riko Sakurauchi 2019-06-18 13:48:13 +08:00
parent 178f538d7d
commit 8124bf2e2b
No known key found for this signature in database
GPG Key ID: 25AC0345B92902AF
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
View File

@ -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;

7
TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
View File

@ -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) {