From 8fe7af8f832ce2e6c43a446ccfdf596170d2c55d Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sat, 19 Feb 2022 14:27:46 +0100 Subject: [PATCH 1/2] Added an option to send long messages as MMS --- .../smsmessenger/activities/SettingsActivity.kt | 9 +++++++++ .../smsmessenger/activities/ThreadActivity.kt | 2 ++ .../smsmessenger/helpers/Config.kt | 4 ++++ .../smsmessenger/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 16 ++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 3 ++- app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 3 ++- app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 3 ++- app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-nb-rNO/strings.xml | 3 ++- app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 3 ++- app/src/main/res/values-pt/strings.xml | 3 ++- app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 3 ++- app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-ta/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 3 ++- app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 1 + 35 files changed, 73 insertions(+), 11 deletions(-) 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 d0d11ea5..db605bfc 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() { setupShowCharacterCounter() setupUseSimpleCharacters() setupEnableDeliveryReports() + setupSendLongMessageAsMMS() setupLockScreenVisibility() setupMMSFileSizeLimit() updateTextColors(settings_scrollview) @@ -175,6 +176,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupSendLongMessageAsMMS() { + settings_send_long_message_mms.isChecked = config.sendLongMessageMMS + settings_send_long_message_mms_holder.setOnClickListener { + settings_send_long_message_mms.toggle() + config.sendLongMessageMMS = settings_send_long_message_mms.isChecked + } + } + private fun setupLockScreenVisibility() { settings_lock_screen_visibility.text = getLockScreenVisibilityText() settings_lock_screen_visibility_holder.setOnClickListener { 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 3e4d13bd..82ac97e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -771,6 +771,8 @@ class ThreadActivity : SimpleActivity() { val settings = Settings() settings.useSystemSending = true settings.deliveryReports = config.enableDeliveryReports + settings.sendLongAsMms = config.sendLongMessageMMS + settings.sendLongAsMmsAfter = 1 val SIMId = availableSIMCards.getOrNull(currentSIMCardIndex)?.subscriptionId if (SIMId != null) { 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 d4b6cea8..79d4c398 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt @@ -28,6 +28,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(ENABLE_DELIVERY_REPORTS, false) set(enableDeliveryReports) = prefs.edit().putBoolean(ENABLE_DELIVERY_REPORTS, enableDeliveryReports).apply() + var sendLongMessageMMS: Boolean + get() = prefs.getBoolean(SEND_LONG_MESSAGE_MMS, false) + set(sendLongMessageMMS) = prefs.edit().putBoolean(SEND_LONG_MESSAGE_MMS, sendLongMessageMMS).apply() + var lockScreenVisibilitySetting: Int get() = prefs.getInt(LOCK_SCREEN_VISIBILITY, LOCK_SCREEN_SENDER_MESSAGE) set(lockScreenVisibilitySetting) = prefs.edit().putInt(LOCK_SCREEN_VISIBILITY, lockScreenVisibilitySetting).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 9c387e0f..8359b33b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -16,6 +16,7 @@ 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 SEND_LONG_MESSAGE_MMS = "send_long_message_mms" const val MMS_FILE_SIZE_LIMIT = "mms_file_size_limit" const val PINNED_CONVERSATIONS = "pinned_conversations" const val LAST_EXPORT_PATH = "last_export_path" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ec3c633a..e4ba6941 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -265,6 +265,22 @@ + + + + + + لا يوجد حد الرسائل المرسلة Send group messages as MMS + Send long messages as MMS الرسائل تصدير الرسائل diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b8c31087..1c04ec52 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -51,6 +51,7 @@ Sense límit Missatges sortints Envia missatges de grup com a MMS + Send long messages as MMS Missatges Exporta els missatges @@ -75,4 +76,4 @@ --> La mida dels MMS està limitada pels operadors, podeu provar d\'establir un límit més petit a la configuració de l\'aplicació. L\'altre extrem no ha rebut el meu MMS, hi puc fer alguna cosa\? - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 43b75451..d633b8d7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -51,6 +51,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Export zpráv Messages diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d2d68c52..e67e6c5d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 71989823..537d8f2e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -51,6 +51,7 @@ Keine Begrenzung Ausgehende Nachrichten Gruppennachrichten als MMS versenden + Send long messages as MMS Nachrichten Nachrichten exportieren @@ -76,4 +77,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5181b677..025e891b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -56,6 +56,7 @@ Χωρίς όριο Εξερχόμενα μηνύματα Αποστολή ομαδικών μηνυμάτων ως MMS + Send long messages as MMS Μηνύματα diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 35cb4a85..9028aa73 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -51,6 +51,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Mesaĝoj Export messages diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 890cf436..1cc21590 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 04cfabe3..0751da10 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -51,6 +51,7 @@ Piirangut ei ole Väljuvad sõnumid Saada rühmasõnumid MMS-sõnumitena + Send long messages as MMS Messages Export messages @@ -75,4 +76,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e670af6e..3332edf5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -51,6 +51,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages Export messages diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dc00232d..860dcb4d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -51,6 +51,7 @@ Pas de limite Messages sortants Envoyer des messages de groupe en MMS + Send long messages as MMS Messages Exporter des messages @@ -76,4 +77,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 70089441..a2294ebb 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 897ef94f..aa7230d9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -51,6 +51,7 @@ Nincs korlátozás Kimenő üzenetek Send group messages as MMS + Send long messages as MMS Üzenetek Üzenetek exportálása diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index e9318417..84d03dd4 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 181a0af5..3489baca 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -51,6 +51,7 @@ Nessun limite Messaggi in uscita Invia messaggi di gruppo come MMS + Send long messages as MMS Messaggi Esporta messaggi @@ -76,4 +77,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 554133e9..2fb0db9b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 7b3b078b..1055f451 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -51,6 +51,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages Export messages diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 2c8ff0b5..b20b924e 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index dbe710ff..8b4f58a8 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -51,6 +51,7 @@ Ingen grense Utgående meldinger Send group messages as MMS + Send long messages as MMS Meldinger Eksporter meldinger @@ -95,4 +96,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 47dfb437..acfc830e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -56,6 +56,7 @@ Geen limiet Uitgaande berichten Groepsberichten sturen als MMS + Send long messages as MMS Berichten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c1fc8df3..d80f51ad 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -53,6 +53,7 @@ Bez limitu Wiadomości wychodzące Wysyłaj wiadomości grupowe jako MMS-y + Wysyłaj długie wiadomości jako MMS-y Wiadomości Eksportuj wiadomości @@ -97,4 +98,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index cc787e21..8a774602 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -51,6 +51,7 @@ Sem limite Mensagens a enviar Enviar mensagens de grupo como MMS + Send long messages as MMS Mensagens Exportar mensagens @@ -75,4 +76,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c791101b..6986a53a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -56,6 +56,7 @@ Fără limită Outgoing messages Send group messages as MMS + Send long messages as MMS Mesajele diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b9f57e1f..122bd1fe 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -53,6 +53,7 @@ Нет ограничения Исходящие сообщения Отправлять групповые сообщения как MMS + Send long messages as MMS Сообщения Экспорт сообщений @@ -97,4 +98,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 9fecf4e4..4fac33ca 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -58,6 +58,7 @@ Žiadny limit Odchádzajúce správy Odosielať skupinové správy ako MMS + Send long messages as MMS Správy diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index e3a5ee93..664b6743 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -51,6 +51,7 @@ வரம்பு இல்லை வெளிச்செல்லும் செய்திகள் Send group messages as MMS + Send long messages as MMS செய்திகளை செய்திகளை ஏற்றுமதி செய்யவும் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4d23e594..1c28c719 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -51,6 +51,7 @@ Sınır yok Giden mesajlar Grup mesajlarını MMS olarak gönder + Send long messages as MMS Mesajlar Mesajları dışa aktar @@ -95,4 +96,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ffd625ab..ec81695e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -56,6 +56,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f659f2ef..17d27180 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -51,6 +51,7 @@ 无限制 外发消息 将群组信息作为彩信发送 + Send long messages as MMS 消息 导出消息 @@ -95,4 +96,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 658870b1..88b1121b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -51,6 +51,7 @@ No limit Outgoing messages Send group messages as MMS + Send long messages as MMS Messages Export messages From e59833fe45a7a5d6f53332cbcb4217dd49292f8a Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sun, 20 Feb 2022 11:06:10 +0100 Subject: [PATCH 2/2] translating some slovak strings --- app/src/main/res/values-sk/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4fac33ca..61e88cc7 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -18,7 +18,7 @@ Pripnúť na vrch Odopnúť Preposlať - Unable to compress image to selected size + Nepodarilo sa zmenšiť obrázok na požadovanú veľkosť Nová konverzácia @@ -58,7 +58,7 @@ Žiadny limit Odchádzajúce správy Odosielať skupinové správy ako MMS - Send long messages as MMS + Odosielať dlhé správy ako MMS Správy