Skip to content

Commit 068c953

Browse files
JuancaG05JuancaG05
authored
Merge pull request #4179 from owncloud/technical/usecases_invoke
[Technical] Use invoke operator to execute usecases
2 parents c52ddda + 8e1da24 commit 068c953

File tree

96 files changed

+345
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+345
-345
lines changed

‎owncloudApp/src/main/java/com/owncloud/android/MainApp.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class MainApp : Application() {
166166

167167
val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase by inject()
168168
val capabilities = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
169-
getStoredCapabilitiesUseCase.execute(
169+
getStoredCapabilitiesUseCase(
170170
GetStoredCapabilitiesUseCase.Params(
171171
accountName = account.name
172172
)
@@ -178,7 +178,7 @@ class MainApp : Application() {
178178
if (spacesAllowed) {
179179
val getPersonalSpaceForAccountUseCase: GetPersonalSpaceForAccountUseCase by inject()
180180
personalSpace = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
181-
getPersonalSpaceForAccountUseCase.execute(
181+
getPersonalSpaceForAccountUseCase(
182182
GetPersonalSpaceForAccountUseCase.Params(
183183
accountName = account.name
184184
)

‎owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class FileDataStorageManager(
5656
val getFileByRemotePathUseCase: GetFileByRemotePathUseCase by inject()
5757

5858
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
59-
getFileByRemotePathUseCase.execute(GetFileByRemotePathUseCase.Params(accountName, remotePath, spaceId))
59+
getFileByRemotePathUseCase(GetFileByRemotePathUseCase.Params(accountName, remotePath, spaceId))
6060
}.getDataOrNull()
6161
result
6262
}
@@ -65,7 +65,7 @@ class FileDataStorageManager(
6565
val getPersonalRootFolderForAccountUseCase: GetPersonalRootFolderForAccountUseCase by inject()
6666

6767
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
68-
getPersonalRootFolderForAccountUseCase.execute(GetPersonalRootFolderForAccountUseCase.Params(account.name))
68+
getPersonalRootFolderForAccountUseCase(GetPersonalRootFolderForAccountUseCase.Params(account.name))
6969
}
7070
result
7171
}
@@ -74,7 +74,7 @@ class FileDataStorageManager(
7474
val getSharesRootFolderForAccount: GetSharesRootFolderForAccount by inject()
7575

7676
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
77-
getSharesRootFolderForAccount.execute(GetSharesRootFolderForAccount.Params(account.name))
77+
getSharesRootFolderForAccount(GetSharesRootFolderForAccount.Params(account.name))
7878
}
7979
result
8080
}
@@ -84,7 +84,7 @@ class FileDataStorageManager(
8484
val getFileByIdUseCase: GetFileByIdUseCase by inject()
8585

8686
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
87-
getFileByIdUseCase.execute(GetFileByIdUseCase.Params(id))
87+
getFileByIdUseCase(GetFileByIdUseCase.Params(id))
8888
}.getDataOrNull()
8989
result
9090
}
@@ -106,7 +106,7 @@ class FileDataStorageManager(
106106

107107
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
108108
// TODO: Remove !!
109-
getFolderImagesUseCase.execute(GetFolderImagesUseCase.Params(folderId = folder!!.id!!))
109+
getFolderImagesUseCase(GetFolderImagesUseCase.Params(folderId = folder!!.id!!))
110110
}.getDataOrNull()
111111
result ?: listOf()
112112
}
@@ -116,7 +116,7 @@ class FileDataStorageManager(
116116
val getFolderContentUseCase: GetFolderContentUseCase by inject()
117117

118118
val result = withContext(CoroutineScope(CoroutinesDispatcherProvider().io).coroutineContext) {
119-
getFolderContentUseCase.execute(GetFolderContentUseCase.Params(parentId))
119+
getFolderContentUseCase(GetFolderContentUseCase.Params(parentId))
120120
}.getDataOrNull()
121121
result ?: listOf()
122122
}

‎owncloudApp/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private String getPreviewUrl(OCFile ocFile, Account account) {
263263

264264
if (ocFile.getSpaceId() != null) {
265265
Lazy<GetWebDavUrlForSpaceUseCase> getWebDavUrlForSpaceUseCaseLazy = inject(GetWebDavUrlForSpaceUseCase.class);
266-
baseUrl = getWebDavUrlForSpaceUseCaseLazy.getValue().execute(
266+
baseUrl = getWebDavUrlForSpaceUseCaseLazy.getValue().invoke(
267267
new GetWebDavUrlForSpaceUseCase.Params(ocFile.getOwner(), ocFile.getSpaceId())
268268
);
269269

@@ -317,7 +317,7 @@ private Bitmap doOCFileInBackground() {
317317
}
318318
if (status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_NOT_FOUND) {
319319
@NotNull Lazy<DisableThumbnailsForFileUseCase> disableThumbnailsForFileUseCaseLazy = inject(DisableThumbnailsForFileUseCase.class);
320-
disableThumbnailsForFileUseCaseLazy.getValue().execute(new DisableThumbnailsForFileUseCase.Params(file.getId()));
320+
disableThumbnailsForFileUseCaseLazy.getValue().invoke(new DisableThumbnailsForFileUseCase.Params(file.getId()));
321321
}
322322
} catch (Exception e) {
323323
Timber.e(e);

‎owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ object ViewModelExt : KoinComponent {
6363
return@launch
6464
}
6565

66-
val useCaseResult = useCase.execute(useCaseParams)
66+
val useCaseResult = useCase(useCaseParams)
6767

6868
Timber.d("Use case executed: ${useCase.javaClass.simpleName} with result: $useCaseResult")
6969

@@ -101,7 +101,7 @@ object ViewModelExt : KoinComponent {
101101
return@launch
102102
}
103103

104-
val useCaseResult = useCase.execute(useCaseParams)
104+
val useCaseResult = useCase(useCaseParams)
105105

106106
Timber.d("Use case executed: ${useCase.javaClass.simpleName} with result: $useCaseResult")
107107

@@ -135,7 +135,7 @@ object ViewModelExt : KoinComponent {
135135
return@launch
136136
}
137137

138-
val useCaseResult = useCase.execute(useCaseParams)
138+
val useCaseResult = useCase(useCaseParams)
139139

140140
Timber.d("Use case executed: ${useCase.javaClass.simpleName} with result: $useCaseResult")
141141

‎owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class SyncProfileOperation(
5151
try {
5252
CoroutineScope(Dispatchers.IO).launch {
5353
val getUserInfoAsyncUseCase: GetUserInfoAsyncUseCase by inject()
54-
val userInfoResult = getUserInfoAsyncUseCase.execute(GetUserInfoAsyncUseCase.Params(account.name))
54+
val userInfoResult = getUserInfoAsyncUseCase(GetUserInfoAsyncUseCase.Params(account.name))
5555
userInfoResult.getDataOrNull()?.let { userInfo ->
5656
Timber.d("User info synchronized for account ${account.name}")
5757

@@ -62,7 +62,7 @@ class SyncProfileOperation(
6262

6363
val refreshUserQuotaFromServerAsyncUseCase: RefreshUserQuotaFromServerAsyncUseCase by inject()
6464
val userQuotaResult =
65-
refreshUserQuotaFromServerAsyncUseCase.execute(
65+
refreshUserQuotaFromServerAsyncUseCase(
6666
RefreshUserQuotaFromServerAsyncUseCase.Params(
6767
account.name
6868
)
@@ -72,12 +72,12 @@ class SyncProfileOperation(
7272

7373
val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase by inject()
7474

75-
val storedCapabilities = getStoredCapabilitiesUseCase.execute(GetStoredCapabilitiesUseCase.Params(account.name))
75+
val storedCapabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(account.name))
7676
val shouldFetchAvatar = storedCapabilities?.isFetchingAvatarAllowed() ?: true
7777

7878
if (shouldFetchAvatar) {
7979
val getUserAvatarAsyncUseCase: GetUserAvatarAsyncUseCase by inject()
80-
val userAvatarResult = getUserAvatarAsyncUseCase.execute(GetUserAvatarAsyncUseCase.Params(account.name))
80+
val userAvatarResult = getUserAvatarAsyncUseCase(GetUserAvatarAsyncUseCase.Params(account.name))
8181
AvatarManager().handleAvatarUseCaseResult(account, userAvatarResult)
8282
if (userAvatarResult.isSuccess) {
8383
Timber.d("Avatar synchronized for account ${account.name}")

‎owncloudApp/src/main/java/com/owncloud/android/presentation/accounts/RemoveAccountDialogViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RemoveAccountDialogViewModel(
4040

4141
private fun initCameraUploadsConfiguration() {
4242
viewModelScope.launch(coroutinesDispatcherProvider.io) {
43-
cameraUploadsConfiguration = getCameraUploadsConfigurationUseCase.execute(Unit).getDataOrNull()
43+
cameraUploadsConfiguration = getCameraUploadsConfigurationUseCase(Unit).getDataOrNull()
4444
}
4545
}
4646

‎owncloudApp/src/main/java/com/owncloud/android/presentation/authentication/AccountAuthenticator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ private String refreshToken(
338338
@NotNull Lazy<OIDCDiscoveryUseCase> oidcDiscoveryUseCase = inject(OIDCDiscoveryUseCase.class);
339339
OIDCDiscoveryUseCase.Params oidcDiscoveryUseCaseParams = new OIDCDiscoveryUseCase.Params(baseUrl);
340340
UseCaseResult<OIDCServerConfiguration> oidcServerConfigurationUseCaseResult =
341-
oidcDiscoveryUseCase.getValue().execute(oidcDiscoveryUseCaseParams);
341+
oidcDiscoveryUseCase.getValue().invoke(oidcDiscoveryUseCaseParams);
342342

343343
String tokenEndpoint;
344344

@@ -380,7 +380,7 @@ private String refreshToken(
380380
// Token exchange
381381
@NotNull Lazy<RequestTokenUseCase> requestTokenUseCase = inject(RequestTokenUseCase.class);
382382
RequestTokenUseCase.Params requestTokenParams = new RequestTokenUseCase.Params(oauthTokenRequest);
383-
UseCaseResult<TokenResponse> tokenResponseResult = requestTokenUseCase.getValue().execute(requestTokenParams);
383+
UseCaseResult<TokenResponse> tokenResponseResult = requestTokenUseCase.getValue().invoke(requestTokenParams);
384384

385385
TokenResponse safeTokenResponse = tokenResponseResult.getDataOrNull();
386386
if (safeTokenResponse != null) {

‎owncloudApp/src/main/java/com/owncloud/android/presentation/authentication/AuthenticationViewModel.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class AuthenticationViewModel(
147147

148148
// Authenticated WebFinger needed only for account creations. Logged accounts already know their instances.
149149
if (updateAccountWithUsername == null) {
150-
val ownCloudInstancesAvailable = getOwnCloudInstancesFromAuthenticatedWebFingerUseCase.execute(
150+
val ownCloudInstancesAvailable = getOwnCloudInstancesFromAuthenticatedWebFingerUseCase(
151151
GetOwnCloudInstancesFromAuthenticatedWebFingerUseCase.Params(
152152
server = serverBaseUrl,
153153
username = username,
@@ -164,7 +164,7 @@ class AuthenticationViewModel(
164164
}
165165
}
166166

167-
val useCaseResult = loginOAuthAsyncUseCase.execute(
167+
val useCaseResult = loginOAuthAsyncUseCase(
168168
LoginOAuthAsyncUseCase.Params(
169169
serverInfo = serverInfo,
170170
username = username,
@@ -260,14 +260,14 @@ class AuthenticationViewModel(
260260
_accountDiscovery.postValue(Event(UIResult.Loading()))
261261
viewModelScope.launch(coroutinesDispatcherProvider.io) {
262262
// 1. Refresh capabilities for account
263-
refreshCapabilitiesFromServerAsyncUseCase.execute(RefreshCapabilitiesFromServerAsyncUseCase.Params(accountName))
264-
val capabilities = getStoredCapabilitiesUseCase.execute(GetStoredCapabilitiesUseCase.Params(accountName))
263+
refreshCapabilitiesFromServerAsyncUseCase(RefreshCapabilitiesFromServerAsyncUseCase.Params(accountName))
264+
val capabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(accountName))
265265

266266
val spacesAvailableForAccount = capabilities?.isSpacesAllowed() == true
267267

268268
// 2 If Account does not support spaces we can skip this
269269
if (spacesAvailableForAccount) {
270-
refreshSpacesFromServerAsyncUseCase.execute(RefreshSpacesFromServerAsyncUseCase.Params(accountName))
270+
refreshSpacesFromServerAsyncUseCase(RefreshSpacesFromServerAsyncUseCase.Params(accountName))
271271
}
272272
_accountDiscovery.postValue(Event(UIResult.Success()))
273273
}

‎owncloudApp/src/main/java/com/owncloud/android/presentation/avatar/AvatarManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class AvatarManager : KoinComponent {
6666

6767
val shouldFetchAvatar = try {
6868
val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase by inject()
69-
val storedCapabilities = getStoredCapabilitiesUseCase.execute(GetStoredCapabilitiesUseCase.Params(account.name))
69+
val storedCapabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(account.name))
7070
storedCapabilities?.isFetchingAvatarAllowed() ?: true
7171
} catch (instanceCreationException: InstanceCreationException) {
7272
Timber.e(instanceCreationException, "Koin may not be initialized at this point")
@@ -78,7 +78,7 @@ class AvatarManager : KoinComponent {
7878
Timber.i("Avatar with imageKey $imageKey is not available in cache. Fetching from server...")
7979
val getUserAvatarAsyncUseCase: GetUserAvatarAsyncUseCase by inject()
8080
val useCaseResult =
81-
getUserAvatarAsyncUseCase.execute(GetUserAvatarAsyncUseCase.Params(accountName = account.name))
81+
getUserAvatarAsyncUseCase(GetUserAvatarAsyncUseCase.Params(accountName = account.name))
8282
handleAvatarUseCaseResult(account, useCaseResult)?.let { return it }
8383
}
8484

‎owncloudApp/src/main/java/com/owncloud/android/presentation/capabilities/CapabilityViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class CapabilityViewModel(
4444
private val _capabilities = MediatorLiveData<Event<UIResult<OCCapability>>>()
4545
val capabilities: LiveData<Event<UIResult<OCCapability>>> = _capabilities
4646

47-
private var capabilitiesLiveData: LiveData<OCCapability?> = getCapabilitiesAsLiveDataUseCase.execute(
47+
private var capabilitiesLiveData: LiveData<OCCapability?> = getCapabilitiesAsLiveDataUseCase(
4848
GetCapabilitiesAsLiveDataUseCase.Params(
4949
accountName = accountName
5050
)

0 commit comments

Comments
 (0)