mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-27 03:49:04 +03:00
Merge branch 'main' into develop
This commit is contained in:
commit
82edf083f0
2 changed files with 37 additions and 1 deletions
|
@ -45,6 +45,7 @@ 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.database.migration.MigrateSessionTo027
|
||||||
|
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo028
|
||||||
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 +60,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 = 28L
|
||||||
|
|
||||||
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")
|
||||||
|
@ -91,5 +92,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
|
||||||
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()
|
if (oldVersion < 27) MigrateSessionTo027(realm).perform()
|
||||||
|
if (oldVersion < 28) MigrateSessionTo028(realm).perform()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* 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 org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
|
||||||
|
import org.matrix.android.sdk.internal.util.database.RealmMigrator
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Migrating to:
|
||||||
|
* Live location sharing aggregated summary
|
||||||
|
*/
|
||||||
|
internal class MigrateSessionTo028(realm: DynamicRealm) : RealmMigrator(realm, 28) {
|
||||||
|
|
||||||
|
override fun doMigrate(realm: DynamicRealm) {
|
||||||
|
realm.schema.get("LiveLocationShareAggregatedSummaryEntity")
|
||||||
|
?.takeIf { !it.hasPrimaryKey() }
|
||||||
|
?.addPrimaryKey(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue