Merge branch 'master' into recyclerview_improvements

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)*
 ----------------------------
 

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.simplemobiletools.smsmessenger"
         minSdkVersion 22
         targetSdkVersion 33
-        versionCode 62
+        versionCode 63
-        versionName "5.16.1"
+        versionName "5.16.2"
         setProperty("archivesBaseName", "sms-messenger")
     }
 
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:9162225f33'
+    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'

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) { }
+            }
         }
     }
 

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)
@@ -1219,7 +1229,9 @@ class ThreadActivity : SimpleActivity() {
         }
 
         setupAdapter()
-        setupSIMSelector()
+        runOnUiThread {
+            setupSIMSelector()
+        }
     }
 
     private fun isMmsMessage(text: String): Boolean {

app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt

@@ -15,6 +15,7 @@ import com.bumptech.glide.Glide
 import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
 import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter
 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
@@ -54,6 +55,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
@@ -71,7 +73,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()
@@ -114,6 +116,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)

app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt

@@ -72,7 +72,11 @@ fun Context.sendMessage(text: String, addresses: List<String>, subscriptionId: I
     transaction.setExplicitBroadcastForSentSms(smsSentIntent)
     transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
     Handler(Looper.getMainLooper()).post {
-        transaction.sendNewMessage(message)
+        try {
+            transaction.sendNewMessage(message)
+        } catch (e: Exception) {
+            showErrorToast(e)
+        }
     }
 }
 

app/src/main/res/values-ar/strings.xml

@@ -76,7 +76,7 @@
     <string name="sender_only">المرسل فقط</string>
     <string name="enable_delivery_reports">تمكين تقارير التسليم</string>
     <string name="use_simple_characters">إزالة اللهجات والتشكيل عند إرسال الرسائل</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">إرسال رسالة عند الضغط على Enter</string>
     <string name="mms_file_size_limit">تغيير حجم صور MMS المرسلة</string>
     <string name="mms_file_size_limit_none">لا يوجد حد</string>
     <string name="outgoing_messages">الرسائل المرسلة</string>

app/src/main/res/values-ca/strings.xml

@@ -64,7 +64,7 @@
     <string name="sender_only">Només el remitent</string>
     <string name="enable_delivery_reports">Activa els informes de lliurament</string>
     <string name="use_simple_characters">Elimina els accents i els diacrítics en enviar missatges</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Envieu el missatge prement Retorn</string>
     <string name="mms_file_size_limit">Canvia la mida de les imatges MMS enviades</string>
     <string name="mms_file_size_limit_none">Sense límit</string>
     <string name="outgoing_messages">Missatges sortints</string>

app/src/main/res/values-de/strings.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Schlichter SMS Messenger</string>
-    <string name="app_launcher_name">SMS Messenger</string>
+    <string name="app_launcher_name">SMS-Messenger</string>
     <string name="type_a_message">Schreibe eine Nachricht …</string>
-    <string name="message_not_sent_short">Nachricht nicht versendet</string>
+    <string name="message_not_sent_short">Nachricht nicht gesendet</string>
-    <string name="message_not_sent_touch_retry">Nachricht nicht versendet. Berühre, um es erneut zu versuchen.</string>
+    <string name="message_not_sent_touch_retry">Nachricht nicht gesendet. Berühren, um es erneut zu versuchen.</string>
     <string name="message_sending_error">Deine Nachricht an %s wurde nicht gesendet</string>
     <string name="add_person">Person hinzufügen</string>
     <string name="attachment">Anhang</string>
-    <string name="no_conversations_found">Keine gespeicherten Chats gefunden</string>
+    <string name="no_conversations_found">Keine gespeicherten Unterhaltungen gefunden</string>
-    <string name="start_conversation">Neuen Chat beginnen</string>
+    <string name="start_conversation">Neue Unterhaltung beginnen</string>
     <string name="reply">Antworten</string>
-    <string name="show_character_counter">Zeige einen Zeichenzähler während dem Schreiben von Nachrichten</string>
+    <string name="show_character_counter">Zeichenzähler beim Schreiben von Nachrichten anzeigen</string>
     <string name="loading_messages">Nachrichten werden geladen …</string>
     <string name="no_reply_support">Der Absender unterstützt keine Antworten</string>
     <string name="draft">Entwurf</string>
     <string name="sending">Wird gesendet …</string>
     <string name="pin_conversation">Oben anheften</string>
-    <string name="unpin_conversation">Losheften</string>
+    <string name="unpin_conversation">Lösen</string>
     <string name="forward_message">Weiterleiten</string>
     <string name="compress_error">Bild kann nicht auf ausgewählte Größe komprimiert werden</string>
     <!-- Attachments -->
@@ -28,7 +28,7 @@
         <item quantity="other">und %d anderen</item>
     </plurals>
     <!-- New conversation -->
-    <string name="new_conversation">Neuer Chat</string>
+    <string name="new_conversation">Neue Unterhaltung</string>
     <string name="add_contact_or_number">Kontakt oder Nummer hinzufügen …</string>
     <string name="suggestions">Vorschläge</string>
     <!-- Schedule send -->
@@ -47,11 +47,11 @@
     <string name="mark_as_unread">Als ungelesen markieren</string>
     <string name="me">Ich</string>
     <!-- Confirmation dialog -->
-    <string name="delete_whole_conversation_confirmation">Möchtest du wirklich alle Nachrichten dieses Chats löschen\?</string>
+    <string name="delete_whole_conversation_confirmation">Möchten Sie wirklich alle Nachrichten dieser Unterhaltung löschen\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
-        <item quantity="one">%d Chat</item>
+        <item quantity="one">%d Unterhaltung</item>
-        <item quantity="other">%d Chats</item>
+        <item quantity="other">%d Unterhaltungen</item>
     </plurals>
     <!-- Are you sure you want to delete 5 messages? -->
     <plurals name="delete_messages">
@@ -64,7 +64,7 @@
     <string name="sender_only">Nur Absender</string>
     <string name="enable_delivery_reports">Zustellungsberichte aktivieren</string>
     <string name="use_simple_characters">Akzente und diakritische Zeichen beim Senden von Nachrichten entfernen</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Nachricht beim Drücken der Eingabetaste senden</string>
     <string name="mms_file_size_limit">Größe gesendeter MMS-Bilder ändern</string>
     <string name="mms_file_size_limit_none">Keine Begrenzung</string>
     <string name="outgoing_messages">Ausgehende Nachrichten</string>

app/src/main/res/values-es/strings.xml

@@ -67,7 +67,7 @@
     <string name="sender_only">Solamente el remitente</string>
     <string name="enable_delivery_reports">Habilitar informes de entrega</string>
     <string name="use_simple_characters">Elimina los acentos y signos diacríticos al enviar mensajes</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Enviar mensaje al pulsar Intro</string>
     <string name="mms_file_size_limit">Cambiar el tamaño de las imágenes MMS enviadas</string>
     <string name="mms_file_size_limit_none">Sin límites</string>
     <string name="outgoing_messages">Mensajes salientes</string>

app/src/main/res/values-et/strings.xml

@@ -64,7 +64,7 @@
     <string name="sender_only">Ainult saatja</string>
     <string name="enable_delivery_reports">Võta kasutusele kättesaamiskinnitused</string>
     <string name="use_simple_characters">Sõnumite saatmisel eemalda tähtedelt täpid ja rõhumärgid</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Saada sõnum sisestusklahvi vajutamisel</string>
     <string name="mms_file_size_limit">Muuda piltide suurust MMS sõnumites</string>
     <string name="mms_file_size_limit_none">Piirangut ei ole</string>
     <string name="outgoing_messages">Väljuvad sõnumid</string>

app/src/main/res/values-fr/strings.xml

@@ -67,7 +67,7 @@
     <string name="sender_only">Expéditeur uniquement</string>
     <string name="enable_delivery_reports">Activer les confirmations d\'envoi</string>
     <string name="use_simple_characters">Supprimer les accents et caractères spéciaux lors de l\'envoi de messages</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Envoyer un message en appuyant sur Entrée</string>
     <string name="mms_file_size_limit">Redimensionner les images MMS envoyées</string>
     <string name="mms_file_size_limit_none">Pas de limite</string>
     <string name="outgoing_messages">Messages sortants</string>

app/src/main/res/values-gl/strings.xml

@@ -64,7 +64,7 @@
     <string name="sender_only">Só remitente</string>
     <string name="enable_delivery_reports">Permitir envío de informes</string>
     <string name="use_simple_characters">Eliminalos acentos e os diacríticos ao envialas mensaxes</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Envialo mensaxe ao premer Intro</string>
     <string name="mms_file_size_limit">Cambia o tamaño das imaxes dos MMS enviados</string>
     <string name="mms_file_size_limit_none">Sen límite</string>
     <string name="outgoing_messages">Mensaxes saíntes</string>

app/src/main/res/values-it/strings.xml

@@ -67,7 +67,7 @@
     <string name="sender_only">Solo mittente</string>
     <string name="enable_delivery_reports">Abilita conferma di consegna</string>
     <string name="use_simple_characters">Rimuovi gli accenti e i diacritici all\'invio di messaggi</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Invia il messaggio premendo Invio</string>
     <string name="mms_file_size_limit">Ridimensiona le immagini MMS inviate</string>
     <string name="mms_file_size_limit_none">Nessun limite</string>
     <string name="outgoing_messages">Messaggi in uscita</string>

app/src/main/res/values-ja/strings.xml

@@ -4,7 +4,7 @@
     <string name="app_launcher_name">SMS</string>
     <string name="type_a_message">メッセージを入力…</string>
     <string name="message_not_sent_short">メッセージは送信されませんでした</string>
-    <string name="message_not_sent_touch_retry">送信されませんでした。タップして再送してください。</string>
+    <string name="message_not_sent_touch_retry">送信失敗。タップして再送してください。</string>
     <string name="message_sending_error">「%s」さんへのメッセージは送信されませんでした</string>
     <string name="add_person">宛先を追加</string>
     <string name="attachment">添付</string>
@@ -21,7 +21,7 @@
     <string name="forward_message">転送</string>
     <string name="compress_error">選択したサイズに画像を圧縮できません</string>
     <!-- Attachments -->
-    <string name="duplicate_item_warning">Duplicate item was not included</string>
+    <string name="duplicate_item_warning">重複したアイテムは含まれていませんでした</string>
     <!-- vCard -->
     <plurals name="and_other_contacts">
         <item quantity="other">and %d others</item>
@@ -61,7 +61,7 @@
     <string name="sender_only">差出人のみ</string>
     <string name="enable_delivery_reports">配信確認レポートを有効にする</string>
     <string name="use_simple_characters">送信するメッセージから発音記号を取り除く (英語)</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Enter キーでメッセージを送信</string>
     <string name="mms_file_size_limit">送信する MMS の画像をリサイズ</string>
     <string name="mms_file_size_limit_none">制限しない</string>
     <string name="outgoing_messages">送信するメッセージ</string>
@@ -82,7 +82,7 @@
     <string name="faq_2_title">メッセージ相手が MMS を受信できません。何かできますか？</string>
     <string name="faq_2_text">MMS のサイズは通信キャリアによって制限されています。アプリの設定で制限を小さくしてみてください。</string>
     <string name="faq_3_title">アプリは予約メッセージをサポートしていますか？</string>
-    <string name="faq_3_text">はい、送信ボタンを長押しして、希望の日付と時間を選択することで、今後送信したいメッセージを予約できます。</string>
+    <string name="faq_3_text">はい、送信ボタンを長押しして、希望の日付と時刻を選択することで、今後送信したいメッセージを予約できます。</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res

app/src/main/res/values-nl/strings.xml

@@ -21,7 +21,7 @@
     <string name="forward_message">Doorsturen</string>
     <string name="compress_error">Kon de afbeelding niet comprimeren naar de gekozen grootte</string>
     <!-- Attachments -->
-    <string name="duplicate_item_warning">Duplicate item was not included</string>
+    <string name="duplicate_item_warning">Dubbel item was niet inbegrepen</string>
     <!-- vCard -->
     <plurals name="and_other_contacts">
         <item quantity="one">en %d andere</item>
@@ -64,7 +64,7 @@
     <string name="sender_only">Alleen afzender</string>
     <string name="enable_delivery_reports">Bezorgingsrapporten inschakelen</string>
     <string name="use_simple_characters">Accenten en diakritische tekens verwijderen bij het verzenden van berichten</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Bericht versturen met Enter-toets</string>
     <string name="mms_file_size_limit">Afbeelding verkleinen voor MMS</string>
     <string name="mms_file_size_limit_none">Geen limiet</string>
     <string name="outgoing_messages">Uitgaande berichten</string>

app/src/main/res/values-ru/strings.xml

@@ -70,7 +70,7 @@
     <string name="sender_only">Только отправитель</string>
     <string name="enable_delivery_reports">Использовать отчёты о доставке</string>
     <string name="use_simple_characters">Удалять ударения и диакритические знаки при отправке сообщений</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Отправлять сообщение при нажатии Enter</string>
     <string name="mms_file_size_limit">Изменять размер отправляемых в MMS изображений</string>
     <string name="mms_file_size_limit_none">Нет ограничения</string>
     <string name="outgoing_messages">Исходящие сообщения</string>

app/src/main/res/values-sr/strings.xml

@@ -21,7 +21,7 @@
     <string name="forward_message">Напред</string>
     <string name="compress_error">Није могуће компримовати слику на изабрану величину</string>
     <!-- Attachments -->
-    <string name="duplicate_item_warning">Duplicate item was not included</string>
+    <string name="duplicate_item_warning">Дупликат ставке није укључен</string>
     <!-- vCard -->
     <plurals name="and_other_contacts">
         <item quantity="one">и %d друго</item>
@@ -67,7 +67,7 @@
     <string name="sender_only">Само пошиљалац</string>
     <string name="enable_delivery_reports">Омогућите извештаје о испоруци</string>
     <string name="use_simple_characters">Уклоните акценте и дијакритичке знакове при слању порука</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Пошаљите поруку притиском на Ентер</string>
     <string name="mms_file_size_limit">Промените величину посланих ММС слика</string>
     <string name="mms_file_size_limit_none">Без лимита</string>
     <string name="outgoing_messages">Одлазне поруке</string>

app/src/main/res/values-tr/strings.xml

@@ -64,7 +64,7 @@
     <string name="sender_only">Yalnızca gönderen</string>
     <string name="enable_delivery_reports">İletim raporlarını etkinleştir</string>
     <string name="use_simple_characters">Mesaj gönderirken aksan ve vurguları kaldır</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">Enter tuşuna basıldığında mesaj gönder</string>
     <string name="mms_file_size_limit">Gönderilen MMS resimlerini yeniden boyutlandır</string>
     <string name="mms_file_size_limit_none">Sınır yok</string>
     <string name="outgoing_messages">Giden mesajlar</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -61,7 +61,7 @@
     <string name="sender_only">仅发信人</string>
     <string name="enable_delivery_reports">启用送达报告</string>
     <string name="use_simple_characters">发送消息时删除重音和变音符号</string>
-    <string name="send_on_enter">Send message on pressing Enter</string>
+    <string name="send_on_enter">按下 Enter 键发送消息</string>
     <string name="mms_file_size_limit">调整发送的彩信图片的大小</string>
     <string name="mms_file_size_limit_none">无限制</string>
     <string name="outgoing_messages">外发消息</string>

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