Skip to content

Commit c2297ae

Browse files
JuancaG05abelgardep
authored andcommitted
Move discovery to AuthenticationViewModel
1 parent 731810c commit c2297ae

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ val viewModelModule = module {
7575
PassCodeViewModel(get(), get(), action)
7676
}
7777

78-
viewModel { AuthenticationViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
78+
viewModel { AuthenticationViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
7979
viewModel { OAuthViewModel(get(), get(), get(), get()) }
8080
viewModel { SettingsViewModel(get()) }
8181
viewModel { SettingsSecurityViewModel(get(), get()) }

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import com.owncloud.android.domain.webfinger.usecases.GetOwnCloudInstancesFromAu
4040
import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
4141
import com.owncloud.android.presentation.common.UIResult
4242
import com.owncloud.android.providers.CoroutinesDispatcherProvider
43+
import com.owncloud.android.providers.WorkManagerProvider
4344
import kotlinx.coroutines.launch
4445
import timber.log.Timber
4546

@@ -54,6 +55,7 @@ class AuthenticationViewModel(
5455
private val refreshCapabilitiesFromServerAsyncUseCase: RefreshCapabilitiesFromServerAsyncUseCase,
5556
private val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase,
5657
private val refreshSpacesFromServerAsyncUseCase: RefreshSpacesFromServerAsyncUseCase,
58+
private val workManagerProvider: WorkManagerProvider,
5759
private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
5860
) : ViewModel() {
5961

@@ -213,5 +215,6 @@ class AuthenticationViewModel(
213215
}
214216
_accountDiscovery.postValue(Event(UIResult.Success()))
215217
}
218+
workManagerProvider.enqueueAccountDiscovery(accountName)
216219
}
217220
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ import com.owncloud.android.presentation.security.SecurityEnforced
7474
import com.owncloud.android.presentation.settings.SettingsActivity
7575
import com.owncloud.android.providers.ContextProvider
7676
import com.owncloud.android.providers.MdmProvider
77-
import com.owncloud.android.providers.WorkManagerProvider
7877
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog
7978
import com.owncloud.android.utils.CONFIGURATION_OAUTH2_OPEN_ID_SCOPE
8079
import com.owncloud.android.utils.CONFIGURATION_SERVER_URL
@@ -397,10 +396,6 @@ class LoginActivity : AppCompatActivity(), SslUntrustedCertDialog.OnSslUntrusted
397396
setResult(Activity.RESULT_OK, intent)
398397

399398
authenticationViewModel.discoverAccount(accountName = accountName, discoveryNeeded = loginAction == ACTION_CREATE)
400-
401-
if (loginAction == ACTION_CREATE) {
402-
WorkManagerProvider(applicationContext).enqueueAccountDiscovery(accountName)
403-
}
404399
}
405400

406401
private fun loginIsLoading() {

0 commit comments

Comments
 (0)