rearrange ConversationEntity columns to match documentation

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
nextcloud · Aug 9, 2024 · dd4df84 · dd4df84
1 parent ee3da48
commit dd4df84
Showing 1 changed file with 37 additions and 23 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt
@@ -45,48 +45,62 @@ data class ConversationEntity(
     // If multiple talk app accounts have the same conversation, it is stored as another dataset, which is
     // exactly what we want for this case.
     @ColumnInfo(name = "token") var token: String?,
-
+    @ColumnInfo(name = "type") var type: ConversationEnums.ConversationType? = null,
     @ColumnInfo(name = "name") var name: String? = null,
     @ColumnInfo(name = "displayName") var displayName: String? = null,
     @ColumnInfo(name = "description") var description: String? = null,
-    @ColumnInfo(name = "type") var type: ConversationEnums.ConversationType? = null,
-    @ColumnInfo(name = "lastPing") var lastPing: Long = 0,
-    // TODO FIX type
     @ColumnInfo(name = "participantType") var participantType: Participant.ParticipantType? = null,
-    @ColumnInfo(name = "hasPassword") var hasPassword: Boolean = false,
-    @ColumnInfo(name = "sessionId") var sessionId: String? = null,
-    @ColumnInfo(name = "actorId") var actorId: String? = null,
+    // missing/not needed: attendeeId
+    // missing/not needed: attendeePin
     @ColumnInfo(name = "actorType") var actorType: String? = null,
-    @ColumnInfo(name = "isFavorite") var favorite: Boolean = false,
-    @ColumnInfo(name = "lastActivity") var lastActivity: Long = 0,
-    @ColumnInfo(name = "unreadMessages") var unreadMessages: Int = 0,
-    @ColumnInfo(name = "unreadMention") var unreadMention: Boolean = false,
-    @ColumnInfo(name = "lastMessageJson") var lastMessageJson: String? = null,
-    @ColumnInfo(name = "objectType") var objectType: ConversationEnums.ObjectType? = null,
-    @ColumnInfo(name = "notificationLevel") var notificationLevel: ConversationEnums.NotificationLevel? = null,
+    @ColumnInfo(name = "actorId") var actorId: String? = null,
+    @ColumnInfo(name = "permissions") var permissions: Int = 0,
+    // missing/not needed: attendeePermissions
+    // missing/not needed: callPermissions
+    // missing/not needed: defaultPermissions
+    // missing/not needed: participantInCall
+    // missing/not needed: participantFlags
     @ColumnInfo(name = "readOnly") var conversationReadOnlyState: ConversationEnums.ConversationReadOnlyState? = null,
-    @ColumnInfo(name = "lobbyState") var lobbyState: ConversationEnums.LobbyState? = null,
-    @ColumnInfo(name = "lobbyTimer") var lobbyTimer: Long? = null,
-    @ColumnInfo(name = "lastReadMessage") var lastReadMessage: Int = 0,
-    @ColumnInfo(name = "lastCommonReadMessage") var lastCommonReadMessage: Int = 0,
+    // missing/not needed: listable
+    @ColumnInfo(name = "messageExpiration") var messageExpiration: Int = 0,
+    // missing/not needed: count
+    // missing/not needed: numGuests
+    @ColumnInfo(name = "lastPing") var lastPing: Long = 0,
+    @ColumnInfo(name = "sessionId") var sessionId: String? = null,
+    @ColumnInfo(name = "hasPassword") var hasPassword: Boolean = false,
     @ColumnInfo(name = "hasCall") var hasCall: Boolean = false,
     @ColumnInfo(name = "callFlag") var callFlag: Int = 0,
     @ColumnInfo(name = "canStartCall") var canStartCall: Boolean = false,
-    @ColumnInfo(name = "canLeaveConversation") var canLeaveConversation: Boolean? = null,
     @ColumnInfo(name = "canDeleteConversation") var canDeleteConversation: Boolean? = null,
+    @ColumnInfo(name = "canLeaveConversation") var canLeaveConversation: Boolean? = null,
+    @ColumnInfo(name = "lastActivity") var lastActivity: Long = 0,
+    @ColumnInfo(name = "isFavorite") var favorite: Boolean = false,
+    @ColumnInfo(name = "notificationLevel") var notificationLevel: ConversationEnums.NotificationLevel? = null,
+    @ColumnInfo(name = "lobbyState") var lobbyState: ConversationEnums.LobbyState? = null,
+    @ColumnInfo(name = "lobbyTimer") var lobbyTimer: Long? = null,
+    // missing/not needed: sipEnabled
+    // missing/not needed: canEnableSIP
+    @ColumnInfo(name = "unreadMessages") var unreadMessages: Int = 0,
+    @ColumnInfo(name = "unreadMention") var unreadMention: Boolean = false,
     @ColumnInfo(name = "unreadMentionDirect") var unreadMentionDirect: Boolean? = null,
-    @ColumnInfo(name = "notificationCalls") var notificationCalls: Int? = null,
-    @ColumnInfo(name = "permissions") var permissions: Int = 0,
-    @ColumnInfo(name = "messageExpiration") var messageExpiration: Int = 0,
+    @ColumnInfo(name = "lastReadMessage") var lastReadMessage: Int = 0,
+    @ColumnInfo(name = "lastCommonReadMessage") var lastCommonReadMessage: Int = 0,
+    @ColumnInfo(name = "lastMessageJson") var lastMessageJson: String? = null,
+    @ColumnInfo(name = "objectType") var objectType: ConversationEnums.ObjectType? = null,
+    // missing/not needed: objectId
+    // missing/not needed: breakoutRoomMode
+    // missing/not needed: breakoutRoomStatus
     @ColumnInfo(name = "status") var status: String? = null,
     @ColumnInfo(name = "statusIcon") var statusIcon: String? = null,
     @ColumnInfo(name = "statusMessage") var statusMessage: String? = null,
     @ColumnInfo(name = "statusClearAt") var statusClearAt: Long? = 0,
-    @ColumnInfo(name = "callRecording") var callRecording: Int = 0,
     @ColumnInfo(name = "avatarVersion") var avatarVersion: String? = null,
     @ColumnInfo(name = "isCustomAvatar") var hasCustomAvatar: Boolean? = null,
     @ColumnInfo(name = "callStartTime") var callStartTime: Long? = null,
+    @ColumnInfo(name = "callRecording") var callRecording: Int = 0,
     @ColumnInfo(name = "recordingConsent") var recordingConsentRequired: Int = 0,
+
+    @ColumnInfo(name = "notificationCalls") var notificationCalls: Int? = null,
     @ColumnInfo(name = "remoteServer") var remoteServer: String? = null,
     @ColumnInfo(name = "remoteToken") var remoteToken: String? = null
 )