Minecon724/vastapp
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

prefill api key on login screen

Browse source 
if set of course
This commit is contained in:
Minecon724 2024-08-08 12:06:02 +02:00
parent 8dab1d7691
commit b0d86f0a67
Signed by: Minecon724
GPG key ID: 3CCC4D267742C8E8
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/m724/vastapp/activity/login/LoginActivity.kt
View file

@ -77,17 +77,23 @@ class LoginActivity : ComponentActivity() {
val cronetEngine = CronetEngine.Builder(baseContext).build() val cronetEngine = CronetEngine.Builder(baseContext).build()
val loginViewModel = LoginViewModel(application, cronetEngine, executor) val loginViewModel = LoginViewModel(application, cronetEngine, executor)
// load api key if saved
loginViewModel.init()
// handle login errors
loginViewModel.error.observe(this) { errorMessage -> loginViewModel.error.observe(this) { errorMessage ->
if (errorMessage != null) { if (errorMessage != null) {
Toast.makeText(baseContext, errorMessage, Toast.LENGTH_SHORT).show() Toast.makeText(baseContext, errorMessage, Toast.LENGTH_SHORT).show()
} }
} }
// handle loading error
val loadingError = intent.getStringExtra("error") val loadingError = intent.getStringExtra("error")
if (loadingError != null) { if (loadingError != null) {
Toast.makeText(baseContext, loadingError, Toast.LENGTH_SHORT).show() Toast.makeText(baseContext, loadingError, Toast.LENGTH_SHORT).show()
} }
// load app if it's time
lifecycleScope.launch { // TODO I was suggested not to launch an activity from a lifecycle scope lifecycleScope.launch { // TODO I was suggested not to launch an activity from a lifecycle scope
loginViewModel.uiState.collect { state -> loginViewModel.uiState.collect { state ->
if (state is LoginUiState.Success) { if (state is LoginUiState.Success) {

5
app/src/main/java/eu/m724/vastapp/activity/login/LoginViewModel.kt
View file

@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import eu.m724.vastapp.BuildConfig
import eu.m724.vastapp.VastApplication import eu.m724.vastapp.VastApplication
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
@ -32,6 +33,10 @@ class LoginViewModel(
private val application = getApplication<VastApplication>() private val application = getApplication<VastApplication>()
fun init() {
_apiKey.value = application.loadKey() ?: BuildConfig.VASTAI_KEY
}
fun tryLogin() { fun tryLogin() {
val userDeferred = application.vastApi.getUser() val userDeferred = application.vastApi.getUser()