Realm: fix small identity mistakes

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt

@@ -79,7 +79,7 @@ internal abstract class IdentityModule {
                     .apply {
                         realmKeysUtils.configureEncryption(this, SessionModule.getKeyAlias(userMd5))
                     }
-                    .name("matrix-sdk-global.realm")
+                    .name("matrix-sdk-identity.realm")
                     .schemaVersion(identityStoreMigration.schemaVersion)
                     .migration(identityStoreMigration)
                     .build()

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt

@@ -43,9 +43,19 @@ internal class RealmIdentityStore @Inject constructor(
     }
 
     override suspend fun setUrl(url: String?) {
-        val identityData = getIdentityDataEntity() ?: return
         realmInstance.write {
-            findLatest(identityData)?.identityServerUrl = url
+            delete(
+                    query(IdentityDataEntity::class).find()
+            )
+            // Delete all pending binding if any
+            delete(
+                    query(IdentityPendingBindingEntity::class).find()
+            )
+            if (url == null) return@write
+            val newIdentityData = IdentityDataEntity().apply {
+                identityServerUrl = url
+            }
+            copyToRealm(newIdentityData)
         }
     }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt

@@ -23,7 +23,7 @@ import javax.inject.Inject
 
 internal class RealmIdentityStoreMigration @Inject constructor() : MatrixAutomaticSchemaMigration(
         dbName = "Identity",
-        schemaVersion = 1L,
+        schemaVersion = 2L,
 ) {
 
     /**