rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: Remove the object signer from the crypto service

Browse Source
This commit is contained in:
Damir Jelić 2021-03-24 14:02:32 +01:00
parent e4ac5f6c13
commit f5348d6c9d
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
View File

@ -148,8 +148,6 @@ internal class DefaultCryptoService @Inject constructor(
// The key backup service. // The key backup service.
private val keysBackupService: DefaultKeysBackupService, private val keysBackupService: DefaultKeysBackupService,
// //
private val objectSigner: ObjectSigner,
//
private val roomDecryptorProvider: RoomDecryptorProvider, private val roomDecryptorProvider: RoomDecryptorProvider,
// The verification service. // The verification service.
private val verificationService: DefaultVerificationService, private val verificationService: DefaultVerificationService,
@ -341,11 +339,6 @@ internal class DefaultCryptoService @Inject constructor(
cryptoCoroutineScope.launchToCallback(coroutineDispatchers.crypto, NoOpMatrixCallback()) { cryptoCoroutineScope.launchToCallback(coroutineDispatchers.crypto, NoOpMatrixCallback()) {
// Open the store // Open the store
cryptoStore.open() cryptoStore.open()
// this can throw if no network
tryOrNull {
uploadDeviceKeys()
}
// this can throw if no backup // this can throw if no backup
tryOrNull { tryOrNull {
keysBackupService.checkAndStartKeysBackup() keysBackupService.checkAndStartKeysBackup()
@ -1005,30 +998,6 @@ internal class DefaultCryptoService @Inject constructor(
} }
} }
/**
* Upload my user's device keys.
*/
private suspend fun uploadDeviceKeys() {
// sendOutgoingRequests()
// if (cryptoStore.getDeviceKeysUploaded()) {
// Timber.d("Keys already uploaded, nothing to do")
// return
// }
// // Prepare the device keys data to send
// // Sign it
// val canonicalJson = JsonCanonicalizer.getCanonicalJson(Map::class.java, getMyDevice().signalableJSONDictionary())
// var rest = getMyDevice().toRest()
// rest = rest.copy(
// signatures = objectSigner.signObject(canonicalJson)
// )
// val uploadDeviceKeysParams = UploadKeysTask.Params(rest, null)
// uploadKeysTask.execute(uploadDeviceKeysParams)
// cryptoStore.setDeviceKeysUploaded(true)
}
/** /**
* Export the crypto keys * Export the crypto keys
* *