feat: E2EI certificat renew logic (WPB-3326) (#2067)

wireapp · Aug 14, 2023 · 92b79c8 · 92b79c8
1 parent 5b28d21
commit 92b79c8
Show file tree

Hide file tree

Showing 13 changed files with 471 additions and 142 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/mapper/MessageMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/MessageMapper.kt
@@ -167,12 +167,13 @@ class MessageMapper @Inject constructor(
         val flowStatus = if (content is MessageContent.FailedDecryption) {
             MessageFlowStatus.Failure.Decryption(content.isDecryptionResolved)
         } else {
-            when (message.status) {
-                Message.Status.PENDING -> MessageFlowStatus.Sending
-                Message.Status.SENT -> MessageFlowStatus.Sent
-                Message.Status.READ -> MessageFlowStatus.Read(1) // TODO add read count
-                Message.Status.FAILED -> MessageFlowStatus.Failure.Send.Locally(isMessageEdited)
-                Message.Status.FAILED_REMOTELY -> MessageFlowStatus.Failure.Send.Remotely(isMessageEdited, message.conversationId.domain)
+            when (val status = message.status) {
+                Message.Status.Pending -> MessageFlowStatus.Sending
+                Message.Status.Sent -> MessageFlowStatus.Sent
+                is Message.Status.Read -> MessageFlowStatus.Read(status.readCount.toInt())
+                Message.Status.Failed -> MessageFlowStatus.Failure.Send.Locally(isMessageEdited)
+                Message.Status.FailedRemotely -> MessageFlowStatus.Failure.Send.Remotely(isMessageEdited, message.conversationId.domain)
+                Message.Status.Delivered -> MessageFlowStatus.Delivered
             }
         }
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/common/WireDialog.kt b/app/src/main/kotlin/com/wire/android/ui/common/WireDialog.kt
@@ -86,6 +86,7 @@ fun WireDialog(
     shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.dialogCornerSize),
     contentPadding: PaddingValues = PaddingValues(MaterialTheme.wireDimensions.dialogContentPadding),
     properties: DialogProperties = DialogProperties(usePlatformDefaultWidth = false),
+    centerContent: Boolean = false,
     content: @Composable (() -> Unit)? = null
 ) {
     WireDialog(
@@ -109,6 +110,7 @@ fun WireDialog(
             )
             withStyle(style) { append(text) }
         },
+        centerContent = centerContent,
         content = content
     )
 }
@@ -127,6 +129,7 @@ fun WireDialog(
     shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.dialogCornerSize),
     contentPadding: PaddingValues = PaddingValues(MaterialTheme.wireDimensions.dialogContentPadding),
     properties: DialogProperties = DialogProperties(usePlatformDefaultWidth = false),
+    centerContent: Boolean = false,
     content: @Composable (() -> Unit)? = null
 ) {
     Dialog(
@@ -143,6 +146,7 @@ fun WireDialog(
             contentPadding = contentPadding,
             title = title,
             text = text,
+            centerContent = centerContent,
             content = content
         )
     }
@@ -159,6 +163,7 @@ private fun WireDialogContent(
     modifier: Modifier = Modifier,
     shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.dialogCornerSize),
     contentPadding: PaddingValues = PaddingValues(MaterialTheme.wireDimensions.dialogContentPadding),
+    centerContent: Boolean = false,
     content: @Composable (() -> Unit)? = null
 ) {
     val uriHandler = LocalUriHandler.current
@@ -172,7 +177,8 @@ private fun WireDialogContent(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(contentPadding)
+                .padding(contentPadding),
+            horizontalAlignment = if (centerContent) Alignment.CenterHorizontally else Alignment.Start
         ) {
             Text(
                 text = title,

diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt
@@ -52,7 +52,7 @@ import com.wire.android.util.getGitBuildId
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.keypackage.MLSKeyPackageCountResult
 import com.wire.kalium.logic.feature.keypackage.MLSKeyPackageCountUseCase
-import com.wire.kalium.logic.sync.incremental.RestartSlowSyncProcessForRecoveryUseCase
+import com.wire.kalium.logic.sync.slow.RestartSlowSyncProcessForRecoveryUseCase
 import com.wire.kalium.logic.sync.periodic.UpdateApiVersionsScheduler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext