crypto: Remove the object signer from the crypto service
This commit is contained in:
parent
e4ac5f6c13
commit
f5348d6c9d
@ -148,8 +148,6 @@ internal class DefaultCryptoService @Inject constructor(
|
||||
// The key backup service.
|
||||
private val keysBackupService: DefaultKeysBackupService,
|
||||
//
|
||||
private val objectSigner: ObjectSigner,
|
||||
//
|
||||
private val roomDecryptorProvider: RoomDecryptorProvider,
|
||||
// The verification service.
|
||||
private val verificationService: DefaultVerificationService,
|
||||
@ -341,11 +339,6 @@ internal class DefaultCryptoService @Inject constructor(
|
||||
cryptoCoroutineScope.launchToCallback(coroutineDispatchers.crypto, NoOpMatrixCallback()) {
|
||||
// Open the store
|
||||
cryptoStore.open()
|
||||
// this can throw if no network
|
||||
tryOrNull {
|
||||
uploadDeviceKeys()
|
||||
}
|
||||
|
||||
// this can throw if no backup
|
||||
tryOrNull {
|
||||
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
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user