Skip to content

Commit 30940cb

Browse files
bmartybmarty
committed
Rename UserCrossSigningKeys to UserIdentity 
1 parent 7e26c4b commit 30940cb

File tree

5 files changed

+32
-29
lines changed

5 files changed

+32
-29
lines changed

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKeys.kt renamed to ‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/UserIdentity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.session.crypto.crosssigning
1919
/**
2020
* Container for the three cross signing keys: master, self signing and user signing.
2121
*/
22-
data class CryptoCrossSigningKeys(
22+
data class UserIdentity(
2323
val masterKey: CryptoCrossSigningKey?,
2424
val selfSigningKey: CryptoCrossSigningKey?,
2525
val userSigningKey: CryptoCrossSigningKey?,

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import org.matrix.android.sdk.api.MatrixPatterns
2424
import org.matrix.android.sdk.api.auth.data.Credentials
2525
import org.matrix.android.sdk.api.extensions.measureMetric
2626
import org.matrix.android.sdk.api.metrics.DownloadDeviceKeysMetricsPlugin
27-
import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKeys
2827
import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
28+
import org.matrix.android.sdk.api.session.crypto.crosssigning.UserIdentity
2929
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
3030
import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
3131
import org.matrix.android.sdk.internal.crypto.model.CryptoInfoMapper
@@ -420,7 +420,7 @@ internal class DeviceListManager @Inject constructor(
420420
val userSigningKey = response.userSigningKeys?.get(userId)?.toCryptoModel()?.also {
421421
Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : USK ${it.unpaddedBase64PublicKey}")
422422
}
423-
userDataToStore.userCrossSigningKeys[userId] = CryptoCrossSigningKeys(
423+
userDataToStore.userIdentities[userId] = UserIdentity(
424424
masterKey = masterKey,
425425
selfSigningKey = selfSigningKey,
426426
userSigningKey = userSigningKey

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
2222
import org.matrix.android.sdk.api.session.crypto.NewSessionListener
2323
import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
2424
import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
25-
import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKeys
2625
import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
2726
import org.matrix.android.sdk.api.session.crypto.crosssigning.PrivateKeysInfo
27+
import org.matrix.android.sdk.api.session.crypto.crosssigning.UserIdentity
2828
import org.matrix.android.sdk.api.session.crypto.keysbackup.SavedKeyBackupKeyInfo
2929
import org.matrix.android.sdk.api.session.crypto.model.AuditTrail
3030
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
@@ -245,9 +245,12 @@ internal interface IMXCryptoStore {
245245
*/
246246
fun storeUserDevices(userId: String, devices: Map<String, CryptoDeviceInfo>?)
247247

248-
fun storeUserCrossSigningKeys(
248+
/**
249+
* Store the cross signing keys for the user userId.
250+
*/
251+
fun storeUserIdentity(
249252
userId: String,
250-
cryptoCrossSigningKeys: CryptoCrossSigningKeys
253+
userIdentity: UserIdentity
251254
)
252255

253256
/**

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/UserDataToStore.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.matrix.android.sdk.internal.crypto.store
1818

19-
import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKeys
19+
import org.matrix.android.sdk.api.session.crypto.crosssigning.UserIdentity
2020
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
2121

2222
internal data class UserDataToStore(
@@ -25,7 +25,7 @@ internal data class UserDataToStore(
2525
*/
2626
val userDevices: MutableMap<String, Map<String, CryptoDeviceInfo>> = mutableMapOf(),
2727
/**
28-
* Map of userId -> [CryptoCrossSigningKeys].
28+
* Map of userId -> [UserIdentity].
2929
*/
30-
val userCrossSigningKeys: MutableMap<String, CryptoCrossSigningKeys> = mutableMapOf(),
30+
val userIdentities: MutableMap<String, UserIdentity> = mutableMapOf(),
3131
)

‎matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt

+20-20
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
3333
import org.matrix.android.sdk.api.session.crypto.NewSessionListener
3434
import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
3535
import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
36-
import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKeys
3736
import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
3837
import org.matrix.android.sdk.api.session.crypto.crosssigning.PrivateKeysInfo
38+
import org.matrix.android.sdk.api.session.crypto.crosssigning.UserIdentity
3939
import org.matrix.android.sdk.api.session.crypto.keysbackup.SavedKeyBackupKeyInfo
4040
import org.matrix.android.sdk.api.session.crypto.model.AuditTrail
4141
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
@@ -330,23 +330,23 @@ internal class RealmCryptoStore @Inject constructor(
330330
}
331331
}
332332

333-
override fun storeUserCrossSigningKeys(
333+
override fun storeUserIdentity(
334334
userId: String,
335-
cryptoCrossSigningKeys: CryptoCrossSigningKeys,
335+
userIdentity: UserIdentity,
336336
) {
337-
doRealmTransaction("storeUserCrossSigningKeys", realmConfiguration) { realm ->
338-
storeUserCrossSigningKeys(realm, userId, cryptoCrossSigningKeys)
337+
doRealmTransaction("storeUserIdentity", realmConfiguration) { realm ->
338+
storeUserIdentity(realm, userId, userIdentity)
339339
}
340340
}
341341

342-
private fun storeUserCrossSigningKeys(
342+
private fun storeUserIdentity(
343343
realm: Realm,
344344
userId: String,
345-
keys: CryptoCrossSigningKeys,
345+
userIdentity: UserIdentity,
346346
) {
347347
UserEntity.getOrCreate(realm, userId)
348348
.let { userEntity ->
349-
if (keys.masterKey == null || keys.selfSigningKey == null) {
349+
if (userIdentity.masterKey == null || userIdentity.selfSigningKey == null) {
350350
// The user has disabled cross signing?
351351
userEntity.crossSigningInfoEntity?.deleteOnCascade()
352352
userEntity.crossSigningInfoEntity = null
@@ -355,11 +355,11 @@ internal class RealmCryptoStore @Inject constructor(
355355
CrossSigningInfoEntity.getOrCreate(realm, userId).let { signingInfo ->
356356
// What should we do if we detect a change of the keys?
357357
val existingMaster = signingInfo.getMasterKey()
358-
if (existingMaster != null && existingMaster.publicKeyBase64 == keys.masterKey.unpaddedBase64PublicKey) {
359-
crossSigningKeysMapper.update(existingMaster, keys.masterKey)
358+
if (existingMaster != null && existingMaster.publicKeyBase64 == userIdentity.masterKey.unpaddedBase64PublicKey) {
359+
crossSigningKeysMapper.update(existingMaster, userIdentity.masterKey)
360360
} else {
361361
Timber.d("## CrossSigning MSK change for $userId")
362-
val keyEntity = crossSigningKeysMapper.map(keys.masterKey)
362+
val keyEntity = crossSigningKeysMapper.map(userIdentity.masterKey)
363363
signingInfo.setMasterKey(keyEntity)
364364
if (userId == this.userId) {
365365
shouldResetMyDevicesLocalTrust = true
@@ -374,11 +374,11 @@ internal class RealmCryptoStore @Inject constructor(
374374
}
375375

376376
val existingSelfSigned = signingInfo.getSelfSignedKey()
377-
if (existingSelfSigned != null && existingSelfSigned.publicKeyBase64 == keys.selfSigningKey.unpaddedBase64PublicKey) {
378-
crossSigningKeysMapper.update(existingSelfSigned, keys.selfSigningKey)
377+
if (existingSelfSigned != null && existingSelfSigned.publicKeyBase64 == userIdentity.selfSigningKey.unpaddedBase64PublicKey) {
378+
crossSigningKeysMapper.update(existingSelfSigned, userIdentity.selfSigningKey)
379379
} else {
380380
Timber.d("## CrossSigning SSK change for $userId")
381-
val keyEntity = crossSigningKeysMapper.map(keys.selfSigningKey)
381+
val keyEntity = crossSigningKeysMapper.map(userIdentity.selfSigningKey)
382382
signingInfo.setSelfSignedKey(keyEntity)
383383
if (userId == this.userId) {
384384
shouldResetMyDevicesLocalTrust = true
@@ -390,13 +390,13 @@ internal class RealmCryptoStore @Inject constructor(
390390
}
391391

392392
// Only for me
393-
if (keys.userSigningKey != null) {
393+
if (userIdentity.userSigningKey != null) {
394394
val existingUSK = signingInfo.getUserSigningKey()
395-
if (existingUSK != null && existingUSK.publicKeyBase64 == keys.userSigningKey.unpaddedBase64PublicKey) {
396-
crossSigningKeysMapper.update(existingUSK, keys.userSigningKey)
395+
if (existingUSK != null && existingUSK.publicKeyBase64 == userIdentity.userSigningKey.unpaddedBase64PublicKey) {
396+
crossSigningKeysMapper.update(existingUSK, userIdentity.userSigningKey)
397397
} else {
398398
Timber.d("## CrossSigning USK change for $userId")
399-
val keyEntity = crossSigningKeysMapper.map(keys.userSigningKey)
399+
val keyEntity = crossSigningKeysMapper.map(userIdentity.userSigningKey)
400400
signingInfo.setUserSignedKey(keyEntity)
401401
if (userId == this.userId) {
402402
shouldResetMyDevicesLocalTrust = true
@@ -1857,8 +1857,8 @@ internal class RealmCryptoStore @Inject constructor(
18571857
userDataToStore.userDevices.forEach {
18581858
storeUserDevices(realm, it.key, it.value)
18591859
}
1860-
userDataToStore.userCrossSigningKeys.forEach {
1861-
storeUserCrossSigningKeys(realm, it.key, it.value)
1860+
userDataToStore.userIdentities.forEach {
1861+
storeUserIdentity(realm, it.key, it.value)
18621862
}
18631863
}
18641864
}

0 commit comments

Comments
 (0)