Use local val and more compact code.
This commit is contained in:
parent
14a52d4a05
commit
9dcb7c890f
|
@ -42,12 +42,10 @@ internal class DefaultScanEncryptedTask @Inject constructor(
|
||||||
|
|
||||||
override suspend fun execute(params: ScanEncryptedTask.Params): ScanResponse {
|
override suspend fun execute(params: ScanEncryptedTask.Params): ScanResponse {
|
||||||
val mxcUrl = params.mxcUrl
|
val mxcUrl = params.mxcUrl
|
||||||
|
|
||||||
val scannerUrl = contentScannerStore.getScannerUrl()
|
val scannerUrl = contentScannerStore.getScannerUrl()
|
||||||
contentScannerStore.updateStateForContent(params.mxcUrl, ScanState.IN_PROGRESS, scannerUrl)
|
contentScannerStore.updateStateForContent(mxcUrl, ScanState.IN_PROGRESS, scannerUrl)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val dlBody = ScanEncryptorUtils.getDownloadBodyAndEncryptIfNeeded(params.publicServerKey, params.mxcUrl, params.encryptedInfo)
|
val dlBody = ScanEncryptorUtils.getDownloadBodyAndEncryptIfNeeded(params.publicServerKey, mxcUrl, params.encryptedInfo)
|
||||||
val api = contentScannerApiProvider.contentScannerApi ?: throw IllegalArgumentException()
|
val api = contentScannerApiProvider.contentScannerApi ?: throw IllegalArgumentException()
|
||||||
val executeRequest = executeRequest<ScanResponse>(null) {
|
val executeRequest = executeRequest<ScanResponse>(null) {
|
||||||
api.scanFile(dlBody)
|
api.scanFile(dlBody)
|
||||||
|
@ -60,7 +58,7 @@ internal class DefaultScanEncryptedTask @Inject constructor(
|
||||||
)
|
)
|
||||||
return executeRequest
|
return executeRequest
|
||||||
} catch (failure: Throwable) {
|
} catch (failure: Throwable) {
|
||||||
contentScannerStore.updateStateForContent(params.mxcUrl, ScanState.UNKNOWN, scannerUrl)
|
contentScannerStore.updateStateForContent(mxcUrl, ScanState.UNKNOWN, scannerUrl)
|
||||||
throw failure.toScanFailure() ?: failure
|
throw failure.toScanFailure() ?: failure
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue