fix: Update legal hold status class path (#2496)

wireapp · Dec 4, 2023 · 7e67653 · 7e67653
1 parent f3108ca
commit 7e67653
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 19 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/GlobalObserversManager.kt b/app/src/main/kotlin/com/wire/android/GlobalObserversManager.kt
@@ -45,7 +45,7 @@ class GlobalObserversManager @Inject constructor(
     dispatcherProvider: DispatcherProvider,
     @KaliumCoreLogic private val coreLogic: CoreLogic,
     private val notificationManager: WireNotificationManager,
-    private val notificationChannelsManager: NotificationChannelsManager,
+    private val notificationChannelsManager: NotificationChannelsManager
 ) {
     private val scope = CoroutineScope(SupervisorJob() + dispatcherProvider.io())
 

diff --git a/app/src/main/kotlin/com/wire/android/migration/MigrationMapper.kt b/app/src/main/kotlin/com/wire/android/migration/MigrationMapper.kt
@@ -107,7 +107,8 @@ class MigrationMapper @Inject constructor() {
                 archived = false,
                 archivedDateTime = null,
                 mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+                legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
             )
         }
     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/common/topappbar/CommonTopAppBarViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/common/topappbar/CommonTopAppBarViewModel.kt
@@ -31,7 +31,7 @@ import com.wire.android.util.CurrentScreen
 import com.wire.android.util.CurrentScreenManager
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.data.call.Call
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.sync.SyncState
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.legalhold.ObserveLegalHoldRequestUseCaseResult

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt
@@ -53,7 +53,7 @@ import com.wire.kalium.logic.data.conversation.ConversationDetails.Connection
 import com.wire.kalium.logic.data.conversation.ConversationDetails.Group
 import com.wire.kalium.logic.data.conversation.ConversationDetails.OneOne
 import com.wire.kalium.logic.data.conversation.ConversationDetails.Self
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.conversation.MutedConversationStatus
 import com.wire.kalium.logic.data.conversation.UnreadEventCount
 import com.wire.kalium.logic.data.id.ConversationId

diff --git a/app/src/test/kotlin/com/wire/android/framework/TestConversation.kt b/app/src/test/kotlin/com/wire/android/framework/TestConversation.kt
@@ -53,7 +53,8 @@ object TestConversation {
         archived = false,
         archivedDateTime = null,
         mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+        legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
     )
     val SELF = Conversation(
         ID.copy(value = "SELF ID"),
@@ -75,7 +76,8 @@ object TestConversation {
         archived = false,
         archivedDateTime = null,
         mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+        legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
     )
 
     fun GROUP(protocolInfo: ProtocolInfo = ProtocolInfo.Proteus) = Conversation(
@@ -98,7 +100,8 @@ object TestConversation {
         archived = false,
         archivedDateTime = null,
         mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+        legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
     )
 
     fun one_on_one(convId: ConversationId) = Conversation(
@@ -121,7 +124,8 @@ object TestConversation {
         archived = false,
         archivedDateTime = null,
         mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+        legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
     )
 
     val USER_1 = UserId("member1", "domainMember")
@@ -151,6 +155,7 @@ object TestConversation {
         archived = false,
         archivedDateTime = null,
         mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+        proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+        legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
     )
 }
diff --git a/app/src/test/kotlin/com/wire/android/framework/TestConversationDetails.kt b/app/src/test/kotlin/com/wire/android/framework/TestConversationDetails.kt
@@ -23,7 +23,7 @@ package com.wire.android.framework
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.Conversation.ProtocolInfo
 import com.wire.kalium.logic.data.conversation.ConversationDetails
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.user.type.UserType
 
 object TestConversationDetails {

diff --git a/...test/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModelArrangement.kt b/...test/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModelArrangement.kt
@@ -45,7 +45,7 @@ import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.configuration.FileSharingStatus
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationDetails
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.message.SelfDeletionTimer
 import com.wire.kalium.logic.data.sync.SyncState

diff --git a/...n/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModelTest.kt b/...n/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModelTest.kt
@@ -35,7 +35,7 @@ import com.wire.android.ui.home.conversationslist.model.DialogState
 import com.wire.android.ui.navArgs
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationDetails
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.conversation.MutedConversationStatus
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.TeamId
@@ -593,7 +593,8 @@ class GroupConversationDetailsViewModelTest {
                 archived = false,
                 archivedDateTime = null,
                 mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+                legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
             ),
             legalHoldStatus = LegalHoldStatus.DISABLED,
             hasOngoingCall = false,

diff --git a/...in/com/wire/android/ui/home/conversations/migration/ConversationMigrationViewModelTest.kt b/...in/com/wire/android/ui/home/conversations/migration/ConversationMigrationViewModelTest.kt
@@ -25,7 +25,7 @@ import com.wire.android.framework.TestUser
 import com.wire.android.ui.home.conversations.ConversationNavArgs
 import com.wire.android.ui.navArgs
 import com.wire.kalium.logic.data.conversation.ConversationDetails
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.user.type.UserType
 import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase

diff --git a/app/src/test/kotlin/com/wire/android/ui/home/gallery/MediaGalleryViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/home/gallery/MediaGalleryViewModelTest.kt
@@ -36,7 +36,7 @@ import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationDetails
 import com.wire.kalium.logic.data.conversation.ConversationDetails.OneOne
-import com.wire.kalium.logic.data.conversation.LegalHoldStatus
+import com.wire.kalium.logic.data.user.LegalHoldStatus
 import com.wire.kalium.logic.data.conversation.MutedConversationStatus.AllAllowed
 import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.user.ConnectionState
@@ -306,7 +306,8 @@ class MediaGalleryViewModelTest {
                 archived = false,
                 archivedDateTime = null,
                 mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+                proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+                legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
             ),
             otherUser = OtherUser(
                 QualifiedID("other-user-id", "domain-id"),

diff --git a/...st/kotlin/com/wire/android/ui/home/newconversation/NewConversationViewModelArrangement.kt b/...st/kotlin/com/wire/android/ui/home/newconversation/NewConversationViewModelArrangement.kt
@@ -160,7 +160,8 @@ internal class NewConversationViewModelArrangement {
             archived = false,
             archivedDateTime = null,
             mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
         )
 
         val PUBLIC_USER = OtherUser(

diff --git a/.../test/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreenViewModelTest.kt b/.../test/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreenViewModelTest.kt
@@ -248,7 +248,8 @@ class OtherUserProfileScreenViewModelTest {
             archived = false,
             archivedDateTime = null,
             mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
-            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
+            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            legalHoldStatus = Conversation.LegalHoldStatus.DISABLED
         )
         val CONVERSATION_ROLE_DATA = ConversationRoleData(
             "some_name",

diff --git a/kalium b/kalium