filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-03 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Identity: change DB and add sendAttempt

Browse Source
This commit is contained in:
Benoit Marty 2020-05-10 09:25:30 +02:00
parent b44f5d3b4a
commit 7e8e1ab9b7
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRequestTokenForBindingTask.kt
View File

@ -67,6 +67,7 @@ internal class DefaultIdentityRequestTokenForBindingTask @Inject constructor(
identityServiceStore.storePendingBinding( identityServiceStore.storePendingBinding(
params.threePid, params.threePid,
clientSecret, clientSecret,
1,
tokenResponse.sid) tokenResponse.sid)
} }
} }

14
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntity.kt
View File

@ -16,14 +16,22 @@
package im.vector.matrix.android.internal.session.identity.db package im.vector.matrix.android.internal.session.identity.db
import im.vector.matrix.android.api.session.identity.ThreePid
import im.vector.matrix.android.api.session.identity.toMedium
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
internal open class IdentityPendingBindingEntity( internal open class IdentityPendingBindingEntity(
var threePidValue: String = "", @PrimaryKey var threePid: String = "",
var medium: String = "", /* Managed by Riot */
var clientSecret: String = "", var clientSecret: String = "",
/* Managed by Riot */
var sendAttempt: Int = 0,
/* Provided by the identity server */
var sid: String = "" var sid: String = ""
) : RealmObject() { ) : RealmObject() {
companion object companion object {
fun ThreePid.toPrimaryKey() = "${toMedium()}_$value"
}
} }

9
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingQuery.kt
View File

@ -17,26 +17,23 @@
package im.vector.matrix.android.internal.session.identity.db package im.vector.matrix.android.internal.session.identity.db
import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.api.session.identity.ThreePid
import im.vector.matrix.android.api.session.identity.toMedium
import io.realm.Realm import io.realm.Realm
import io.realm.kotlin.createObject import io.realm.kotlin.createObject
import io.realm.kotlin.where import io.realm.kotlin.where
internal fun IdentityPendingBindingEntity.Companion.get(realm: Realm, threePid: ThreePid): IdentityPendingBindingEntity? { internal fun IdentityPendingBindingEntity.Companion.get(realm: Realm, threePid: ThreePid): IdentityPendingBindingEntity? {
return realm.where<IdentityPendingBindingEntity>() return realm.where<IdentityPendingBindingEntity>()
.equalTo(IdentityPendingBindingEntityFields.THREE_PID_VALUE, threePid.value) .equalTo(IdentityPendingBindingEntityFields.THREE_PID, threePid.toPrimaryKey())
.equalTo(IdentityPendingBindingEntityFields.MEDIUM, threePid.toMedium())
.findFirst() .findFirst()
} }
internal fun IdentityPendingBindingEntity.Companion.getOrCreate(realm: Realm, threePid: ThreePid): IdentityPendingBindingEntity { internal fun IdentityPendingBindingEntity.Companion.getOrCreate(realm: Realm, threePid: ThreePid): IdentityPendingBindingEntity {
return get(realm, threePid) ?: realm.createObject() return get(realm, threePid) ?: realm.createObject(threePid.toPrimaryKey())
} }
internal fun IdentityPendingBindingEntity.Companion.delete(realm: Realm, threePid: ThreePid) { internal fun IdentityPendingBindingEntity.Companion.delete(realm: Realm, threePid: ThreePid) {
realm.where<IdentityPendingBindingEntity>() realm.where<IdentityPendingBindingEntity>()
.equalTo(IdentityPendingBindingEntityFields.THREE_PID_VALUE, threePid.value) .equalTo(IdentityPendingBindingEntityFields.THREE_PID, threePid.toPrimaryKey())
.equalTo(IdentityPendingBindingEntityFields.MEDIUM, threePid.toMedium())
.findAll() .findAll()
.deleteAllFromRealm() .deleteAllFromRealm()
} }

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityServiceStore.kt
View File

@ -34,6 +34,7 @@ internal interface IdentityServiceStore {
*/ */
fun storePendingBinding(threePid: ThreePid, fun storePendingBinding(threePid: ThreePid,
clientSecret: String, clientSecret: String,
sendAttempt: Int,
sid: String) sid: String)
fun getPendingBinding(threePid: ThreePid): IdentityPendingBindingEntity? fun getPendingBinding(threePid: ThreePid): IdentityPendingBindingEntity?

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServiceStore.kt
View File

@ -61,13 +61,12 @@ internal class RealmIdentityServiceStore @Inject constructor(
} }
} }
override fun storePendingBinding(threePid: ThreePid, clientSecret: String, sid: String) { override fun storePendingBinding(threePid: ThreePid, clientSecret: String, sendAttempt: Int, sid: String) {
Realm.getInstance(realmConfiguration).use { Realm.getInstance(realmConfiguration).use {
it.executeTransaction { realm -> it.executeTransaction { realm ->
IdentityPendingBindingEntity.getOrCreate(realm, threePid).let { entity -> IdentityPendingBindingEntity.getOrCreate(realm, threePid).let { entity ->
entity.threePidValue = threePid.value
entity.medium = threePid.toMedium()
entity.clientSecret = clientSecret entity.clientSecret = clientSecret
entity.sendAttempt = sendAttempt
entity.sid = sid entity.sid = sid
} }
} }