From 5b4069d9f4355490e62c4c7771d17b9defc8950f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 23 Jun 2023 15:13:03 +0200 Subject: [PATCH] Use operator invoke. --- .../preferences/impl/developer/DeveloperSettingsPresenter.kt | 4 ++-- .../features/preferences/impl/tasks/ClearCacheUseCase.kt | 4 ++-- .../preferences/impl/tasks/ComputeCacheSizeUseCase.kt | 4 ++-- .../features/preferences/impl/tasks/FakeClearCacheUseCase.kt | 2 +- .../preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt index 08a787e998..d4430dd2e3 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt @@ -127,13 +127,13 @@ class DeveloperSettingsPresenter @Inject constructor( private fun CoroutineScope.computeCacheSize(cacheSize: MutableState>) = launch { suspend { - computeCacheSizeUseCase.execute() + computeCacheSizeUseCase() }.execute(cacheSize) } private fun CoroutineScope.clearCache(clearCacheAction: MutableState>) = launch { suspend { - clearCacheUseCase.execute() + clearCacheUseCase() }.execute(clearCacheAction) } } diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt index c351bcc127..df70b6f148 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt @@ -33,7 +33,7 @@ import javax.inject.Inject import javax.inject.Provider interface ClearCacheUseCase { - suspend fun execute() + suspend operator fun invoke() } @ContributesBinding(SessionScope::class) @@ -44,7 +44,7 @@ class DefaultClearCacheUseCase @Inject constructor( private val authenticationService: MatrixAuthenticationService, private val okHttpClient: Provider, ) : ClearCacheUseCase { - override suspend fun execute() = withContext(coroutineDispatchers.io) { + override suspend fun invoke() = withContext(coroutineDispatchers.io) { // Clear Matrix cache matrixClient.clearCache() // Clear Coil cache diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt index 9da6909e5f..038694201b 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt @@ -28,7 +28,7 @@ import kotlinx.coroutines.withContext import javax.inject.Inject interface ComputeCacheSizeUseCase { - suspend fun execute(): String + suspend operator fun invoke(): String } @ContributesBinding(SessionScope::class) @@ -38,7 +38,7 @@ class DefaultComputeCacheSizeUseCase @Inject constructor( private val coroutineDispatchers: CoroutineDispatchers, private val fileSizeFormatter: FileSizeFormatter, ) : ComputeCacheSizeUseCase { - override suspend fun execute(): String = withContext(coroutineDispatchers.io) { + override suspend fun invoke(): String = withContext(coroutineDispatchers.io) { var cumulativeSize = 0L cumulativeSize += matrixClient.getCacheSize() // - 4096 to not include the size fo the folder diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt index f5bc83c443..7415e09e96 100644 --- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt +++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt @@ -22,7 +22,7 @@ class FakeClearCacheUseCase : ClearCacheUseCase { var executeHasBeenCalled = false private set - override suspend fun execute() = simulateLongTask { + override suspend fun invoke() = simulateLongTask { executeHasBeenCalled = true } } diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt index 36f60eca7c..fa8556630f 100644 --- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt +++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt @@ -19,7 +19,7 @@ package io.element.android.features.preferences.impl.tasks import io.element.android.tests.testutils.simulateLongTask class FakeComputeCacheSizeUseCase : ComputeCacheSizeUseCase { - override suspend fun execute() = simulateLongTask { + override suspend fun invoke() = simulateLongTask { "O kB" } }