diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt index fd4ec01f..999855fe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -38,6 +38,7 @@ class SettingsActivity : SimpleActivity() { setupChangeDateTimeFormat() setupFontSize() setupShowCharacterCounter() + setupUseSimpleCharacters() setupEnableDeliveryReports() setupLockScreenVisibility() setupMMSFileSizeLimit() @@ -130,6 +131,13 @@ class SettingsActivity : SimpleActivity() { config.showCharacterCounter = settings_show_character_counter.isChecked } } + private fun setupUseSimpleCharacters() { + settings_use_simple_characters.isChecked = config.useSimpleCharacters + settings_use_simple_characters_holder.setOnClickListener { + settings_use_simple_characters.toggle() + config.useSimpleCharacters = settings_use_simple_characters.isChecked + } + } private fun setupEnableDeliveryReports() { settings_enable_delivery_reports.isChecked = config.enableDeliveryReports diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 351305f0..180402e5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -699,6 +699,8 @@ class ThreadActivity : SimpleActivity() { return } + msg = removeDiacriticsIfNeeded(msg) + val numbers = ArrayList() participants.forEach { it.phoneNumbers.forEach { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index 69671889..4ff626ce 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -40,6 +40,7 @@ import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver import java.io.FileNotFoundException import java.util.* import kotlin.collections.ArrayList +import java.text.Normalizer import me.leolin.shortcutbadger.ShortcutBadger val Context.config: Config get() = Config.newInstance(applicationContext) @@ -768,6 +769,10 @@ fun Context.getLockScreenVisibilityText(type: Int) = getString( } ) +fun Context.removeDiacriticsIfNeeded(text: String): String { + return if (config.useSimpleCharacters) text.normalizeString() else text +} + fun Context.getSmsDraft(threadId: Long): String? { val uri = Sms.Draft.CONTENT_URI val projection = arrayOf(Sms.BODY) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt index 525f8881..78670daf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt @@ -18,6 +18,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(SHOW_CHARACTER_COUNTER, false) set(showCharacterCounter) = prefs.edit().putBoolean(SHOW_CHARACTER_COUNTER, showCharacterCounter).apply() + var useSimpleCharacters: Boolean + get() = prefs.getBoolean(USE_SIMPLE_CHARACTERS, false) + set(useSimpleCharacters) = prefs.edit().putBoolean(USE_SIMPLE_CHARACTERS, useSimpleCharacters).apply() + var enableDeliveryReports: Boolean get() = prefs.getBoolean(ENABLE_DELIVERY_REPORTS, true) set(enableDeliveryReports) = prefs.edit().putBoolean(ENABLE_DELIVERY_REPORTS, enableDeliveryReports).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt index 4c57a060..9e1ec619 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -13,6 +13,7 @@ const val SEARCHED_MESSAGE_ID = "searched_message_id" const val USE_SIM_ID_PREFIX = "use_sim_id_" const val NOTIFICATION_CHANNEL = "simple_sms_messenger" const val SHOW_CHARACTER_COUNTER = "show_character_counter" +const val USE_SIMPLE_CHARACTERS = "use_simple_characters" const val LOCK_SCREEN_VISIBILITY = "lock_screen_visibility" const val ENABLE_DELIVERY_REPORTS = "enable_delivery_reports" const val MMS_FILE_SIZE_LIMIT = "mms_file_size_limit" diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt index 8a4ee30c..79e333b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt @@ -11,6 +11,7 @@ import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.smsmessenger.extensions.conversationsDB import com.simplemobiletools.smsmessenger.extensions.markThreadMessagesRead +import com.simplemobiletools.smsmessenger.extensions.removeDiacriticsIfNeeded import com.simplemobiletools.smsmessenger.helpers.REPLY import com.simplemobiletools.smsmessenger.helpers.THREAD_ID import com.simplemobiletools.smsmessenger.helpers.THREAD_NUMBER @@ -19,7 +20,9 @@ class DirectReplyReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val address = intent.getStringExtra(THREAD_NUMBER) val threadId = intent.getLongExtra(THREAD_ID, 0L) - val msg = RemoteInput.getResultsFromIntent(intent).getCharSequence(REPLY)?.toString() ?: return + var msg = RemoteInput.getResultsFromIntent(intent).getCharSequence(REPLY)?.toString() ?: return + + msg = context.removeDiacriticsIfNeeded(msg) val settings = Settings() settings.useSystemSending = true diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7e41cc22..77283b63 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -195,6 +195,29 @@ + + + + + + Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 6a34b6d1..16102277 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9c90bcfb..40f69e22 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 997169a9..68124259 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -49,6 +49,7 @@ Αποστολέας και μήνυμα Αποστολέας μόνο Ενεργοποίηση αναφορών παράδοσης + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 67d182cb..a267726e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2e782726..ab3a4416 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 450af159..9a8e008c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 1f276fa3..e4217469 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -49,10 +49,10 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit - Mengapa aplikasi membutuhkan akses ke internet? Sayangnya itu diperlukan untuk mengirim lampiran MMS. Tidak dapat mengirim MMS akan menjadi kerugian yang sangat besar dibandingkan dengan aplikasi lain, jadi kami memutuskan untuk menggunakan cara ini. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5baa593b..b1477e50 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -49,6 +49,7 @@ Mittente e messaggio Solo mittente Abilita conferma di consegna + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 871b8e60..b281ca3d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8356b483..714051b0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index dbec29f0..50c2029f 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 761add6d..20889974 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -49,6 +49,7 @@ Afzender en bericht Alleen afzender Bezorgingsrapporten inschakelen + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 57ad858d..b0e73120 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -51,6 +51,7 @@ Nadawca i treść Tylko nadawca Włącz raporty doręczeń + Usuwaj akcenty i znaki diakrytyczne podczas wysyłania wiadomości Resize sent MMS images No limit diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 793f5c39..4f08f40e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4695783b..e7835b1c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,6 +51,7 @@ Отправитель и сообщение Только отправитель Использовать отчёты о доставке + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 42276710..5c922a60 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -51,6 +51,7 @@ Odosielateľ a správa Iba odosielateľ Povoliť správy o doručení + Odstrániť diakritiku pri odosielaní správ Zmenšiť MMS obrázky pri odosielaní Žiadny limit diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 04bc32ec..575b3c20 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3527c5c4..8a5a6b46 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 08ed9cd9..c2622ff6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df4c075d..bb24daff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,6 +49,7 @@ Sender and message Sender only Enable delivery reports + Remove accents and diacritics at sending messages Resize sent MMS images No limit