Fix emoji on odd densities and add internal pref to force built-in.

This commit is contained in:
Alex Hart
2021-05-04 09:25:45 -03:00
committed by Cody Henthorne
parent 6c2adfeec2
commit efc3e7b25d
7 changed files with 68 additions and 11 deletions

View File

@@ -14,6 +14,8 @@ import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.emoji.EmojiFiles;
import org.thoughtcrime.securesms.emoji.EmojiSource;
import org.thoughtcrime.securesms.util.AppSignatureUtil;
import org.thoughtcrime.securesms.util.ByteUnit;
import org.thoughtcrime.securesms.util.CensorshipUtil;
@@ -66,6 +68,7 @@ public class LogSectionSystemInfo implements LogSection {
builder.append("Linked Devices: ").append(TextSecurePreferences.isMultiDevice(context)).append("\n");
builder.append("First Version : ").append(TextSecurePreferences.getFirstInstallVersion(context)).append("\n");
builder.append("Days Installed: ").append(VersionTracker.getDaysSinceFirstInstalled(context)).append("\n");
builder.append("Emoji Version : ").append(getEmojiVersionString(context)).append("\n");
builder.append("App : ");
try {
builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0)))
@@ -146,4 +149,14 @@ public class LogSectionSystemInfo implements LogSection {
int result = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
return result == ConnectionResult.SUCCESS ? "true" : "false (" + result + ")";
}
private static String getEmojiVersionString(@NonNull Context context) {
EmojiFiles.Version version = EmojiFiles.Version.readVersion(context);
if (version == null) {
return "None";
} else {
return version.getVersion() + " (" + version.getDensity() + ")";
}
}
}