Merge branch 'develop' into feature/fga/pinned_message_banner_logic

2024-08-05 20:46:24 +02:00 · 2024-08-05 20:46:24 +02:00 · 229c02e895
commit 229c02e895
parent ca47a1c6d5 add20a1e12
45 changed files with 994 additions and 606 deletions
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@ -36,6 +36,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.network.useragent.UserAgentProvider
 import io.element.android.services.analytics.api.ScreenTracker
@ -43,11 +44,13 @@ import io.element.android.services.analytics.test.FakeScreenTracker
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilTimeout
+import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.test.TestScope
@ -86,8 +89,9 @@ class CallScreenPresenterTest {
    @Test
    fun `present - with CallType RoomCall sets call as active, loads URL, runs WidgetDriver and notifies the other clients a call started`() = runTest {
        val sendCallNotificationIfNeededLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(MutableStateFlow(SyncState.Running))
        val fakeRoom = FakeMatrixRoom(sendCallNotificationIfNeededResult = sendCallNotificationIfNeededLambda)
-        val client = FakeMatrixClient().apply {
+        val client = FakeMatrixClient(syncService = syncService).apply {
            givenGetRoomResult(A_ROOM_ID, fakeRoom)
        }
        val widgetDriver = FakeMatrixWidgetDriver()
@ -216,7 +220,12 @@ class CallScreenPresenterTest {
    fun `present - automatically starts the Matrix client sync when on RoomCall`() = runTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
-        val matrixClient = FakeMatrixClient()
+        val syncStateFlow = MutableStateFlow(SyncState.Idle)
+        val startSyncLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(syncStateFlow = syncStateFlow).apply {
+            this.startSyncLambda = startSyncLambda
+        }
+        val matrixClient = FakeMatrixClient(syncService = syncService)
        val presenter = createCallScreenPresenter(
            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
            widgetDriver = widgetDriver,
@ -230,7 +239,7 @@ class CallScreenPresenterTest {
        }.test {
            consumeItemsUntilTimeout()

-            assertThat(matrixClient.syncService().syncState.value).isEqualTo(SyncState.Running)
+            assert(startSyncLambda).isCalledOnce()

            cancelAndIgnoreRemainingEvents()
        }
@ -240,7 +249,12 @@ class CallScreenPresenterTest {
    fun `present - automatically stops the Matrix client sync on dispose`() = runTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
-        val matrixClient = FakeMatrixClient()
+        val syncStateFlow = MutableStateFlow(SyncState.Running)
+        val stopSyncLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(syncStateFlow = syncStateFlow).apply {
+            this.stopSyncLambda = stopSyncLambda
+        }
+        val matrixClient = FakeMatrixClient(syncService = syncService)
        val presenter = createCallScreenPresenter(
            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
            widgetDriver = widgetDriver,
@ -262,7 +276,7 @@ class CallScreenPresenterTest {

        job.cancelAndJoin()

-        assertThat(matrixClient.syncService().syncState.value).isEqualTo(SyncState.Terminated)
+        assert(stopSyncLambda).isCalledOnce()
    }

    private fun TestScope.createCallScreenPresenter(
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@ -95,6 +95,7 @@ import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@ -219,7 +220,7 @@ class RoomListPresenterTest {
        val encryptionService = FakeEncryptionService().apply {
            emitRecoveryState(RecoveryState.INCOMPLETE)
        }
-        val syncService = FakeSyncService(initialState = SyncState.Running)
+        val syncService = FakeSyncService(MutableStateFlow(SyncState.Running))
        val presenter = createRoomListPresenter(
            client = FakeMatrixClient(roomListService = roomListService, encryptionService = encryptionService, syncService = syncService),
            coroutineScope = scope,
@ -250,7 +251,7 @@ class RoomListPresenterTest {
            sessionVerificationService = FakeSessionVerificationService().apply {
                givenNeedsSessionVerification(false)
            },
-            syncService = FakeSyncService(initialState = SyncState.Running)
+            syncService = FakeSyncService(MutableStateFlow(SyncState.Running))
        )
        val scope = CoroutineScope(context = coroutineContext + SupervisorJob())
        val presenter = createRoomListPresenter(
--- a/features/verifysession/impl/src/main/res/values-be/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-be/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Стварыць новы ключ аднаўлення"</string>
  <string name="screen_identity_confirmation_subtitle">"Пацвердзіце гэтую прыладу, каб наладзіць бяспечны абмен паведамленнямі."</string>
  <string name="screen_identity_confirmation_title">"Пацвердзіце, што гэта вы"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Выкарыстоўвайце іншую прыладу"</string>
  <string name="screen_identity_confirmed_subtitle">"Цяпер вы можаце бяспечна чытаць і адпраўляць паведамленні, і ўсе, з кім вы маеце зносіны ў чаце, таксама могуць давяраць гэтай прыладзе."</string>
  <string name="screen_identity_confirmed_title">"Прылада праверана"</string>
  <string name="screen_identity_use_another_device">"Выкарыстоўвайце іншую прыладу"</string>
--- a/features/verifysession/impl/src/main/res/values-cs/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-cs/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Vytvoření nového klíče pro obnovení"</string>
  <string name="screen_identity_confirmation_subtitle">"Ověřte toto zařízení a nastavte zabezpečené zasílání zpráv."</string>
  <string name="screen_identity_confirmation_title">"Potvrďte, že jste to vy"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Použít jiné zařízení"</string>
  <string name="screen_identity_confirmed_subtitle">"Nyní můžete bezpečně číst nebo odesílat zprávy, a kdokoli, s kým chatujete, může tomuto zařízení důvěřovat."</string>
  <string name="screen_identity_confirmed_title">"Zařízení ověřeno"</string>
  <string name="screen_identity_use_another_device">"Použít jiné zařízení"</string>
--- a/features/verifysession/impl/src/main/res/values-de/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-de/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Erstelle einen neuen Wiederherstellungsschlüssel"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifiziere dieses Gerät, um sicheres Messaging einzurichten."</string>
  <string name="screen_identity_confirmation_title">"Bestätige, dass du es bist"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Ein anderes Gerät verwenden"</string>
  <string name="screen_identity_confirmed_subtitle">"Du kannst nun verschlüsselte Nachrichten lesen oder versenden."</string>
  <string name="screen_identity_confirmed_title">"Gerät verifiziert"</string>
  <string name="screen_identity_use_another_device">"Ein anderes Gerät verwenden"</string>
--- a/features/verifysession/impl/src/main/res/values-el/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-el/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Δημιουργία νέου κλειδιού ανάκτησης"</string>
  <string name="screen_identity_confirmation_subtitle">"Επαλήθευσε αυτήν τη συσκευή για να ρυθμίσεις την ασφαλή επικοινωνία."</string>
  <string name="screen_identity_confirmation_title">"Επιβεβαίωσε ότι είσαι εσύ"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Χρήση άλλης συσκευής"</string>
  <string name="screen_identity_confirmed_subtitle">"Τώρα μπορείς να διαβάζεις ή να στέλνεις μηνύματα με ασφάλεια και επίσης μπορεί να εμπιστευτεί αυτήν τη συσκευή οποιοσδήποτε με τον οποίο συνομιλείς."</string>
  <string name="screen_identity_confirmed_title">"Επαληθευμένη συσκευή"</string>
  <string name="screen_identity_use_another_device">"Χρήση άλλης συσκευής"</string>
--- a/features/verifysession/impl/src/main/res/values-es/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-es/translations.xml
@ -2,8 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_identity_confirmation_subtitle">"Verifica este dispositivo para configurar la mensajería segura."</string>
  <string name="screen_identity_confirmation_title">"Confirma que eres tú"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Usar otro dispositivo"</string>
  <string name="screen_identity_confirmed_subtitle">"Ahora puedes leer o enviar mensajes de forma segura y cualquier persona con la que chatees también puede confiar en este dispositivo."</string>
  <string name="screen_identity_confirmed_title">"Dispositivo verificado"</string>
+  <string name="screen_identity_use_another_device">"Usar otro dispositivo"</string>
  <string name="screen_session_verification_cancelled_subtitle">"Algo no fue bien. Se agotó el tiempo de espera de la solicitud o se rechazó."</string>
  <string name="screen_session_verification_compare_emojis_subtitle">"Confirma que los emojis que aparecen a continuación coinciden con los que aparecen en tu otra sesión."</string>
  <string name="screen_session_verification_compare_emojis_title">"Comparar emojis"</string>
--- a/features/verifysession/impl/src/main/res/values-et/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-et/translations.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Kas kinnitamine pole võimalik?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Loo uus taastevõti"</string>
  <string name="screen_identity_confirmation_subtitle">"Krüptitud sõnumivahetuse tagamiseks verifitseeri see seade."</string>
  <string name="screen_identity_confirmation_title">"Kinnita, et see oled sina"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Kasuta teist seadet"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Kasuta taastevõtit"</string>
  <string name="screen_identity_confirmed_subtitle">"Nüüd saad saata või lugeda sõnumeid turvaliselt ning kõik sinu vestluspartnerid võivad usaldada seda seadet."</string>
  <string name="screen_identity_confirmed_title">"Seade on verifitseeritud"</string>
-  <string name="screen_identity_use_another_device">"Kasuta mõnda muud seadet"</string>
+  <string name="screen_identity_use_another_device">"Kasuta teist seadet"</string>
  <string name="screen_identity_waiting_on_other_device">"Ootame teise seadme järgi…"</string>
  <string name="screen_session_verification_cancelled_subtitle">"Olukord pole päris õige. Päring kas aegus või teine osapool keeldus päringule vastamast."</string>
  <string name="screen_session_verification_compare_emojis_subtitle">"Kinnita, et kõik järgnevalt kuvatud emojid on täpselt samad, mida sa näed oma teises sessioonis."</string>
--- a/features/verifysession/impl/src/main/res/values-fr/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-fr/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Créer une nouvelle clé de récupération"</string>
  <string name="screen_identity_confirmation_subtitle">"Vérifier cette session pour configurer votre messagerie sécurisée."</string>
  <string name="screen_identity_confirmation_title">"Confirmez votre identité"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Utiliser une autre session"</string>
  <string name="screen_identity_confirmed_subtitle">"Vous pouvez désormais lire ou envoyer des messages en toute sécurité, et toute personne avec qui vous discutez peut également faire confiance à cette session."</string>
  <string name="screen_identity_confirmed_title">"Session vérifiée"</string>
  <string name="screen_identity_use_another_device">"Utiliser une autre session"</string>
--- a/features/verifysession/impl/src/main/res/values-hu/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-hu/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Új helyreállítási kulcs létrehozása"</string>
  <string name="screen_identity_confirmation_subtitle">"A biztonságos üzenetkezelés beállításához ellenőrizze ezt az eszközt."</string>
  <string name="screen_identity_confirmation_title">"Erősítse meg, hogy Ön az"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Másik eszköz használata"</string>
  <string name="screen_identity_confirmed_subtitle">"Mostantól biztonságosan olvashat vagy küldhet üzeneteket, és bármelyik csevegőpartnere megbízhat ebben az eszközben."</string>
  <string name="screen_identity_confirmed_title">"Eszköz ellenőrizve"</string>
  <string name="screen_identity_use_another_device">"Másik eszköz használata"</string>
--- a/features/verifysession/impl/src/main/res/values-in/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-in/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Buat kunci pemulihan baru"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifikasi perangkat ini untuk menyiapkan perpesanan aman."</string>
  <string name="screen_identity_confirmation_title">"Konfirmasi bahwa ini Anda"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Gunakan perangkat lain"</string>
  <string name="screen_identity_confirmed_subtitle">"Sekarang Anda dapat membaca atau mengirim pesan dengan aman, dan siapa pun yang mengobrol dengan Anda juga dapat mempercayai perangkat ini."</string>
  <string name="screen_identity_confirmed_title">"Perangkat terverifikasi"</string>
  <string name="screen_identity_use_another_device">"Gunakan perangkat lain"</string>
--- a/features/verifysession/impl/src/main/res/values-it/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-it/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Crea una nuova chiave di recupero"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifica questo dispositivo per segnare i tuoi messaggi come sicuri."</string>
  <string name="screen_identity_confirmation_title">"Conferma la tua identità"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Usa un altro dispositivo"</string>
  <string name="screen_identity_confirmed_subtitle">"Ora puoi leggere o inviare messaggi in tutta sicurezza e anche chi chatta con te può fidarsi di questo dispositivo."</string>
  <string name="screen_identity_confirmed_title">"Dispositivo verificato"</string>
  <string name="screen_identity_use_another_device">"Usa un altro dispositivo"</string>
--- a/features/verifysession/impl/src/main/res/values-pl/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pl/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Utwórz nowy klucz przywracania"</string>
  <string name="screen_identity_confirmation_subtitle">"Zweryfikuj to urządzenie, aby skonfigurować bezpieczne przesyłanie wiadomości."</string>
  <string name="screen_identity_confirmation_title">"Potwierdź, że to Ty"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Użyj innego urządzenia"</string>
  <string name="screen_identity_confirmed_subtitle">"Teraz możesz bezpiecznie czytać i wysyłać wiadomości, każdy z kim czatujesz również może ufać temu urządzeniu."</string>
  <string name="screen_identity_confirmed_title">"Urządzenie zweryfikowane"</string>
  <string name="screen_identity_use_another_device">"Użyj innego urządzenia"</string>
--- a/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_use_another_device">"Usar outro dispositivo"</string>
  <string name="screen_identity_confirmed_title">"Dispositivo verificado"</string>
  <string name="screen_identity_use_another_device">"Usar outro dispositivo"</string>
  <string name="screen_session_verification_cancelled_subtitle">"Algo não parece certo. Ou a solicitação atingiu o tempo limite ou a solicitação foi negada."</string>
--- a/features/verifysession/impl/src/main/res/values-pt/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pt/translations.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Não é possível confirmar?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Criar uma nova chave de recuperação"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifica este dispositivo para configurar o envio seguro de mensagens."</string>
  <string name="screen_identity_confirmation_title">"Confirma que és tu"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Utilizar outro dispositivo"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Utilizar chave de recuperação"</string>
  <string name="screen_identity_confirmed_subtitle">"Agora podes ler ou enviar mensagens de forma segura, e qualquer pessoa com quem converses também pode confiar neste dispositivo."</string>
  <string name="screen_identity_confirmed_title">"Dispositivo verificado"</string>
  <string name="screen_identity_use_another_device">"Utilizar outro dispositivo"</string>
--- a/features/verifysession/impl/src/main/res/values-ro/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-ro/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Creați o nouă cheie de recuperare"</string>
  <string name="screen_identity_confirmation_subtitle">"Verificați acest dispozitiv pentru a configura mesagerie securizată."</string>
  <string name="screen_identity_confirmation_title">"Confirmați că sunteți dumneavoastră"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Utilizați un alt dispozitiv"</string>
  <string name="screen_identity_confirmed_subtitle">"Acum puteți citi sau trimite mesaje în siguranță, iar oricine cu care conversați poate avea încredere în acest dispozitiv."</string>
  <string name="screen_identity_confirmed_title">"Dispozitiv verificat"</string>
  <string name="screen_identity_use_another_device">"Utilizați un alt dispozitiv"</string>
--- a/features/verifysession/impl/src/main/res/values-ru/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-ru/translations.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Не можете подтвердить?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">
    "Создайте новый "
    <b>"ключ восстановления"</b>
  </string>
  <string name="screen_identity_confirmation_subtitle">"Подтвердите это устройство, чтобы настроить безопасный обмен сообщениями."</string>
  <string name="screen_identity_confirmation_title">"Подтвердите, что это вы"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Используйте другое устройство"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Используйте recovery key"</string>
  <string name="screen_identity_confirmed_subtitle">"Теперь вы можете безопасно читать и отправлять сообщения, и все, с кем вы общаетесь в чате, также могут доверять этому устройству."</string>
  <string name="screen_identity_confirmed_title">"Устройство проверено"</string>
  <string name="screen_identity_use_another_device">"Используйте другое устройство"</string>
--- a/features/verifysession/impl/src/main/res/values-sk/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sk/translations.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Nemôžete potvrdiť?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Vytvoriť nový kľúč na obnovenie"</string>
  <string name="screen_identity_confirmation_subtitle">"Ak chcete nastaviť zabezpečené správy, overte toto zariadenie."</string>
  <string name="screen_identity_confirmation_title">"Potvrďte, že ste to vy"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Použite iné zariadenie"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Použiť kľúč na obnovenie"</string>
  <string name="screen_identity_confirmed_subtitle">"Teraz môžete bezpečne čítať alebo odosielať správy a tomuto zariadeniu môže dôverovať aj ktokoľvek, s kým konverzujete."</string>
  <string name="screen_identity_confirmed_title">"Zariadenie overené"</string>
-  <string name="screen_identity_use_another_device">"Použiť iné zariadenie"</string>
+  <string name="screen_identity_use_another_device">"Použite iné zariadenie"</string>
  <string name="screen_identity_waiting_on_other_device">"Čaká sa na druhom zariadení…"</string>
  <string name="screen_session_verification_cancelled_subtitle">"Zdá sa, že niečo nie je v poriadku. Časový limit žiadosti vypršal alebo bola žiadosť zamietnutá."</string>
  <string name="screen_session_verification_compare_emojis_subtitle">"Skontrolujte, či sa emotikony uvedené nižšie zhodujú s emotikonmi zobrazenými vo vašej druhej relácii."</string>
--- a/features/verifysession/impl/src/main/res/values-sv/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sv/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"Skapa en ny återställningsnyckel"</string>
  <string name="screen_identity_confirmation_subtitle">"Verifiera den här enheten för att konfigurera säkra meddelanden."</string>
  <string name="screen_identity_confirmation_title">"Bekräfta att det är du"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Använd en annan enhet"</string>
  <string name="screen_identity_confirmed_subtitle">"Nu kan du läsa eller skicka meddelanden säkert, och alla du chattar med kan också lita på den här enheten."</string>
  <string name="screen_identity_confirmed_title">"Enhet verifierad"</string>
  <string name="screen_identity_use_another_device">"Använd en annan enhet"</string>
--- a/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"建立新的復原金鑰"</string>
  <string name="screen_identity_confirmation_subtitle">"驗證這部裝置以設定安全通訊。"</string>
  <string name="screen_identity_confirmation_title">"確認這是你本人"</string>
+  <string name="screen_identity_confirmation_use_another_device">"使用另一部裝置"</string>
  <string name="screen_identity_confirmed_subtitle">"您可以安全地讀取和發送訊息了，與您聊天的人也可以信任這部裝置。"</string>
  <string name="screen_identity_confirmed_title">"裝置已驗證"</string>
  <string name="screen_identity_use_another_device">"使用另一部裝置"</string>
--- a/features/verifysession/impl/src/main/res/values-zh/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh/translations.xml
@ -3,6 +3,7 @@
  <string name="screen_identity_confirmation_create_new_recovery_key">"创建新的恢复密钥"</string>
  <string name="screen_identity_confirmation_subtitle">"验证此设备以开始安全地收发消息。"</string>
  <string name="screen_identity_confirmation_title">"确认这是你"</string>
+  <string name="screen_identity_confirmation_use_another_device">"使用其他设备"</string>
  <string name="screen_identity_confirmed_subtitle">"现在，您可以安全地阅读或发送消息，与您聊天的人也会信任此设备。"</string>
  <string name="screen_identity_confirmed_title">"设备已验证"</string>
  <string name="screen_identity_use_another_device">"使用其他设备"</string>
--- a/features/verifysession/impl/src/main/res/values/localazy.xml
+++ b/features/verifysession/impl/src/main/res/values/localazy.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Can\'t confirm?"</string>
  <string name="screen_identity_confirmation_create_new_recovery_key">"Create a new recovery key"</string>
  <string name="screen_identity_confirmation_subtitle">"Verify this device to set up secure messaging."</string>
  <string name="screen_identity_confirmation_title">"Confirm that it\'s you"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Use another device"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Use recovery key"</string>
  <string name="screen_identity_confirmed_subtitle">"Now you can read or send messages securely, and anyone you chat with can also trust this device."</string>
  <string name="screen_identity_confirmed_title">"Device verified"</string>
  <string name="screen_identity_use_another_device">"Use another device"</string>