Further cleanup of stragglers

session-foundation · Jul 28, 2024 · 2d9961d · 2d9961d
1 parent 08b8a84
commit 2d9961d
Show file tree

Hide file tree

Showing 107 changed files with 18 additions and 471 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt
@@ -24,7 +24,7 @@ data class State(
     val showDebugOptions: Boolean = false
 ) {
     val subtitle get() = when {
-        isGroup || isNoteToSelf -> GetString(R.string.activity_disappearing_messages_subtitle_sent)
+        isGroup || isNoteToSelf -> GetString(R.string.disappearingMessagesDisappearAfterSendDescription)
         else -> GetString(R.string.activity_disappearing_messages_subtitle)
     }
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt
@@ -14,7 +14,7 @@ import kotlin.time.Duration.Companion.seconds
 fun State.toUiState() = UiState(
     cards = listOfNotNull(
         typeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.disappearingMessagesDeleteType), it) },
-        timeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.activity_disappearing_messages_timer), it) }
+        timeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.disappearingMessagesTimer), it) }
     ),
     showGroupFooter = isGroup && isNewConfigEnabled,
     showSetButton = isSelfAdmin

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
@@ -562,11 +562,11 @@ class ConversationReactionOverlay : FrameLayout {
         }
         // Resync
         if (message.isSyncFailed) {
-            items += ActionItem(R.attr.menu_reply_icon, R.string.conversation_context__menu_resync_message, { handleActionItemClicked(Action.RESYNC) })
+            items += ActionItem(R.attr.menu_reply_icon, R.string.resync, { handleActionItemClicked(Action.RESYNC) })
         }
         // Save media
         if (message.isMms && (message as MediaMmsMessageRecord).containsMediaSlide()) {
-            items += ActionItem(R.attr.menu_save_icon, R.string.conversation_context_image__save_attachment, { handleActionItemClicked(Action.DOWNLOAD) }, R.string.AccessibilityId_save_attachment)
+            items += ActionItem(R.attr.menu_save_icon, R.string.save, { handleActionItemClicked(Action.DOWNLOAD) }, R.string.AccessibilityId_save_attachment)
         }
         backgroundView.visibility = VISIBLE
         foregroundView.visibility = VISIBLE

diff --git a/app/src/main/res/layout-sw400dp/activity_register.xml b/app/src/main/res/layout-sw400dp/activity_register.xml
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
diff --git a/app/src/main/res/menu/menu_conversation_item_action.xml b/app/src/main/res/menu/menu_conversation_item_action.xml
@@ -10,7 +10,7 @@
         app:showAsAction="always" />
 
     <item
-        android:title="@string/conversation_context_image__save_attachment"
+        android:title="@string/save"
         android:id="@+id/menu_context_save_attachment"
         android:icon="?menu_save_icon"
         app:showAsAction="always" />
@@ -33,7 +33,7 @@
         app:showAsAction="always" />
 
     <item
-        android:title="@string/conversation_context__menu_resync_message"
+        android:title="@string/resync"
         android:id="@+id/menu_context_resync"
         app:showAsAction="never" />
 

diff --git a/...ghtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt b/...ghtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt
@@ -88,7 +88,7 @@ class DisappearingMessagesViewModelTest {
         ).isEqualTo(
             UiState(
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     typeOption(ExpiryMode.NONE, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 12.hours),
                     timeOption(ExpiryType.AFTER_SEND, 1.days),
@@ -127,7 +127,7 @@ class DisappearingMessagesViewModelTest {
         ).isEqualTo(
             UiState(
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     typeOption(ExpiryMode.NONE, selected = false),
                     timeOption(ExpiryType.LEGACY, 12.hours),
                     timeOption(ExpiryType.LEGACY, 1.days),
@@ -166,7 +166,7 @@ class DisappearingMessagesViewModelTest {
         ).isEqualTo(
             UiState(
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     typeOption(ExpiryMode.NONE, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 12.hours),
                     timeOption(ExpiryType.AFTER_SEND, 1.days),
@@ -206,7 +206,7 @@ class DisappearingMessagesViewModelTest {
         ).isEqualTo(
             UiState(
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     typeOption(ExpiryMode.NONE, enabled = false, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 12.hours, enabled = false),
                     timeOption(ExpiryType.AFTER_SEND, 1.days, enabled = false),
@@ -293,7 +293,7 @@ class DisappearingMessagesViewModelTest {
                     typeOption(time, ExpiryType.AFTER_SEND, selected = true)
                 ),
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     timeOption(ExpiryType.AFTER_SEND, 12.hours, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 1.days),
                     timeOption(ExpiryType.AFTER_SEND, 7.days),
@@ -340,7 +340,7 @@ class DisappearingMessagesViewModelTest {
                     typeOption(1.days, ExpiryType.AFTER_SEND, enabled = false)
                 ),
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     timeOption(ExpiryType.LEGACY, 12.hours, selected = true),
                     timeOption(ExpiryType.LEGACY, 1.days),
                     timeOption(ExpiryType.LEGACY, 7.days),
@@ -386,7 +386,7 @@ class DisappearingMessagesViewModelTest {
                     typeOption(time, ExpiryType.AFTER_SEND, selected = true)
                 ),
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     timeOption(ExpiryType.AFTER_SEND, 12.hours),
                     timeOption(ExpiryType.AFTER_SEND, 1.days, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 7.days),
@@ -433,7 +433,7 @@ class DisappearingMessagesViewModelTest {
                     typeOption(time, ExpiryType.AFTER_SEND)
                 ),
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     timeOption(ExpiryType.AFTER_READ, 5.minutes),
                     timeOption(ExpiryType.AFTER_READ, 1.hours),
                     timeOption(ExpiryType.AFTER_READ, 12.hours),
@@ -486,7 +486,7 @@ class DisappearingMessagesViewModelTest {
                     typeOption(1.days, ExpiryType.AFTER_SEND, selected = true)
                 ),
                 OptionsCardData(
-                    R.string.activity_disappearing_messages_timer,
+                    R.string.disappearingMessagesTimer,
                     timeOption(ExpiryType.AFTER_SEND, 12.hours),
                     timeOption(ExpiryType.AFTER_SEND, 1.days, selected = true),
                     timeOption(ExpiryType.AFTER_SEND, 7.days),

diff --git a/libsession/src/main/res/values-ar-rSA/strings.xml b/libsession/src/main/res/values-ar-rSA/strings.xml
@@ -152,7 +152,6 @@
     <!-- conversation_context -->
     <string name="banUser">منع المستخدم</string>
     <!-- conversation_context_image -->
-    <string name="conversation_context_image__save_attachment">حفظ المرفق</string>
     <!-- conversation_expiring_off -->
     <!-- conversation_expiring_on -->
     <!-- conversation_muted -->
@@ -186,8 +185,6 @@
     <string name="activity_pn_mode_no_option_picked_dialog_title">اِختر</string>
     <string name="activity_home_empty_state_button_title">اِبدا جلسة محادثة</string>
     <string name="conversationsDeleted">تم حذف المحادثة</string>
-    <string name="activity_seed_title_2">هذه هي عبارة الاسترجاع</string>
-    <string name="activity_seed_explanation">عبارة الاسترجاع هي مفتاح عنوان تعريفك - يمكنك استخدامها لاسترجاع عنوان تعريفك اذا فقدت الوصول لجهازك. قم بحفظها في مكان امن و لا تعطها الى اي أحد.</string>
     <string name="onionRoutingPath">مسار</string>
     <string name="onionRoutingPathEntryNode">عقدة الدخول</string>
     <string name="onionRoutingPathServiceNode">عقدة الخدمة</string>
@@ -219,7 +216,6 @@
     <string name="appearanceThemes">الشكل</string>
     <string name="attachment">مُرفق</string>
     <string name="messageVoice">رسالة صوتية</string>
-    <string name="activity_link_device_skip_prompt">هذا يستغرق بعض الوقت، هل تريد أن تتخطى؟</string>
     <string name="communityJoinOfficial">أو انضم إلى واحدة من…</string>
     <string name="notificationsFastMode">الوضع السريع</string>
     <string name="notificationsSlowMode">الوضع البطيء</string>

diff --git a/libsession/src/main/res/values-ar/strings.xml b/libsession/src/main/res/values-ar/strings.xml
@@ -152,7 +152,6 @@
     <!-- conversation_context -->
     <string name="banUser">منع المستخدم</string>
     <!-- conversation_context_image -->
-    <string name="conversation_context_image__save_attachment">حفظ المرفق</string>
     <!-- conversation_expiring_off -->
     <!-- conversation_expiring_on -->
     <!-- conversation_muted -->
@@ -186,8 +185,6 @@
     <string name="activity_pn_mode_no_option_picked_dialog_title">اِختر</string>
     <string name="activity_home_empty_state_button_title">اِبدا جلسة محادثة</string>
     <string name="conversationsDeleted">تم حذف المحادثة</string>
-    <string name="activity_seed_title_2">هذه هي عبارة الاسترجاع</string>
-    <string name="activity_seed_explanation">عبارة الاسترجاع هي مفتاح عنوان تعريفك - يمكنك استخدامها لاسترجاع عنوان تعريفك اذا فقدت الوصول لجهازك. قم بحفظها في مكان امن و لا تعطها الى اي أحد.</string>
     <string name="onionRoutingPath">مسار</string>
     <string name="onionRoutingPathEntryNode">عقدة الدخول</string>
     <string name="onionRoutingPathServiceNode">عقدة الخدمة</string>
@@ -219,7 +216,6 @@
     <string name="appearanceThemes">الشكل</string>
     <string name="attachment">مُرفق</string>
     <string name="messageVoice">رسالة صوتية</string>
-    <string name="activity_link_device_skip_prompt">هذا يستغرق بعض الوقت، هل تريد أن تتخطى؟</string>
     <string name="communityJoinOfficial">أو انضم إلى واحدة من…</string>
     <string name="notificationsFastMode">الوضع السريع</string>
     <string name="notificationsSlowMode">الوضع البطيء</string>

diff --git a/libsession/src/main/res/values-az-rAZ/strings.xml b/libsession/src/main/res/values-az-rAZ/strings.xml
@@ -148,7 +148,6 @@
     <!-- conversation_context -->
     <string name="banUser">İstifadəçiyə qadağa qoy</string>
     <!-- conversation_context_image -->
-    <string name="conversation_context_image__save_attachment">Qoşmanı yaddaşda saxla</string>
     <!-- conversation_expiring_off -->
     <!-- conversation_expiring_on -->
     <!-- conversation_muted -->
@@ -182,8 +181,6 @@
     <string name="activity_pn_mode_no_option_picked_dialog_title">Zəhmət olmasa bir variant seçin</string>
     <string name="activity_home_empty_state_button_title">Bir Session başladın</string>
     <string name="conversationsDeleted">Danışıq silindi</string>
-    <string name="activity_seed_title_2">Bərpa parolunuzla tanış olun</string>
-    <string name="activity_seed_explanation">Bərpa parolunuz, Session kimliyinizin ana açarıdır - cihazınıza müraciəti itirsəniz, Session kimliyinizi geri yükləmək üçün bunu istifadə edə bilərsiniz. Bərpa parolunuzu etibarlı bir yerdə saxlayın və heç kəsə verməyin.</string>
     <string name="onionRoutingPath">Yol</string>
     <string name="onionRoutingPathEntryNode">Giriş Düyünü</string>
     <string name="onionRoutingPathServiceNode">Xidmət Düyünü</string>
@@ -215,7 +212,6 @@
     <string name="appearanceThemes">Tema</string>
     <string name="attachment">Qoşma</string>
     <string name="messageVoice">Səsyazmalı mesaj</string>
-    <string name="activity_link_device_skip_prompt">Bu bir az vaxt apara bilər, ötürmək istəyirsiniz?</string>
     <string name="communityJoinOfficial">Və ya bunlardan birinə qoşulun…</string>
     <string name="notificationsFastMode">Sürətli rejim</string>
     <string name="notificationsSlowMode">Yavaş rejim</string>