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

Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire]

This commit is contained in:
Benoit Marty 2022-11-24 11:06:00 +01:00
parent 3dccad9931
commit ebbfca4ffd
4 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
View File

@ -83,9 +83,7 @@ internal class CrossSigningOlm @Inject constructor(
val signaturesMadeByMyKey = signatures[myUserID] // Signatures made by me val signaturesMadeByMyKey = signatures[myUserID] // Signatures made by me
?.get("ed25519:$pubKey") ?.get("ed25519:$pubKey")
if (signaturesMadeByMyKey.isNullOrBlank()) { require(signaturesMadeByMyKey.orEmpty().isNotBlank()) { "Not signed with my key $type" }
throw IllegalArgumentException("Not signed with my key $type")
}
// Check that Alice USK signature of Bob MSK is valid // Check that Alice USK signature of Bob MSK is valid
olmUtility.verifyEd25519Signature(signaturesMadeByMyKey, pubKey, JsonCanonicalizer.getCanonicalJson(Map::class.java, signable)) olmUtility.verifyEd25519Signature(signaturesMadeByMyKey, pubKey, JsonCanonicalizer.getCanonicalJson(Map::class.java, signable))

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
View File

@ -47,9 +47,8 @@ internal class DefaultEncryptEventTask @Inject constructor(
// don't want to wait for any query // don't want to wait for any query
// if (!params.crypto.isRoomEncrypted(params.roomId)) return params.event // if (!params.crypto.isRoomEncrypted(params.roomId)) return params.event
val localEvent = params.event val localEvent = params.event
if (localEvent.eventId == null || localEvent.type == null) { require(localEvent.eventId != null)
throw IllegalArgumentException() require(localEvent.type != null)
}
localEchoRepository.updateSendState(localEvent.eventId, localEvent.roomId, SendState.ENCRYPTING) localEchoRepository.updateSendState(localEvent.eventId, localEvent.roomId, SendState.ENCRYPTING)

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
View File

@ -1140,7 +1140,7 @@ internal class DefaultVerificationService @Inject constructor(
override fun beginKeyVerification(method: VerificationMethod, otherUserId: String, otherDeviceId: String, transactionId: String?): String? { override fun beginKeyVerification(method: VerificationMethod, otherUserId: String, otherDeviceId: String, transactionId: String?): String? {
val txID = transactionId?.takeIf { it.isNotEmpty() } ?: createUniqueIDForTransaction(otherUserId, otherDeviceId) val txID = transactionId?.takeIf { it.isNotEmpty() } ?: createUniqueIDForTransaction(otherUserId, otherDeviceId)
// should check if already one (and cancel it) // should check if already one (and cancel it)
if (method == VerificationMethod.SAS) { require(method == VerificationMethod.SAS) { "Unknown verification method" }
val tx = DefaultOutgoingSASDefaultVerificationTransaction( val tx = DefaultOutgoingSASDefaultVerificationTransaction(
setDeviceVerificationAction, setDeviceVerificationAction,
userId, userId,
@ -1159,9 +1159,6 @@ internal class DefaultVerificationService @Inject constructor(
tx.start() tx.start()
return txID return txID
} else {
throw IllegalArgumentException("Unknown verification method")
}
} }
override fun requestKeyVerificationInDMs( override fun requestKeyVerificationInDMs(
@ -1343,7 +1340,7 @@ internal class DefaultVerificationService @Inject constructor(
otherUserId: String, otherUserId: String,
otherDeviceId: String otherDeviceId: String
): String { ): String {
if (method == VerificationMethod.SAS) { require(method == VerificationMethod.SAS) { "Unknown verification method" }
val tx = DefaultOutgoingSASDefaultVerificationTransaction( val tx = DefaultOutgoingSASDefaultVerificationTransaction(
setDeviceVerificationAction, setDeviceVerificationAction,
userId, userId,
@ -1362,9 +1359,6 @@ internal class DefaultVerificationService @Inject constructor(
tx.start() tx.start()
return transactionId return transactionId
} else {
throw IllegalArgumentException("Unknown verification method")
}
} }
override fun readyPendingVerificationInDMs( override fun readyPendingVerificationInDMs(

4
vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
View File

@ -37,9 +37,7 @@ class VectorViewModelFactory @Inject constructor(
} }
} }
} }
if (creator == null) { require(creator != null) { "Unknown model class: $modelClass" }
throw IllegalArgumentException("Unknown model class: $modelClass")
}
try { try {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
return creator.get() as T return creator.get() as T