mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8965 from element-hq/feature/bma/fixMigration

Browse source 
Ensure Realm migration does not crash
This commit is contained in:
Benoit Marty 2024-12-20 10:04:16 +01:00 committed by GitHub
commit 505168f2b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo024.kt
View file

@ -17,6 +17,7 @@
package org.matrix.android.sdk.internal.crypto.store.db.migration package org.matrix.android.sdk.internal.crypto.store.db.migration
import io.realm.DynamicRealm import io.realm.DynamicRealm
import org.matrix.android.sdk.internal.extensions.safeRemove
import org.matrix.android.sdk.internal.util.database.RealmMigrator import org.matrix.android.sdk.internal.util.database.RealmMigrator
internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24) { internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24) {
@ -32,20 +33,20 @@ internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24
get("CryptoRoomEntity")?.removeField("outboundSessionInfo") get("CryptoRoomEntity")?.removeField("outboundSessionInfo")
// Warning: order is important, first remove classes that depends on others. // Warning: order is important, first remove classes that depends on others.
remove("UserEntity") safeRemove("UserEntity")
remove("DeviceInfoEntity") safeRemove("DeviceInfoEntity")
remove("CrossSigningInfoEntity") safeRemove("CrossSigningInfoEntity")
remove("KeyInfoEntity") safeRemove("KeyInfoEntity")
remove("TrustLevelEntity") safeRemove("TrustLevelEntity")
remove("KeysBackupDataEntity") safeRemove("KeysBackupDataEntity")
remove("OlmInboundGroupSessionEntity") safeRemove("OlmInboundGroupSessionEntity")
remove("OlmSessionEntity") safeRemove("OlmSessionEntity")
remove("AuditTrailEntity") safeRemove("AuditTrailEntity")
remove("OutgoingKeyRequestEntity") safeRemove("OutgoingKeyRequestEntity")
remove("KeyRequestReplyEntity") safeRemove("KeyRequestReplyEntity")
remove("WithHeldSessionEntity") safeRemove("WithHeldSessionEntity")
remove("SharedSessionEntity") safeRemove("SharedSessionEntity")
remove("OutboundGroupSessionInfoEntity") safeRemove("OutboundGroupSessionInfoEntity")
} }
} }
} }

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
View file

@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.extensions
import io.realm.RealmList import io.realm.RealmList
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.RealmObjectSchema import io.realm.RealmObjectSchema
import io.realm.RealmSchema
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
import org.matrix.android.sdk.internal.util.fatalError import org.matrix.android.sdk.internal.util.fatalError
@ -52,3 +53,9 @@ internal fun RealmObjectSchema?.forceRefreshOfHomeServerCapabilities(): RealmObj
obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0) obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
} }
} }
internal fun RealmSchema.safeRemove(className: String) {
if (get(className) != null) {
remove(className)
}
}