refactor: stop using and remove selfDeletionStartDate [WPB-6219] (#2839)

wireapp · Apr 3, 2024 · 2d77b2f · 2d77b2f
1 parent dc830ee
commit 2d77b2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 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
@@ -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
+1 −1		gradle/libs.versions.toml
+7 −10		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
+10 −8		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+6 −22		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageRepository.kt
+1 −1		...c/commonMain/kotlin/com/wire/kalium/logic/feature/message/ephemeral/DeleteEphemeralMessageEndDateUseCase.kt
+7 −14		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/ephemeral/EphemeralMessageDeletionHandler.kt
+4 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/ephemeral/SelfDeletionEventLogger.kt
+2 −2		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/MessageMapperTest.kt
+2 −2		...st/kotlin/com/wire/kalium/logic/feature/message/ephemeral/DeleteEphemeralMessagesAfterEndDateUseCaseTest.kt
+5 −39		...rc/commonTest/kotlin/com/wire/kalium/logic/feature/message/ephemeral/EphemeralMessageDeletionHandlerTest.kt
+0 −1		persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageDetailsView.sq
+17 −22		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
+169 −0		persistence/src/commonMain/db_user/migrations/81.sqm
+2 −4		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAO.kt
+4 −10		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
+3 −3		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
+4 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt
+4 −5		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+0 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/TableMapper.kt
+1 −1		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/UserDatabaseDataGenerator.kt
+71 −28		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
+0 −2		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageMapperTest.kt
+3 −3		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/utils/stubs/MessageStubs.kt