fix: self-deleting asset message timer [WPB-1807] 🍒 (#3470)

wireapp · Sep 26, 2024 · e49ce58 · e49ce58
1 parent da7c22a
commit e49ce58
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 105 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageExpiration.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageExpiration.kt
@@ -32,9 +32,6 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.wire.android.R
 import com.wire.android.ui.home.conversations.model.ExpirationStatus
 import com.wire.android.ui.home.conversations.model.UIMessage
-import com.wire.android.ui.home.conversations.model.UIMessageContent
-import com.wire.kalium.logic.data.asset.AssetTransferStatus
-import com.wire.kalium.logic.data.asset.isSaved
 import com.wire.kalium.logic.data.message.Message
 import kotlinx.coroutines.delay
 import kotlinx.datetime.Clock
@@ -250,62 +247,9 @@ class SelfDeletionTimerHelper(private val stringResourceProvider: StringResource
             }
 
             @Composable
-            fun startDeletionTimer(
-                message: UIMessage,
-                assetTransferStatus: AssetTransferStatus?,
-                onStartMessageSelfDeletion: (UIMessage) -> Unit
-            ) {
-                if (assetTransferStatus != null) {
-                    when (message.messageContent) {
-                        is UIMessageContent.AssetMessage -> startAssetDeletion(
-                            onSelfDeletingMessageRead = { onStartMessageSelfDeletion(message) },
-                            transferStatus = assetTransferStatus
-                        )
-
-                        is UIMessageContent.AudioAssetMessage -> startAssetDeletion(
-                            onSelfDeletingMessageRead = { onStartMessageSelfDeletion(message) },
-                            transferStatus = assetTransferStatus
-                        )
-
-                        is UIMessageContent.ImageMessage -> startAssetDeletion(
-                            onSelfDeletingMessageRead = { onStartMessageSelfDeletion(message) },
-                            transferStatus = assetTransferStatus
-                        )
-
-                        else -> startRegularDeletion(message = message, onStartMessageSelfDeletion = onStartMessageSelfDeletion)
-                    }
-                } else {
-                    startRegularDeletion(message = message, onStartMessageSelfDeletion = onStartMessageSelfDeletion)
-                }
-            }
-
-            @Composable
-            private fun startAssetDeletion(onSelfDeletingMessageRead: () -> Unit, transferStatus: AssetTransferStatus) {
-                LaunchedEffect(transferStatus) {
-                    if (transferStatus.isSaved()) {
-                        onSelfDeletingMessageRead()
-                    }
-                }
-                LaunchedEffect(key1 = timeLeft, key2 = transferStatus) {
-                    if (transferStatus.isSaved()) {
-                        if (timeLeft != ZERO) {
-                            delay(updateInterval())
-                            recalculateTimeLeft()
-                        }
-                    }
-                }
-                val lifecycleOwner = LocalLifecycleOwner.current
-                LaunchedEffect(lifecycleOwner) {
-                    lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                        recalculateTimeLeft()
-                    }
-                }
-            }
-
-            @Composable
-            private fun startRegularDeletion(message: UIMessage, onStartMessageSelfDeletion: (UIMessage) -> Unit) {
+            fun StartDeletionTimer(message: UIMessage, onSelfDeletingMessageRead: (UIMessage) -> Unit) {
                 LaunchedEffect(Unit) {
-                    onStartMessageSelfDeletion(message)
+                    onSelfDeletingMessageRead(message)
                 }
                 LaunchedEffect(timeLeft) {
                     if (timeLeft != ZERO) {
@@ -322,7 +266,7 @@ class SelfDeletionTimerHelper(private val stringResourceProvider: StringResource
             }
         }
 
-        object NotExpirable : SelfDeletionTimerState()
+        data object NotExpirable : SelfDeletionTimerState()
     }
 }
 

diff --git a/.../main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContainerItem.kt b/.../main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContainerItem.kt
@@ -65,10 +65,9 @@ fun MessageContainerItem(
         !message.isPending &&
         !message.sendingFailed
     ) {
-        selfDeletionTimerState.startDeletionTimer(
+        selfDeletionTimerState.StartDeletionTimer(
             message = message,
-            assetTransferStatus = assetStatus,
-            onStartMessageSelfDeletion = onSelfDeletingMessageRead
+            onSelfDeletingMessageRead = onSelfDeletingMessageRead
         )
     }
     Row(

diff --git a/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt b/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt
@@ -107,7 +107,6 @@ import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.launchGeoIntent
 import com.wire.kalium.logic.data.asset.AssetTransferStatus
-import com.wire.kalium.logic.data.asset.isSaved
 import kotlin.math.absoluteValue
 import kotlin.math.min
 
@@ -171,7 +170,7 @@ fun RegularMessageItem(
                         Spacer(modifier = Modifier.height(dimensions().spacing4x))
                     }
                     if (selfDeletionTimerState is SelfDeletionTimerHelper.SelfDeletionTimerState.Expirable) {
-                        MessageExpireLabel(messageContent, assetStatus, selfDeletionTimerState.timeLeftFormatted)
+                        MessageExpireLabel(messageContent, selfDeletionTimerState.timeLeftFormatted)
 
                         // if the message is marked as deleted and is [SelfDeletionTimer.SelfDeletionTimerState.Expirable]
                         // the deletion responsibility belongs to the receiver, therefore we need to wait for the receiver
@@ -466,52 +465,16 @@ fun EphemeralMessageExpiredLabel(
 }
 
 @Composable
-fun MessageExpireLabel(messageContent: UIMessageContent?, assetTransferStatus: AssetTransferStatus?, timeLeft: String) {
+fun MessageExpireLabel(messageContent: UIMessageContent?, timeLeft: String) {
     when (messageContent) {
         is UIMessageContent.Location,
+        is UIMessageContent.AssetMessage,
+        is UIMessageContent.AudioAssetMessage,
+        is UIMessageContent.ImageMessage,
         is UIMessageContent.TextMessage -> {
             StatusBox(statusText = stringResource(R.string.self_deleting_message_time_left, timeLeft))
         }
 
-        is UIMessageContent.AssetMessage -> {
-            StatusBox(
-                statusText = if (assetTransferStatus.isSaved()) {
-                    stringResource(
-                        R.string.self_deleting_message_time_left,
-                        timeLeft
-                    )
-                } else {
-                    stringResource(R.string.self_deleting_message_label, timeLeft)
-                }
-            )
-        }
-
-        is UIMessageContent.AudioAssetMessage -> {
-            StatusBox(
-                statusText = if (assetTransferStatus.isSaved()) {
-                    stringResource(
-                        R.string.self_deleting_message_time_left,
-                        timeLeft
-                    )
-                } else {
-                    stringResource(R.string.self_deleting_message_label, timeLeft)
-                }
-            )
-        }
-
-        is UIMessageContent.ImageMessage -> {
-            StatusBox(
-                statusText = if (assetTransferStatus.isSaved()) {
-                    stringResource(
-                        R.string.self_deleting_message_time_left,
-                        timeLeft
-                    )
-                } else {
-                    stringResource(R.string.self_deleting_message_label, timeLeft)
-                }
-            )
-        }
-
         is UIMessageContent.Deleted -> {
             val context = LocalContext.current
 

diff --git a/kalium b/kalium
+2 −2		.github/workflows/gradle-android-instrumented-tests.yml
+2 −2		.github/workflows/gradle-android-unit-tests.yml
+2 −2		.github/workflows/gradle-ios-tests.yml
+2 −2		.github/workflows/gradle-jvm-tests.yml
+11 −5		cryptography/src/androidMain/kotlin/com/wire/kalium/cryptography/ProteusClientCryptoBoxImpl.kt
+13 −9		cryptography/src/appleMain/kotlin/com/wire/kalium/cryptography/ProteusClientCoreCryptoImpl.kt
+7 −2		cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt
+11 −1		cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/ProteusClient.kt
+59 −23		cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/ProteusClientTest.kt
+5 −4		cryptography/src/jsMain/kotlin/com/wire/kalium/cryptography/ProteusClientCryptoBoxImpl.kt
+9 −9		cryptography/src/jvmMain/kotlin/com/wire/kalium/cryptography/ProteusClientCryptoBoxImpl.kt
+1 −1		data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/AssetContent.kt
+0 −5		logic/src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt
+0 −2		logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+1 −8		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+0 −3		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+8 −8		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnCloseCall.kt
+1 −58		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallHelper.kt
+0 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+6 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/asset/ScheduleNewAssetMessageUseCase.kt
+79 −10		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/asset/ValidateAssetFileTypeUseCase.kt
+0 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+27 −27		...otlin/com/wire/kalium/logic/feature/message/ephemeral/DeleteEphemeralMessageForSelfUserAsReceiverUseCase.kt
+18 −23		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/ephemeral/EphemeralMessageDeletionHandler.kt
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/ephemeral/SelfDeletionEventLogger.kt
+81 −21		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandler.kt
+34 −35		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandler.kt
+55 −33		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ProteusMessageUnpacker.kt
+1 −112		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallHelperTest.kt
+66 −25		...tlin/com/wire/kalium/logic/data/message/ephemeral/DeleteEphemeralMessageForSelfUserAsReceiverUseCaseTest.kt
+15 −3		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/asset/ScheduleNewAssetMessageUseCaseTest.kt
+29 −13		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/asset/ValidateAssetFileTypeUseCaseTest.kt
+22 −16		...rc/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandlerTest.kt
+9 −5		...rc/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ProteusMessageUnpackerTest.kt
+1 −7		logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/call/scenario/OnCloseCallTest.kt
+116 −9		logic/src/jvmTest/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandlerTest.kt
+2 −4		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
+11 −2		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt