Resolve real migration conflicts
This commit is contained in:
parent
79a231f1dc
commit
deb86d2e87
|
@ -44,7 +44,6 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo023
|
||||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo024
|
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo024
|
||||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo025
|
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo025
|
||||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo026
|
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo026
|
||||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo027
|
|
||||||
import org.matrix.android.sdk.internal.util.Normalizer
|
import org.matrix.android.sdk.internal.util.Normalizer
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
@ -59,7 +58,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
|
||||||
override fun equals(other: Any?) = other is RealmSessionStoreMigration
|
override fun equals(other: Any?) = other is RealmSessionStoreMigration
|
||||||
override fun hashCode() = 1000
|
override fun hashCode() = 1000
|
||||||
|
|
||||||
val schemaVersion = 27L
|
val schemaVersion = 26L
|
||||||
|
|
||||||
override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
|
override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
|
||||||
Timber.d("Migrating Realm Session from $oldVersion to $newVersion")
|
Timber.d("Migrating Realm Session from $oldVersion to $newVersion")
|
||||||
|
@ -90,6 +89,5 @@ internal class RealmSessionStoreMigration @Inject constructor(
|
||||||
if (oldVersion < 24) MigrateSessionTo024(realm).perform()
|
if (oldVersion < 24) MigrateSessionTo024(realm).perform()
|
||||||
if (oldVersion < 25) MigrateSessionTo025(realm).perform()
|
if (oldVersion < 25) MigrateSessionTo025(realm).perform()
|
||||||
if (oldVersion < 26) MigrateSessionTo026(realm).perform()
|
if (oldVersion < 26) MigrateSessionTo026(realm).perform()
|
||||||
if (oldVersion < 27) MigrateSessionTo027(realm).perform()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,9 +19,17 @@ package org.matrix.android.sdk.internal.database.migration
|
||||||
import io.realm.DynamicRealm
|
import io.realm.DynamicRealm
|
||||||
import io.realm.FieldAttribute
|
import io.realm.FieldAttribute
|
||||||
import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
|
import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
|
||||||
|
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
|
||||||
|
import org.matrix.android.sdk.internal.database.model.RoomEntityFields
|
||||||
import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
|
import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
|
||||||
|
import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntityFields
|
||||||
import org.matrix.android.sdk.internal.util.database.RealmMigrator
|
import org.matrix.android.sdk.internal.util.database.RealmMigrator
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Migrating to:
|
||||||
|
* Live thread list: using enhanced /messages api MSC3440
|
||||||
|
* Live thread timeline: using /relations api
|
||||||
|
*/
|
||||||
class MigrateSessionTo026(realm: DynamicRealm) : RealmMigrator(realm, 26) {
|
class MigrateSessionTo026(realm: DynamicRealm) : RealmMigrator(realm, 26) {
|
||||||
|
|
||||||
override fun doMigrate(realm: DynamicRealm) {
|
override fun doMigrate(realm: DynamicRealm) {
|
||||||
|
@ -31,5 +39,25 @@ class MigrateSessionTo026(realm: DynamicRealm) : RealmMigrator(realm, 26) {
|
||||||
|
|
||||||
realm.schema.get("TimelineEventEntity")
|
realm.schema.get("TimelineEventEntity")
|
||||||
?.addField(TimelineEventEntityFields.OWNED_BY_THREAD_CHUNK, Boolean::class.java)
|
?.addField(TimelineEventEntityFields.OWNED_BY_THREAD_CHUNK, Boolean::class.java)
|
||||||
|
|
||||||
|
val eventEntity = realm.schema.get("EventEntity") ?: return
|
||||||
|
val threadSummaryEntity = realm.schema.create("ThreadSummaryEntity")
|
||||||
|
.addField(ThreadSummaryEntityFields.ROOT_THREAD_EVENT_ID, String::class.java, FieldAttribute.INDEXED)
|
||||||
|
.addField(ThreadSummaryEntityFields.ROOT_THREAD_SENDER_NAME, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.ROOT_THREAD_SENDER_AVATAR, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.ROOT_THREAD_IS_UNIQUE_DISPLAY_NAME, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.LATEST_THREAD_SENDER_NAME, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.LATEST_THREAD_SENDER_AVATAR, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.LATEST_THREAD_IS_UNIQUE_DISPLAY_NAME, String::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.NUMBER_OF_THREADS, Int::class.java)
|
||||||
|
.addField(ThreadSummaryEntityFields.IS_USER_PARTICIPATING, Boolean::class.java)
|
||||||
|
.addRealmObjectField(ThreadSummaryEntityFields.ROOT_THREAD_EVENT_ENTITY.`$`, eventEntity)
|
||||||
|
.addRealmObjectField(ThreadSummaryEntityFields.LATEST_THREAD_EVENT_ENTITY.`$`, eventEntity)
|
||||||
|
|
||||||
|
realm.schema.get("RoomEntity")
|
||||||
|
?.addRealmListField(RoomEntityFields.THREAD_SUMMARIES.`$`, threadSummaryEntity)
|
||||||
|
|
||||||
|
realm.schema.get("HomeServerCapabilitiesEntity")
|
||||||
|
?.addRealmListField(HomeServerCapabilitiesEntityFields.CAN_USE_THREADING, Boolean::class.java)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2022 The Matrix.org Foundation C.I.C.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.matrix.android.sdk.internal.database.migration
|
|
||||||
|
|
||||||
import io.realm.DynamicRealm
|
|
||||||
import io.realm.FieldAttribute
|
|
||||||
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
|
|
||||||
import org.matrix.android.sdk.internal.database.model.RoomEntityFields
|
|
||||||
import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntityFields
|
|
||||||
import org.matrix.android.sdk.internal.util.database.RealmMigrator
|
|
||||||
|
|
||||||
class MigrateSessionTo027(realm: DynamicRealm) : RealmMigrator(realm, 27) {
|
|
||||||
|
|
||||||
override fun doMigrate(realm: DynamicRealm) {
|
|
||||||
val eventEntity = realm.schema.get("EventEntity") ?: return
|
|
||||||
val threadSummaryEntity = realm.schema.create("ThreadSummaryEntity")
|
|
||||||
.addField(ThreadSummaryEntityFields.ROOT_THREAD_EVENT_ID, String::class.java, FieldAttribute.INDEXED)
|
|
||||||
.addField(ThreadSummaryEntityFields.ROOT_THREAD_SENDER_NAME, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.ROOT_THREAD_SENDER_AVATAR, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.ROOT_THREAD_IS_UNIQUE_DISPLAY_NAME, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.LATEST_THREAD_SENDER_NAME, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.LATEST_THREAD_SENDER_AVATAR, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.LATEST_THREAD_IS_UNIQUE_DISPLAY_NAME, String::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.NUMBER_OF_THREADS, Int::class.java)
|
|
||||||
.addField(ThreadSummaryEntityFields.IS_USER_PARTICIPATING, Boolean::class.java)
|
|
||||||
.addRealmObjectField(ThreadSummaryEntityFields.ROOT_THREAD_EVENT_ENTITY.`$`, eventEntity)
|
|
||||||
.addRealmObjectField(ThreadSummaryEntityFields.LATEST_THREAD_EVENT_ENTITY.`$`, eventEntity)
|
|
||||||
|
|
||||||
realm.schema.get("RoomEntity")
|
|
||||||
?.addRealmListField(RoomEntityFields.THREAD_SUMMARIES.`$`, threadSummaryEntity)
|
|
||||||
|
|
||||||
realm.schema.get("HomeServerCapabilitiesEntity")
|
|
||||||
?.addRealmListField(HomeServerCapabilitiesEntityFields.CAN_USE_THREADING, Boolean::class.java)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue