From f4b3b6ce617d02a1cb8bda6b72f7c44e856f6afb Mon Sep 17 00:00:00 2001
From: Pavel Poley <pavelpoley88@gmail.com>
Date: Mon, 30 May 2022 15:58:21 +0300
Subject: [PATCH 1/6] show proper sender name when using direct reply

---
 .../com/simplemobiletools/smsmessenger/extensions/Context.kt  | 4 ++--
 app/src/main/res/values-ar/strings.xml                        | 1 +
 app/src/main/res/values-bg/strings.xml                        | 1 +
 app/src/main/res/values-ca/strings.xml                        | 3 ++-
 app/src/main/res/values-cs/strings.xml                        | 3 ++-
 app/src/main/res/values-da/strings.xml                        | 3 ++-
 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                        | 3 ++-
 app/src/main/res/values-et/strings.xml                        | 1 +
 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                        | 3 ++-
 app/src/main/res/values-hu/strings.xml                        | 1 +
 app/src/main/res/values-id/strings.xml                        | 3 ++-
 app/src/main/res/values-it/strings.xml                        | 3 ++-
 app/src/main/res/values-ja/strings.xml                        | 3 ++-
 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                    | 1 +
 app/src/main/res/values-nl/strings.xml                        | 3 ++-
 app/src/main/res/values-pl/strings.xml                        | 1 +
 app/src/main/res/values-pt-rBR/strings.xml                    | 1 +
 app/src/main/res/values-pt/strings.xml                        | 3 ++-
 app/src/main/res/values-ro/strings.xml                        | 3 ++-
 app/src/main/res/values-ru/strings.xml                        | 3 ++-
 app/src/main/res/values-sk/strings.xml                        | 1 +
 app/src/main/res/values-sv/strings.xml                        | 1 +
 app/src/main/res/values-ta/strings.xml                        | 3 ++-
 app/src/main/res/values-tr/strings.xml                        | 3 ++-
 app/src/main/res/values-uk/strings.xml                        | 3 ++-
 app/src/main/res/values-zh-rCN/strings.xml                    | 3 ++-
 app/src/main/res/values-zh-rTW/strings.xml                    | 1 +
 app/src/main/res/values/strings.xml                           | 1 +
 35 files changed, 54 insertions(+), 20 deletions(-)

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 67d0c5db..0f581030 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -812,9 +812,9 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon
     notificationManager.notify(threadId.hashCode(), builder.build())
 }
 
-private fun getMessagesStyle(notificationManager: NotificationManager, threadId: Long, sender: String, body: String): NotificationCompat.MessagingStyle {
+private fun Context.getMessagesStyle(notificationManager: NotificationManager, threadId: Long, sender: String, body: String): NotificationCompat.MessagingStyle {
     val oldMessages = getOldMessages(notificationManager, threadId)
-    val messages = NotificationCompat.MessagingStyle(sender)
+    val messages = NotificationCompat.MessagingStyle(getString(R.string.me))
     oldMessages.forEach {
         messages.addMessage(it)
     }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cf9c2a26..d56ddee0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">رسالة جديدة</string>
     <string name="mark_as_read">ضع إشارة مقروء</string>
     <string name="mark_as_unread">وضع علامة كغير مقروءة</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">هل أنت متأكد أنك تريد حذف كافة رسائل هذه المحادثة؟</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 6063e83a..523c21df 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Ново съобщение</string>
     <string name="mark_as_read">Отбележи като прочетено</string>
     <string name="mark_as_unread">Отбележи като непрочетено</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Сигурни ли сте, че искате да изтриете всички съобщения от този разговор\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4bfea0f5..beae3767 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Missatge nou</string>
     <string name="mark_as_read">Marca com a llegit</string>
     <string name="mark_as_unread">Marcar com no llegit</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Confirmeu que voleu suprimir tots els missatges d\'aquesta conversa\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -76,4 +77,4 @@
     -->
     <string name="faq_2_text">La mida dels MMS està limitada pels operadors, podeu provar d\'establir un límit més petit a la configuració de l\'aplicació.</string>
     <string name="faq_2_title">L\'altre extrem no ha rebut el meu MMS, hi puc fer alguna cosa\?</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3bc4d6b2..371e4032 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nová zpráva</string>
     <string name="mark_as_read">Označit jako přečtené</string>
     <string name="mark_as_unread">Označit jako nepřečtené</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Opravdu chcete smazat všechny zprávy z této konverzace?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -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
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index db0bc207..db3178cf 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Ny Besked</string>
     <string name="mark_as_read">Marker som læst</string>
     <string name="mark_as_unread">Marker som ulæst</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Er du sikker på, at du vil slette alle beskeder i denne samtale\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -77,4 +78,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 631a209a..a605213d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Neue Nachricht</string>
     <string name="mark_as_read">Als gelesen markieren</string>
     <string name="mark_as_unread">Als ungelesen markieren</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Möchtest du wirklich alle Nachrichten dieses Chats löschen\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -77,4 +78,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 025e891b..852a1f80 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -30,6 +30,7 @@
     <string name="new_message">Νέο μήνυμα</string>
     <string name="mark_as_read">Σήμανση ως αναγνωσμένο</string>
     <string name="mark_as_unread">Σήμανση ως μη αναγνωσμένο</string>
+    <string name="me">Me</string>
 
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα μηνύματα αυτής της συνομιλίας;</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 9028aa73..e329906c 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nova mesaĝo</string>
     <string name="mark_as_read">Marki kiel legitan</string>
     <string name="mark_as_unread">Marki kiel nelegitan</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4c2b612e..e29c7e6a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nuevo mensaje</string>
     <string name="mark_as_read">Marcar como leído</string>
     <string name="mark_as_unread">Marcar como no leído</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">¿Estás seguro que quieres eliminar todos los mensajes en esta conversación\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -96,4 +97,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 0751da10..2907fd88 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Uus sõnum</string>
     <string name="mark_as_read">Märgi loetuks</string>
     <string name="mark_as_unread">Märgi mitteloetuks</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Kas oled kindel, et soovid kustutada kõik selle vestluse sõnumid\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3332edf5..f8885086 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Uusi viesti</string>
     <string name="mark_as_read">Merkitse luetuksi</string>
     <string name="mark_as_unread">Merkitse lukemattomaksi</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Haluatko varmasti poistaa kaikki tämän keskustelun viestit\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b66b0d65..f3cca51d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nouveau message</string>
     <string name="mark_as_read">Marquer comme lu</string>
     <string name="mark_as_unread">Marquer comme non lu</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Voulez-vous vraiment supprimer tous les messages de cette conversation \?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -77,4 +78,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 17b427a4..39dfb190 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nova mensaxe</string>
     <string name="mark_as_read">Marcar como lida</string>
     <string name="mark_as_unread">Marcar como non lida</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ten a certeza de que desexa eliminar todas as mensaxes desta conversa\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -95,4 +96,4 @@
         Non atopaches algunhas cadeas? Hai máis en
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index aa7230d9..27dcdc32 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Új üzenet</string>
     <string name="mark_as_read">Megjelölés olvasottként</string>
     <string name="mark_as_unread">Megjelölés olvasatlanként</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Biztos, hogy törli az összes üzenetet ebből a beszélgetésből\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index a3a69c9e..cd853ec7 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Pesan baru</string>
     <string name="mark_as_read">Tandai sebagai Dibaca</string>
     <string name="mark_as_unread">Tandai sebagai Belum dibaca</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Apakah Anda yakin ingin menghapus semua pesan dari percakapan ini\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -83,4 +84,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 60f2522b..1aa284b3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nuovo messaggio</string>
     <string name="mark_as_read">Letto</string>
     <string name="mark_as_unread">Non letto</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Vuoi davvero eliminare tutti i messaggi di questa conversazione\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -77,4 +78,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3b3ca635..fbef8b6a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">新しいメッセージ</string>
     <string name="mark_as_read">既読にする</string>
     <string name="mark_as_unread">未読にする</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">本当にこの会話のすべてのメッセージを削除しますか？</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -74,4 +75,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 1055f451..0fcd3984 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -24,6 +24,7 @@
     <string name="new_conversation">Naujas pokalbis</string>
     <string name="add_contact_or_number">Pridėti kontaktą arba numerį…</string>
     <string name="suggestions">Pasiūlymai</string>
+    <string name="me">Me</string>
     <!-- Notifications -->
     <string name="channel_received_sms">Gautos žinutės</string>
     <string name="new_message">Nauja žinutė</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index b20b924e..37c70589 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -30,6 +30,7 @@
     <string name="new_message">പുതിയ മെസ്സേജ്</string>
     <string name="mark_as_read">വായിച്ചതായി അടയാളപ്പെടുത്തുക</string>
     <string name="mark_as_unread">വായിച്ചിട്ടില്ലെന്ന് അടയാളപ്പെടുത്തുക</string>
+    <string name="me">Me</string>
 
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">ഈ സംഭാഷണത്തിന്റെ എല്ലാ സന്ദേശങ്ങൾ ഇല്ലാതാക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 8b4f58a8..bb4a78a0 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Ny melding</string>
     <string name="mark_as_read">Marker som lest</string>
     <string name="mark_as_unread">Marker som ulest</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e96bd075..9aa902e6 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nieuw bericht</string>
     <string name="mark_as_read">Als gelezen markeren</string>
     <string name="mark_as_unread">Als ongelezen markeren</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Alle berichten in dit gesprek verwijderen\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -96,4 +97,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d80f51ad..bdda7a7a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nowa wiadomość</string>
     <string name="mark_as_read">Oznacz jako przeczytane</string>
     <string name="mark_as_unread">Oznacz jako nieprzeczytane</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Czy usunąć wszystkie wiadomości z tej rozmowy\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b3c02fa7..0eda47d6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nova mensagem</string>
     <string name="mark_as_read">Marcar como Lida</string>
     <string name="mark_as_unread">Marcar como Não Lida</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Tem certeza que quer deletar todas as mensagens dessa conversa\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0cb197e1..3c2099a5 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nova mensagem</string>
     <string name="mark_as_read">Marcar como lida</string>
     <string name="mark_as_unread">Marcar como não lida</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Tem a certeza de que pretende apagar todas as mensagens desta conversa\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -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
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f0dad801..a94c6020 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Mesaj nou</string>
     <string name="mark_as_read">Marchează ca citit</string>
     <string name="mark_as_unread">Marchează ca necitit</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Eşti sigur că vrei să ştergi toate mesajele din această conversaţie?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -98,4 +99,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7c9114ca..2cb81a1c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Новое сообщение</string>
     <string name="mark_as_read">Прочитано</string>
     <string name="mark_as_unread">Не прочитано</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Удалить все сообщения в этой переписке\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -98,4 +99,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 61e88cc7..b2b5ba25 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -30,6 +30,7 @@
     <string name="new_message">Nová správa</string>
     <string name="mark_as_read">Označiť ako prečítané</string>
     <string name="mark_as_unread">Označiť ako neprečítané</string>
+    <string name="me">Me</string>
 
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ste si istý, že chcete odstrániť všetky správy tejto konverzácie?</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ac241e40..a2621e49 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Nytt meddelande</string>
     <string name="mark_as_read">Markera som läst</string>
     <string name="mark_as_unread">Markera som oläst</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Är du säker på att du vill ta bort alla meddelanden i konversationen?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 01cbdb59..39b5993f 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">புதிய செய்தி</string>
     <string name="mark_as_read">படித்ததாக குறியிடு</string>
     <string name="mark_as_unread">படிக்காததாக குறியிடு</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">இந்த உரையாடலின் அனைத்து செய்திகளையும் நிச்சயமாக நீக்க விரும்புகிறீர்களா\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -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
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 414679e4..dda719bc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Yeni mesaj</string>
     <string name="mark_as_read">Okundu olarak işaretle</string>
     <string name="mark_as_unread">Okunmadı olarak işaretle</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Bu görüşmenin tüm mesajlarını silmek istediğinizden emin misiniz\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -77,4 +78,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9c67dc72..8233b38d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">Нове повідомлення</string>
     <string name="mark_as_read">Прочитано</string>
     <string name="mark_as_unread">Не прочитано</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Справді видалити всі повідомлення у цьому листуванні\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -81,4 +82,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8494afa0..ec50ea8e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">新消息</string>
     <string name="mark_as_read">标记为已读</string>
     <string name="mark_as_unread">标记为未读</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">您确定要删除此对话的所有消息吗\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
@@ -96,4 +97,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c16fc959..ca16481b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">新訊息</string>
     <string name="mark_as_read">標為已讀</string>
     <string name="mark_as_unread">標為未讀</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">您確定要刪除此對話中的所有訊息嗎？</string>
     <!-- Are you sure you want to delete 5 conversations? -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88b1121b..3f3dcbfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="new_message">New message</string>
     <string name="mark_as_read">Mark as Read</string>
     <string name="mark_as_unread">Mark as Unread</string>
+    <string name="me">Me</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation?</string>
     <!-- Are you sure you want to delete 5 conversations? -->

From a10fd2faf96e57f19e80d7aeb37a41877912a358 Mon Sep 17 00:00:00 2001
From: Pavel Poley <pavelpoley88@gmail.com>
Date: Mon, 30 May 2022 16:01:50 +0300
Subject: [PATCH 2/6] russian translation

---
 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 2cb81a1c..4cf734bc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -29,7 +29,7 @@
     <string name="new_message">Новое сообщение</string>
     <string name="mark_as_read">Прочитано</string>
     <string name="mark_as_unread">Не прочитано</string>
-    <string name="me">Me</string>
+    <string name="me">Я</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Удалить все сообщения в этой переписке\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->

From 2d675ac8bef68d9d2688660523afe4ac1618b602 Mon Sep 17 00:00:00 2001
From: Pavel Poley <pavelpoley88@gmail.com>
Date: Tue, 31 May 2022 12:12:24 +0300
Subject: [PATCH 3/6] fix sending glitch shown at opening a conversation

---
 .../smsmessenger/receivers/SmsStatusSentReceiver.kt    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt
index 0a0bc761..24c0486e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt
@@ -43,7 +43,15 @@ class SmsStatusSentReceiver : SentReceiver() {
                 }
 
                 context.updateMessageType(messageId, type)
-                context.messagesDB.updateType(messageId, type)
+                val updated = context.messagesDB.updateType(messageId, type)
+                if (updated == 0) {
+                    Handler(Looper.getMainLooper()).postDelayed({
+                        ensureBackgroundThread {
+                            context.messagesDB.updateType(messageId, type)
+                        }
+                    }, 2000)
+                }
+
                 refreshMessages()
             }
         }

From 06bc45514b2d2e7cf9c6b1376ee646025ef7adee Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 31 May 2022 16:50:16 +0200
Subject: [PATCH 4/6] improve the way subsequent message SIM IDs are marked

---
 .../smsmessenger/activities/ThreadActivity.kt                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8dd7fc19..190954ab 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -638,7 +638,8 @@ class ThreadActivity : SimpleActivity() {
             val message = messages.getOrNull(i) ?: continue
             // do not show the date/time above every message, only if the difference between the 2 messages is at least MIN_DATE_TIME_DIFF_SECS,
             // or if the message is sent from a different SIM
-            if (message.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS || prevSIMId != message.subscriptionId) {
+            val isSentFromDifferentKnownSIM = prevSIMId != -1 && message.subscriptionId != -1 && prevSIMId != message.subscriptionId
+            if (message.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS || isSentFromDifferentKnownSIM) {
                 val simCardID = subscriptionIdToSimId[message.subscriptionId] ?: "?"
                 items.add(ThreadDateTime(message.date, simCardID))
                 prevDateTime = message.date

From e8903bb8c2a3c634f7a1326758753ee55616052d Mon Sep 17 00:00:00 2001
From: Artem <artem@molotov.work>
Date: Tue, 31 May 2022 08:42:27 +0000
Subject: [PATCH 5/6] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (55 of 55 strings)

Translation: Simple Mobile Tools/Simple SMS Messenger
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-sms-messenger/uk/
---
 app/src/main/res/values-uk/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9c67dc72..a504f3d6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple SMS Messenger</string>
+    <string name="app_name">Прості Повідомлення</string>
     <string name="app_launcher_name">Повідомлення</string>
     <string name="type_a_message">Введіть повідомлення…</string>
     <string name="message_not_sent_short">Повідомлення не надіслано</string>
@@ -73,7 +73,7 @@
     <string name="faq_2_text">Розмір MMS обмежений операторами, ви можете спробувати зменшити ліміт у налаштуваннях програми.</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
-    <string name="app_title">Simple SMS Messenger - просте управління SMS</string>
+    <string name="app_title">Прості Повідомлення - Керуйте SMS легко</string>
     <!-- Short description has to have max 80 characters -->
     <string name="app_short_description">Простий і швидкий спосіб керування SMS та MMS-повідомленнями без реклами.</string>
     <string name="app_long_description"> SMS/MMS-повідомлення — це чудовий спосіб підтримувати зв\'язок із близькими. Додаток також правильно опрацьовує групові повідомлення та блокування номерів на Android 7+. Підтримується багато форматів часу, щоб вам було зручно користуватися додатком. Також ви можете вибирати між 12- та 24-годинним форматом часу. Наш додаток має малий розмір в порівнянні з додатками конкурентів, що робить його завантаження справді швидким. За промовчанням додаток поставляється з матеріальним дизайном і темною темою, забезпечує чудовий користувацький досвід для простого використання. Відсутність доступу до Інтернету надає більше приватності, безпеки та стабільності, порівняно з іншими додатками. Не буде показувати рекламу; потрібні лише найнеобхідніші дозволи. Програмний код повністю відкритий, забезпечує настроювальні кольори оформлення. <b>Ознайомтеся з повним набором додатків Simple Tools тут:</b> https://www.simplemobiletools.com <b>Facebook:</b> https://www.facebook.com/simplemobiletools <b>Reddit:</b> https://www.reddit.com/r/SimpleMobileTools </string>

From 6106dc69e32207b01ff2d3fd4b4a82564dd439ed Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Wed, 1 Jun 2022 21:12:03 +0200
Subject: [PATCH 6/6] adding slovak translation

---
 app/src/main/res/values-sk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 1d42b02f..be6e7cd6 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -29,7 +29,7 @@
     <string name="new_message">Nová správa</string>
     <string name="mark_as_read">Označiť ako prečítané</string>
     <string name="mark_as_unread">Označiť ako neprečítané</string>
-    <string name="me">Me</string>
+    <string name="me">Ja</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ste si istý, že chcete odstrániť všetky správy tejto konverzácie\?</string>
     <!-- Are you sure you want to delete 5 conversations? -->