Merge pull request #7823 from element-hq/feature/bma/multiAccountIncomingVerification

Multi account incoming device verification

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt

@@ -245,6 +245,7 @@ class RustSessionVerificationService(
 
     fun destroy() {
         Timber.d("Destroying RustSessionVerificationService")
+        listener = null
         verificationStateListenerTaskHandle.cancelAndDestroy()
         recoveryStateListenerTaskHandle.cancelAndDestroy()
         if (this::verificationController.isInitialized) {

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/accountinfo/AccountInfoCard.kt

@@ -127,8 +127,7 @@ private fun DeviceInfoRow(
             horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
             TextWithLabelMolecule(
-                // TODO i18n
-                label = "Signed in",
+                label = stringResource(CommonStrings.common_signed_in),
                 text = mode.signInFormattedTimestamp,
                 modifier = Modifier.weight(1f),
             )

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/accountinfo/AccountInfoCardState.kt

@@ -24,7 +24,6 @@ sealed interface AccountInfoCardMode {
         val otherUser: MatrixUser,
     ) : AccountInfoCardMode
 
-    // TODO Replace SessionDetailsView with this component
     data class DeviceVerification(
         val deviceName: String?,
         val deviceId: DeviceId,

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

@@ -413,6 +413,7 @@ Reason: %1$s."</string>
   <string name="common_shared_live_location">"Shared live location"</string>
   <string name="common_shared_location">"Shared location"</string>
   <string name="common_shared_space">"Shared space"</string>
+  <string name="common_signed_in">"Signed in"</string>
   <string name="common_signing_out">"Removing device"</string>
   <string name="common_something_went_wrong">"Something went wrong"</string>
   <string name="common_something_went_wrong_message">"We encountered an issue. Please try again."</string>