From 94256402773f65aed3b214a530bef6b1ab3d3a48 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 22 Sep 2020 09:55:52 +0200 Subject: [PATCH] Revert "Avoid db upgrade: add back deprecated fields concerning unread kind" This reverts commit 2812dc0a3ecf36621ba21ceb0903563f0da54615. --- .../sdk/internal/database/model/RoomSummaryEntity.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt index f1b88696fa..d6859f1d3f 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt @@ -32,10 +32,6 @@ internal open class RoomSummaryEntity( var name: String? = "", var topic: String? = "", var latestPreviewableEvent: TimelineEventEntity? = null, - @Deprecated("Different implementation available from upstream. Field not removed to avoid db scheme numbers differing from upstream") - var latestPreviewableContentEvent: TimelineEventEntity? = null, - @Deprecated("Different implementation available from upstream. Field not removed to avoid db scheme numbers differing from upstream") - var latestPreviewableOriginalContentEvent: TimelineEventEntity? = null, var heroes: RealmList = RealmList(), var joinedMembersCount: Int? = 0, var invitedMembersCount: Int? = 0, @@ -46,10 +42,6 @@ internal open class RoomSummaryEntity( var highlightCount: Int = 0, var readMarkerId: String? = null, var hasUnreadMessages: Boolean = false, - @Deprecated("Different implementation available from upstream. Field not removed to avoid db scheme numbers differing from upstream") - var hasUnreadContentMessages: Boolean = false, - @Deprecated("Different implementation available from upstream. Field not removed to avoid db scheme numbers differing from upstream") - var hasUnreadOriginalContentMessages: Boolean = false, var tags: RealmList = RealmList(), var userDrafts: UserDraftsEntity? = null, var breadcrumbsIndex: Int = RoomSummary.NOT_IN_BREADCRUMBS,