Merge pull request #1642 from vector-im/feature/fga/pin_settings

PIN : settings and branch flow

libraries/cryptography/impl/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation(libs.dagger)
     implementation(projects.anvilannotations)
     implementation(projects.libraries.di)
-    implementation(projects.libraries.cryptography.api)
+    api(projects.libraries.cryptography.api)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.test.truth)

libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/KeyStoreSecretKeyProvider.kt

@@ -40,7 +40,9 @@ class KeyStoreSecretKeyProvider @Inject constructor() : SecretKeyProvider {
     // False positive lint issue
     @SuppressLint("WrongConstant")
     override fun getOrCreateKey(alias: String): SecretKey {
-        val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
+        val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply {
+            load(null)
+        }
         val secretKeyEntry = (keyStore.getEntry(alias, null) as? KeyStore.SecretKeyEntry)
             ?.secretKey
         return if (secretKeyEntry == null) {

libraries/eventformatter/impl/src/main/res/values-zh-rTW/translations.xml

@@ -30,6 +30,7 @@
   <string name="state_event_room_remove_by_you">"%1$s 已被您移除"</string>
   <string name="state_event_room_third_party_invite">"%1$s 邀請 %2$s 加入聊天室"</string>
   <string name="state_event_room_third_party_invite_by_you">"您邀請 %1$s 加入聊天室"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s 撤銷了 %2$s 加入房間的邀請"</string>
   <string name="state_event_room_topic_changed">"%1$s 將主題變更為 %2$s"</string>
   <string name="state_event_room_topic_changed_by_you">"您將主題變更為 %1$s"</string>
   <string name="state_event_room_topic_removed">"聊天室主題已被 %1$s 移除"</string>

libraries/ui-strings/src/main/res/values-sk/translations.xml

@@ -167,6 +167,7 @@
   <string name="common_video">"Video"</string>
   <string name="common_voice_message">"Hlasová správa"</string>
   <string name="common_waiting">"Čaká sa…"</string>
+  <string name="common_waiting_for_decryption_key">"Čaká sa na dešifrovací kľúč"</string>
   <string name="common_poll_end_confirmation">"Ste si istí, že chcete ukončiť túto anketu?"</string>
   <string name="common_poll_summary">"Anketa: %1$s"</string>
   <string name="dialog_title_confirmation">"Potvrdenie"</string>
@@ -273,6 +274,8 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</stri
   <string name="screen_recovery_key_confirm_key_placeholder">"Zadať…"</string>
   <string name="screen_recovery_key_confirm_success">"Kľúč na obnovu potvrdený"</string>
   <string name="screen_recovery_key_confirm_title">"Potvrďte kľúč na obnovenie"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Skopírovaný kľúč na obnovenie"</string>
+  <string name="screen_recovery_key_generating_key">"Generovanie…"</string>
   <string name="screen_recovery_key_save_action">"Uložiť kľúč na obnovenie"</string>
   <string name="screen_recovery_key_save_description">"Zapíšte si kľúč na obnovenie na bezpečné miesto alebo ho uložte do správcu hesiel."</string>
   <string name="screen_recovery_key_save_key_description">"Ťuknutím skopírujte kľúč na obnovenie"</string>

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -35,6 +35,7 @@
   <string name="action_edit">"Edit"</string>
   <string name="action_enable">"Enable"</string>
   <string name="action_end_poll">"End poll"</string>
+  <string name="action_enter_pin">"Enter PIN"</string>
   <string name="action_forgot_password">"Forgot password?"</string>
   <string name="action_forward">"Forward"</string>
   <string name="action_invite">"Invite"</string>
@@ -52,7 +53,7 @@
   <string name="action_no">"No"</string>
   <string name="action_not_now">"Not now"</string>
   <string name="action_ok">"OK"</string>
-  <string name="action_open_settings">"Open settings"</string>
+  <string name="action_open_settings">"Settings"</string>
   <string name="action_open_with">"Open with"</string>
   <string name="action_quick_reply">"Quick reply"</string>
   <string name="action_quote">"Quote"</string>
@@ -146,6 +147,7 @@
   <string name="common_server_url">"Server URL"</string>
   <string name="common_settings">"Settings"</string>
   <string name="common_shared_location">"Shared location"</string>
+  <string name="common_signing_out">"Signing out"</string>
   <string name="common_starting_chat">"Starting chat…"</string>
   <string name="common_sticker">"Sticker"</string>
   <string name="common_success">"Success"</string>
@@ -168,8 +170,11 @@
   <string name="common_video">"Video"</string>
   <string name="common_voice_message">"Voice message"</string>
   <string name="common_waiting">"Waiting…"</string>
+  <string name="common_waiting_for_decryption_key">"Waiting for decryption key"</string>
   <string name="common_poll_end_confirmation">"Are you sure you want to end this poll?"</string>
   <string name="common_poll_summary">"Poll: %1$s"</string>
+  <string name="confirm_recovery_key_banner_message">"Your chat backup is currently out of sync. You need to confirm your recovery key to maintain access to your chat backup."</string>
+  <string name="confirm_recovery_key_banner_title">"Confirm your recovery key"</string>
   <string name="dialog_title_confirmation">"Confirmation"</string>
   <string name="dialog_title_warning">"Warning"</string>
   <string name="emoji_picker_category_activity">"Activities"</string>
@@ -269,6 +274,8 @@ If you proceed, some of your settings may change."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Enter…"</string>
   <string name="screen_recovery_key_confirm_success">"Recovery key confirmed"</string>
   <string name="screen_recovery_key_confirm_title">"Confirm your recovery key"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Copied recovery key"</string>
+  <string name="screen_recovery_key_generating_key">"Generating…"</string>
   <string name="screen_recovery_key_save_action">"Save recovery key"</string>
   <string name="screen_recovery_key_save_description">"Write down your recovery key somewhere safe or save it in a password manager."</string>
   <string name="screen_recovery_key_save_key_description">"Tap to copy recovery key"</string>