From fb37f155e5219e2b41fd30698e1fc35d839de107 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 27 Aug 2024 08:52:09 +0200 Subject: [PATCH] Simplification --- .../main/java/eu/faircode/email/EntityRule.java | 16 +++++----------- .../main/java/eu/faircode/email/TTSHelper.java | 4 +++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java index 890a10f449..464d4bd25f 100644 --- a/app/src/main/java/eu/faircode/email/EntityRule.java +++ b/app/src/main/java/eu/faircode/email/EntityRule.java @@ -1296,21 +1296,15 @@ public class EntityRule { if (message.ui_seen) return; - Locale locale = (message.language == null ? Locale.getDefault() : new Locale(message.language)); - - Configuration configuration = new Configuration(context.getResources().getConfiguration()); - configuration.setLocale(locale); - Resources res = context.createConfigurationContext(configuration).getResources(); - StringBuilder sb = new StringBuilder(); - sb.append(res.getString(R.string.title_rule_tts_prefix)).append(". "); + sb.append(context.getString(R.string.title_rule_tts_prefix)).append(". "); if (message.from != null && message.from.length > 0) - sb.append(res.getString(R.string.title_rule_tts_from)) + sb.append(context.getString(R.string.title_rule_tts_from)) .append(' ').append(MessageHelper.formatAddressesShort(message.from)).append(". "); if (!TextUtils.isEmpty(message.subject)) - sb.append(res.getString(R.string.title_rule_tts_subject)) + sb.append(context.getString(R.string.title_rule_tts_subject)) .append(' ').append(message.subject).append(". "); String body = Helper.readText(message.getFile(context)); @@ -1318,10 +1312,10 @@ public class EntityRule { String preview = HtmlHelper.getPreview(text); if (!TextUtils.isEmpty(preview)) - sb.append(res.getString(R.string.title_rule_tts_content)) + sb.append(context.getString(R.string.title_rule_tts_content)) .append(' ').append(preview); - TTSHelper.speak(context, "rule:" + message.id, sb.toString(), locale); + TTSHelper.speak(context, "rule:" + message.id, sb.toString(), message.language); } private boolean onActionSnooze(Context context, EntityMessage message, JSONObject jargs) throws JSONException { diff --git a/app/src/main/java/eu/faircode/email/TTSHelper.java b/app/src/main/java/eu/faircode/email/TTSHelper.java index 51f2230a7f..d06f3aaccd 100644 --- a/app/src/main/java/eu/faircode/email/TTSHelper.java +++ b/app/src/main/java/eu/faircode/email/TTSHelper.java @@ -41,7 +41,9 @@ public class TTSHelper { @NonNull final Context context, @NonNull final String utteranceId, @NonNull final String text, - @NonNull final Locale locale) { + final String language) { + + Locale locale = (language == null ? Locale.getDefault() : new Locale(language)); Runnable speak = new Runnable() { @Override