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

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

Browse Source
This commit is contained in:
Benoit Marty 2022-07-19 14:58:44 +02:00 committed by Benoit Marty
parent b4f833cb0d
commit 40f8d94954
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/StringOrderUtils.kt
View File

@ -76,7 +76,7 @@ object StringOrderUtils {
} }
fun stringToBase(x: String, alphabet: CharArray): BigInteger { fun stringToBase(x: String, alphabet: CharArray): BigInteger {
if (x.isEmpty()) throw IllegalArgumentException() require(x.isNotEmpty())
val len = alphabet.size.toBigInteger() val len = alphabet.size.toBigInteger()
var result = BigInteger("0") var result = BigInteger("0")
x.reversed().forEachIndexed { index, c -> x.reversed().forEachIndexed { index, c ->

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
View File

@ -250,8 +250,10 @@ internal class MXMegolmEncryption(
* @param sessionInfo the session info * @param sessionInfo the session info
* @param devicesByUser the devices map * @param devicesByUser the devices map
*/ */
private suspend fun shareUserDevicesKey(sessionInfo: MXOutboundSessionInfo, private suspend fun shareUserDevicesKey(
devicesByUser: Map<String, List<CryptoDeviceInfo>>) { sessionInfo: MXOutboundSessionInfo,
devicesByUser: Map<String, List<CryptoDeviceInfo>>
) {
val sessionKey = olmDevice.getSessionKey(sessionInfo.sessionId) ?: return Unit.also { val sessionKey = olmDevice.getSessionKey(sessionInfo.sessionId) ?: return Unit.also {
Timber.tag(loggerTag.value).v("shareUserDevicesKey() Failed to share session, failed to export") Timber.tag(loggerTag.value).v("shareUserDevicesKey() Failed to share session, failed to export")
} }
@ -533,7 +535,7 @@ internal class MXMegolmEncryption(
@Throws @Throws
override suspend fun shareHistoryKeysWithDevice(inboundSessionWrapper: InboundGroupSessionHolder, deviceInfo: CryptoDeviceInfo) { override suspend fun shareHistoryKeysWithDevice(inboundSessionWrapper: InboundGroupSessionHolder, deviceInfo: CryptoDeviceInfo) {
if (!inboundSessionWrapper.wrapper.sessionData.sharedHistory) throw IllegalArgumentException("This key can't be shared") require(inboundSessionWrapper.wrapper.sessionData.sharedHistory) { "This key can't be shared" }
Timber.tag(loggerTag.value).i("process shareHistoryKeys for ${inboundSessionWrapper.wrapper.safeSessionId} to ${deviceInfo.shortDebugString()}") Timber.tag(loggerTag.value).i("process shareHistoryKeys for ${inboundSessionWrapper.wrapper.safeSessionId} to ${deviceInfo.shortDebugString()}")
val userId = deviceInfo.userId val userId = deviceInfo.userId
val deviceId = deviceInfo.deviceId val deviceId = deviceInfo.deviceId