diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index ec7c013ead..c43b800ab9 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -6280,11 +6280,11 @@ class Core { // Wearables StringBuilder sb = new StringBuilder(); if (!TextUtils.isEmpty(message.subject)) - sb.append(TextHelper.transliterate(context, message.subject)); + sb.append(TextHelper.transliterateNotification(context, message.subject)); if (wearable_preview && !TextUtils.isEmpty(preview)) { if (sb.length() > 0) sb.append(" - "); - sb.append(TextHelper.transliterate(context, preview)); + sb.append(TextHelper.transliterateNotification(context, preview)); } if (sb.length() > 0) mbuilder.setContentText(sb.toString()); @@ -6315,7 +6315,7 @@ class Core { } } else { if (!TextUtils.isEmpty(message.subject)) - mbuilder.setContentText(TextHelper.transliterate(context, message.subject)); + mbuilder.setContentText(TextHelper.transliterateNotification(context, message.subject)); } if (info[0].hasPhoto()) diff --git a/app/src/main/java/eu/faircode/email/TextHelper.java b/app/src/main/java/eu/faircode/email/TextHelper.java index ed35a62b2b..4f5fd02fbb 100644 --- a/app/src/main/java/eu/faircode/email/TextHelper.java +++ b/app/src/main/java/eu/faircode/email/TextHelper.java @@ -127,15 +127,19 @@ public class TextHelper { } } - static String transliterate(Context context, String text) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) - return text; - + static String transliterateNotification(Context context, String text) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean notify_transliterate = prefs.getBoolean("notify_transliterate", false); if (!notify_transliterate) return text; + return transliterate(context, text); + } + + static String transliterate(Context context, String text) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) + return text; + try { // http://userguide.icu-project.org/transforms/general return Transliterator.getInstance(TRANSLITERATOR).transliterate(text);