From c8818bfa57ce4f4f71c28e3b974c88239c973640 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2022 20:14:46 +0100 Subject: [PATCH 01/23] lets lock number blocking --- app/build.gradle | 2 +- .../smsmessenger/activities/SettingsActivity.kt | 11 ++++++++++- .../smsmessenger/activities/ThreadActivity.kt | 12 +++++++++++- .../smsmessenger/adapters/ConversationsAdapter.kt | 12 +++++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 46333b6d..56a7025b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:9162225f33' + implementation 'com.github.SimpleMobileTools:Simple-Commons:5b5a6b083f' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:android-smsmms:3581774c39' 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 17e042dd..6a9c5bd8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -6,6 +6,7 @@ import android.os.Build import android.os.Bundle import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog +import com.simplemobiletools.commons.dialogs.FeatureLockedDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* @@ -128,9 +129,17 @@ class SettingsActivity : SimpleActivity() { // support for device-wise blocking came on Android 7, rely only on that @TargetApi(Build.VERSION_CODES.N) private fun setupManageBlockedNumbers() { + settings_manage_blocked_numbers.text = addLockedLabelIfNeeded(R.string.manage_blocked_numbers) settings_manage_blocked_numbers_holder.beVisibleIf(isNougatPlus()) + settings_manage_blocked_numbers_holder.setOnClickListener { - startActivity(Intent(this, ManageBlockedNumbersActivity::class.java)) + if (isOrWasThankYouInstalled()) { + Intent(this, ManageBlockedNumbersActivity::class.java).apply { + startActivity(this) + } + } else { + FeatureLockedDialog(this) { } + } } } 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 adba19c0..14f23a19 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -39,6 +39,7 @@ import androidx.core.view.* import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.dialogs.ConfirmationDialog +import com.simplemobiletools.commons.dialogs.FeatureLockedDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* @@ -182,6 +183,7 @@ class ThreadActivity : SimpleActivity() { val firstPhoneNumber = participants.firstOrNull()?.phoneNumbers?.firstOrNull()?.value thread_toolbar.menu.apply { findItem(R.id.delete).isVisible = threadItems.isNotEmpty() + findItem(R.id.block_number).title = addLockedLabelIfNeeded(R.string.block_number) findItem(R.id.block_number).isVisible = isNougatPlus() findItem(R.id.dial_number).isVisible = participants.size == 1 findItem(R.id.mark_as_unread).isVisible = threadItems.isNotEmpty() @@ -200,7 +202,7 @@ class ThreadActivity : SimpleActivity() { } when (menuItem.itemId) { - R.id.block_number -> blockNumber() + R.id.block_number -> tryBlocking() R.id.delete -> askConfirmDelete() R.id.add_number_to_contact -> addNumberToContact() R.id.dial_number -> dialNumber() @@ -652,6 +654,14 @@ class ThreadActivity : SimpleActivity() { return userPreferredSimIdx ?: senderPreferredSimIdx ?: systemPreferredSimIdx ?: 0 } + private fun tryBlocking() { + if (isOrWasThankYouInstalled()) { + blockNumber() + } else { + FeatureLockedDialog(this) { } + } + } + private fun blockNumber() { val numbers = participants.getAddresses() val numbersString = TextUtils.join(", ", numbers) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt index 0dbd8eb0..07912daa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt @@ -12,6 +12,7 @@ import com.bumptech.glide.Glide import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog +import com.simplemobiletools.commons.dialogs.FeatureLockedDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.commons.helpers.SimpleContactsHelper @@ -42,6 +43,7 @@ class ConversationsAdapter( val selectedItems = getSelectedItems() menu.apply { + findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number) findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_add_number_to_contact).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false findItem(R.id.cab_dial_number).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false @@ -59,7 +61,7 @@ class ConversationsAdapter( when (id) { R.id.cab_add_number_to_contact -> addNumberToContact() - R.id.cab_block_number -> askConfirmBlock() + R.id.cab_block_number -> tryBlocking() R.id.cab_dial_number -> dialNumber() R.id.cab_copy_number -> copyNumberToClipboard() R.id.cab_delete -> askConfirmDelete() @@ -102,6 +104,14 @@ class ConversationsAdapter( } } + private fun tryBlocking() { + if (activity.isOrWasThankYouInstalled()) { + askConfirmBlock() + } else { + FeatureLockedDialog(activity) { } + } + } + private fun askConfirmBlock() { val numbers = getSelectedItems().distinctBy { it.phoneNumber }.map { it.phoneNumber } val numbersString = TextUtils.join(", ", numbers) From a2aa91f97640e271eddbffc48a114fbcce86aa9c Mon Sep 17 00:00:00 2001 From: VfBFan Date: Thu, 10 Nov 2022 16:52:48 +0000 Subject: [PATCH 02/23] Translated using Weblate (German) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/de/ --- app/src/main/res/values-de/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c3489912..a210a20b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,23 +1,23 @@ Schlichter SMS Messenger - SMS Messenger + SMS-Messenger Schreibe eine Nachricht … - Nachricht nicht versendet - Nachricht nicht versendet. Berühre, um es erneut zu versuchen. + Nachricht nicht gesendet + Nachricht nicht gesendet. Berühren, um es erneut zu versuchen. Deine Nachricht an %s wurde nicht gesendet Person hinzufügen Anhang - Keine gespeicherten Chats gefunden - Neuen Chat beginnen + Keine gespeicherten Unterhaltungen gefunden + Neue Unterhaltung beginnen Antworten - Zeige einen Zeichenzähler während dem Schreiben von Nachrichten + Zeichenzähler beim Schreiben von Nachrichten anzeigen Nachrichten werden geladen … Der Absender unterstützt keine Antworten Entwurf Wird gesendet … Oben anheften - Losheften + Lösen Weiterleiten Bild kann nicht auf ausgewählte Größe komprimiert werden @@ -28,7 +28,7 @@ und %d anderen - Neuer Chat + Neue Unterhaltung Kontakt oder Nummer hinzufügen … Vorschläge @@ -47,11 +47,11 @@ Als ungelesen markieren Ich - Möchtest du wirklich alle Nachrichten dieses Chats löschen\? + Möchten Sie wirklich alle Nachrichten dieser Unterhaltung löschen\? - %d Chat - %d Chats + %d Unterhaltung + %d Unterhaltungen @@ -64,7 +64,7 @@ Nur Absender Zustellungsberichte aktivieren Akzente und diakritische Zeichen beim Senden von Nachrichten entfernen - Send message on pressing Enter + Nachricht beim Drücken der Eingabetaste senden Größe gesendeter MMS-Bilder ändern Keine Begrenzung Ausgehende Nachrichten From b0dcd08476748b451f258617294389825dddd91a Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Thu, 10 Nov 2022 17:37:39 +0000 Subject: [PATCH 03/23] Translated using Weblate (Spanish) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/es/ --- app/src/main/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 314b92b1..23345703 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -67,7 +67,7 @@ Solamente el remitente Habilitar informes de entrega Elimina los acentos y signos diacríticos al enviar mensajes - Send message on pressing Enter + Enviar mensaje al pulsar Intro Cambiar el tamaño de las imágenes MMS enviadas Sin límites Mensajes salientes From 9db46fbafcbf716cd3ba4056934c55ce59630592 Mon Sep 17 00:00:00 2001 From: solokot Date: Thu, 10 Nov 2022 16:41:50 +0000 Subject: [PATCH 04/23] Translated using Weblate (Russian) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/ru/ --- app/src/main/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5ec98cbb..730cdf66 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -70,7 +70,7 @@ Только отправитель Использовать отчёты о доставке Удалять ударения и диакритические знаки при отправке сообщений - Send message on pressing Enter + Отправлять сообщение при нажатии Enter Изменять размер отправляемых в MMS изображений Нет ограничения Исходящие сообщения From e071ae827eaa9da7ae120c27f8cd6430b12b809e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Thu, 10 Nov 2022 18:04:59 +0000 Subject: [PATCH 05/23] Translated using Weblate (Turkish) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/tr/ --- app/src/main/res/values-tr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 987457ef..c7216b50 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -64,7 +64,7 @@ Yalnızca gönderen İletim raporlarını etkinleştir Mesaj gönderirken aksan ve vurguları kaldır - Send message on pressing Enter + Enter tuşuna basıldığında mesaj gönder Gönderilen MMS resimlerini yeniden boyutlandır Sınır yok Giden mesajlar From 9c87d3396deef13759cdb79984ccaffad33dd988 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 11 Nov 2022 02:40:57 +0000 Subject: [PATCH 06/23] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/zh_Hans/ --- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ac3365cc..cf079ea4 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -61,7 +61,7 @@ 仅发信人 启用送达报告 发送消息时删除重音和变音符号 - Send message on pressing Enter + 按下 Enter 键发送消息 调整发送的彩信图片的大小 无限制 外发消息 @@ -87,4 +87,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 From 490cb21d554361b57b781bf008a7e83892827325 Mon Sep 17 00:00:00 2001 From: "Josep M. Ferrer" Date: Fri, 11 Nov 2022 17:19:31 +0000 Subject: [PATCH 07/23] Translated using Weblate (Catalan) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/ca/ --- app/src/main/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f8fe0eaf..b838d4c1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -64,7 +64,7 @@ Només el remitent Activa els informes de lliurament Elimina els accents i els diacrítics en enviar missatges - Send message on pressing Enter + Envieu el missatge prement Retorn Canvia la mida de les imatges MMS enviades Sense límit Missatges sortints From 968537584570ce272a97696f089052b563c7f95b Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Thu, 10 Nov 2022 17:25:41 +0000 Subject: [PATCH 08/23] Translated using Weblate (Galician) Currently translated at 80.0% (4 of 5 strings) Translation: Simple Mobile Tools/Simple SMS Messenger metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger-metadata/gl/ --- fastlane/metadata/android/gl-ES/full_description.txt | 2 +- fastlane/metadata/android/gl-ES/short_description.txt | 2 +- fastlane/metadata/android/gl-ES/title.txt | 2 +- fastlane/metadata/android/gl-ES/video.txt | 0 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 fastlane/metadata/android/gl-ES/video.txt diff --git a/fastlane/metadata/android/gl-ES/full_description.txt b/fastlane/metadata/android/gl-ES/full_description.txt index 42c3fffe..f59e4e9d 100644 --- a/fastlane/metadata/android/gl-ES/full_description.txt +++ b/fastlane/metadata/android/gl-ES/full_description.txt @@ -18,4 +18,4 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools Telegram: -https://t.me/SimpleMobileTools \ No newline at end of file +https://t.me/SimpleMobileTools diff --git a/fastlane/metadata/android/gl-ES/short_description.txt b/fastlane/metadata/android/gl-ES/short_description.txt index 4990984a..4fe0d622 100644 --- a/fastlane/metadata/android/gl-ES/short_description.txt +++ b/fastlane/metadata/android/gl-ES/short_description.txt @@ -1 +1 @@ -Aplictivo simple para xestionar SMS e MMS sen anuncios. \ No newline at end of file +Mensaxes SMS e aplicación de mensaxería MMS para Android, envía mensaxes rápido e agradable diff --git a/fastlane/metadata/android/gl-ES/title.txt b/fastlane/metadata/android/gl-ES/title.txt index 7ebaa915..58886f74 100644 --- a/fastlane/metadata/android/gl-ES/title.txt +++ b/fastlane/metadata/android/gl-ES/title.txt @@ -1 +1 @@ -Simple SMS Messenger \ No newline at end of file +Simple SMS Messenger diff --git a/fastlane/metadata/android/gl-ES/video.txt b/fastlane/metadata/android/gl-ES/video.txt deleted file mode 100644 index e69de29b..00000000 From f968265e7337c6a521bd3df10389b9ce558b4d88 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Sat, 12 Nov 2022 14:51:09 +0000 Subject: [PATCH 09/23] Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/fr/ --- app/src/main/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bdf72789..fdc937ed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -67,7 +67,7 @@ Expéditeur uniquement Activer les confirmations d\'envoi Supprimer les accents et caractères spéciaux lors de l\'envoi de messages - Send message on pressing Enter + Envoyer un message en appuyant sur Entrée Redimensionner les images MMS envoyées Pas de limite Messages sortants From 40009d85651de34a143e38a3f782fcae66eb937a Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Sat, 12 Nov 2022 11:03:30 +0000 Subject: [PATCH 10/23] Translated using Weblate (Galician) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/gl/ --- app/src/main/res/values-gl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 041c674a..629cd82f 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -64,7 +64,7 @@ Só remitente Permitir envío de informes Eliminalos acentos e os diacríticos ao envialas mensaxes - Send message on pressing Enter + Envialo mensaxe ao premer Intro Cambia o tamaño das imaxes dos MMS enviados Sen límite Mensaxes saíntes From d841a1780468110d60893dce39c182c18c6616a7 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Sat, 12 Nov 2022 14:51:30 +0000 Subject: [PATCH 11/23] Translated using Weblate (Italian) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/it/ --- app/src/main/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3fc6d5d1..5d1c47f8 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -67,7 +67,7 @@ Solo mittente Abilita conferma di consegna Rimuovi gli accenti e i diacritici all\'invio di messaggi - Send message on pressing Enter + Invia il messaggio premendo Invio Ridimensiona le immagini MMS inviate Nessun limite Messaggi in uscita From a48750e785830726bbe1d8494c7ed34df7bda14e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 11 Nov 2022 18:47:44 +0000 Subject: [PATCH 12/23] Translated using Weblate (Serbian) Currently translated at 98.4% (65 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/sr/ --- app/src/main/res/values-sr/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 65b5efb5..fa74154b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -21,7 +21,7 @@ Напред Није могуће компримовати слику на изабрану величину - Duplicate item was not included + Дупликат ставке није укључен и %d друго @@ -89,4 +89,4 @@ Величина ММС-а је ограничена оператерима, можете покушати да подесите мање ограничење у подешавањима апликације. Да ли апликација подржава заказане поруке\? Да, можете заказати слање порука у будућности дугим притиском на дугме Пошаљи и одабиром жељеног датума и времена. - + \ No newline at end of file From 886c280154cf49370cb446ca2667fd33ef64a60a Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sun, 13 Nov 2022 13:15:18 +0000 Subject: [PATCH 13/23] Translated using Weblate (Dutch) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/nl/ --- app/src/main/res/values-nl/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fd0f4c0a..a7a98df3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -21,7 +21,7 @@ Doorsturen Kon de afbeelding niet comprimeren naar de gekozen grootte - Duplicate item was not included + Dubbel item was niet inbegrepen en %d andere @@ -64,7 +64,7 @@ Alleen afzender Bezorgingsrapporten inschakelen Accenten en diakritische tekens verwijderen bij het verzenden van berichten - Send message on pressing Enter + Bericht versturen met Enter-toets Afbeelding verkleinen voor MMS Geen limiet Uitgaande berichten @@ -90,4 +90,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 From 8abeb4ef52dcf80bfe6b4d9dde90b293f0e273fb Mon Sep 17 00:00:00 2001 From: Rex_sa Date: Sun, 13 Nov 2022 11:20:11 +0000 Subject: [PATCH 14/23] Translated using Weblate (Arabic) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/ar/ --- app/src/main/res/values-ar/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index be4145be..6ff6f39e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -76,7 +76,7 @@ المرسل فقط تمكين تقارير التسليم إزالة اللهجات والتشكيل عند إرسال الرسائل - Send message on pressing Enter + إرسال رسالة عند الضغط على Enter تغيير حجم صور MMS المرسلة لا يوجد حد الرسائل المرسلة From f2b33f7c4a39ba86db682837dc8920adf996db03 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sun, 13 Nov 2022 20:30:27 +0100 Subject: [PATCH 15/23] Update short_description.txt --- fastlane/metadata/android/gl-ES/short_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/gl-ES/short_description.txt b/fastlane/metadata/android/gl-ES/short_description.txt index 4fe0d622..a744960b 100644 --- a/fastlane/metadata/android/gl-ES/short_description.txt +++ b/fastlane/metadata/android/gl-ES/short_description.txt @@ -1 +1 @@ -Mensaxes SMS e aplicación de mensaxería MMS para Android, envía mensaxes rápido e agradable +Aplictivo simple para xestionar SMS e MMS sen anuncios. From a65916c54e54c97d960ef74fd8cb4515e410145c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2022 20:31:03 +0100 Subject: [PATCH 16/23] catch and show exceptions thrown at sending a message --- .../com/simplemobiletools/smsmessenger/helpers/Messaging.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt index 6935744d..e4e2ce63 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt @@ -72,7 +72,11 @@ fun Context.sendMessage(text: String, addresses: List, subscriptionId: I transaction.setExplicitBroadcastForSentSms(smsSentIntent) transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent) Handler(Looper.getMainLooper()).post { - transaction.sendNewMessage(message) + try { + transaction.sendNewMessage(message) + } catch (e: Exception) { + showErrorToast(e) + } } } From dd77e64376223a36122d02d39490822608a27e63 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2022 20:51:09 +0100 Subject: [PATCH 17/23] updating commons --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 56a7025b..0e76e6f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:5b5a6b083f' + implementation 'com.github.SimpleMobileTools:Simple-Commons:f0369c00f3' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:android-smsmms:3581774c39' From 51558dd82ae31f7c328f0defe6e54fc07a37a420 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2022 23:20:58 +0100 Subject: [PATCH 18/23] update version to 5.16.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e76e6f1..14d1ec59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.smsmessenger" minSdkVersion 22 targetSdkVersion 33 - versionCode 62 - versionName "5.16.1" + versionCode 63 + versionName "5.16.2" setProperty("archivesBaseName", "sms-messenger") } From 4b8a3bdf577934263b83c5b2e1a6ebfc455d203a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 13 Nov 2022 23:21:09 +0100 Subject: [PATCH 19/23] updating changelog --- CHANGELOG.md | 8 ++++++++ fastlane/metadata/android/en-US/changelogs/63.txt | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/63.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index d1086f6b..7e4f51ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========== +Version 5.16.2 *(2022-11-13)* +---------------------------- + + * Allow sending any file attachment, not just images + * Add an option to enable sending messages at pressing Enter + * Require Simple Thank You for blocking numbers + * Added many translation, UX and stability improvements + Version 5.16.1 *(2022-10-26)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/63.txt b/fastlane/metadata/android/en-US/changelogs/63.txt new file mode 100644 index 00000000..6391bb8b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/63.txt @@ -0,0 +1,4 @@ + * Allow sending any file attachment, not just images + * Add an option to enable sending messages at pressing Enter + * Require Simple Thank You for blocking numbers + * Added many translation, UX and stability improvements From 8d9a8f41afe073c8b74bbd9f3e1aa6d8af2ff770 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 13 Nov 2022 22:07:46 +0000 Subject: [PATCH 20/23] Translated using Weblate (Serbian) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/sr/ --- app/src/main/res/values-sr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index fa74154b..b1b943ca 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -67,7 +67,7 @@ Само пошиљалац Омогућите извештаје о испоруци Уклоните акценте и дијакритичке знакове при слању порука - Send message on pressing Enter + Пошаљите поруку притиском на Ентер Промените величину посланих ММС слика Без лимита Одлазне поруке From f78b7492d64bd88adc802cd00baeb2f888fd6f63 Mon Sep 17 00:00:00 2001 From: Digger Date: Sun, 13 Nov 2022 23:26:25 +0000 Subject: [PATCH 21/23] Translated using Weblate (Japanese) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/ja/ --- app/src/main/res/values-ja/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 43eb420a..65ee6488 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4,7 +4,7 @@ SMS メッセージを入力… メッセージは送信されませんでした - 送信されませんでした。タップして再送してください。 + 送信失敗。タップして再送してください。 「%s」さんへのメッセージは送信されませんでした 宛先を追加 添付 @@ -21,7 +21,7 @@ 転送 選択したサイズに画像を圧縮できません - Duplicate item was not included + 重複したアイテムは含まれていませんでした and %d others @@ -61,7 +61,7 @@ 差出人のみ 配信確認レポートを有効にする 送信するメッセージから発音記号を取り除く (英語) - Send message on pressing Enter + Enter キーでメッセージを送信 送信する MMS の画像をリサイズ 制限しない 送信するメッセージ @@ -82,9 +82,9 @@ メッセージ相手が MMS を受信できません。何かできますか？ MMS のサイズは通信キャリアによって制限されています。アプリの設定で制限を小さくしてみてください。 アプリは予約メッセージをサポートしていますか？ - はい、送信ボタンを長押しして、希望の日付と時間を選択することで、今後送信したいメッセージを予約できます。 + はい、送信ボタンを長押しして、希望の日付と時刻を選択することで、今後送信したいメッセージを予約できます。 - + \ No newline at end of file From 2f2d1a5b75e2ab634b4cfbbfa444f871856e0914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Sun, 13 Nov 2022 22:26:53 +0000 Subject: [PATCH 22/23] Translated using Weblate (Estonian) Currently translated at 100.0% (66 of 66 strings) Translation: Simple Mobile Tools/Simple SMS Messenger Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/et/ --- app/src/main/res/values-et/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 000d7edb..00512bf5 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -64,7 +64,7 @@ Ainult saatja Võta kasutusele kättesaamiskinnitused Sõnumite saatmisel eemalda tähtedelt täpid ja rõhumärgid - Send message on pressing Enter + Saada sõnum sisestusklahvi vajutamisel Muuda piltide suurust MMS sõnumites Piirangut ei ole Väljuvad sõnumid From ce35553eca924e25c035c109aa1817352d04231a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 15 Nov 2022 23:03:57 +0100 Subject: [PATCH 23/23] fixing an error toast message --- app/build.gradle | 2 +- .../smsmessenger/activities/ThreadActivity.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 14d1ec59..3d91c9c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:f0369c00f3' + implementation 'com.github.SimpleMobileTools:Simple-Commons:af11ea2e30' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:android-smsmms:3581774c39' 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 14f23a19..3de1380e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -1229,7 +1229,9 @@ class ThreadActivity : SimpleActivity() { } setupAdapter() - setupSIMSelector() + runOnUiThread { + setupSIMSelector() + } } private fun isMmsMessage(text: String): Boolean {