atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use more concise runCatching instead of Result

Browse Source
This commit is contained in:
Kirill Kamakin
2021-11-13 10:14:15 +03:00
parent 10b3dadc3d
commit cb495aaba3
6 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt
View File

@@ -71,8 +71,13 @@ class AuthenticationFragment : Fragment() {
} ?: return
}
lifecycleScope.launchWhenResumed {
val exception = viewModel.authenticate(email, pass, url)
if (exception == null) navigateToRecipes()
runCatching {
viewModel.authenticate(email, pass, url)
}.onSuccess {
navigateToRecipes()
}.onFailure {
Timber.e(it, "Can't authenticate")
}
}
}

7
app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt
View File

@@ -21,11 +21,8 @@ class AuthenticationViewModel @Inject constructor(
return result
}
suspend fun authenticate(username: String, password: String, baseUrl: String): Throwable? {
suspend fun authenticate(username: String, password: String, baseUrl: String) {
Timber.v("authenticate() called with: username = $username, password = $password, baseUrl = $baseUrl")
val result = authRepo.authenticate(username, password, baseUrl)
if (result == null) Timber.d("authenticate() returns null")
else Timber.e(result, "authenticate() returns error")
return result
authRepo.authenticate(username, password, baseUrl)
}
}