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 index 9b36b5141b7..10e1052fdb1 100644 --- 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 @@ -99,10 +99,10 @@ class SelfDeletionTimerHelper(private val stringResourceProvider: StringResource selfDeletionStatus: Message.ExpirationData.SelfDeletionStatus?, expireAfter: Duration, ) = - if (selfDeletionStatus is Message.ExpirationData.SelfDeletionStatus.Started) selfDeletionStatus.selfDeletionStartDate + expireAfter - else { - val currentTime = currentTime() - currentTime + expireAfter + if (selfDeletionStatus is Message.ExpirationData.SelfDeletionStatus.Started) { + selfDeletionStatus.selfDeletionEndDate + } else { + currentTime() + expireAfter } sealed class SelfDeletionTimerState { diff --git a/kalium b/kalium index 0996f330649..3ff6e66006b 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 0996f330649a84709e044957db1fd36df2544326 +Subproject commit 3ff6e66006b022c2d9196b09602917761057df20