[fix] Prevent mixed video lists when switching tabs quickly& Not confirming server information when updating accounts
This commit is contained in:
@@ -106,7 +106,8 @@ fun MeScreen(meScreenViewModel: MeScreenViewModel = viewModel()) {
|
||||
onClick = {
|
||||
meScreenViewModel.updateAccount(username, privateKey, context)
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
enabled = privateKey != "******"
|
||||
) {
|
||||
Text("Save")
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ class MeScreenViewModel(application: Application) : AndroidViewModel(application
|
||||
val c = certFlow.first()
|
||||
val p = privateKeyFlow.first()
|
||||
|
||||
if (u == "" || c == "" || p == "") return@launch
|
||||
if (u == "" || c == "" || p == "" || us == "") return@launch
|
||||
|
||||
try {
|
||||
ApiClient.apply(u, c)
|
||||
@@ -105,7 +105,10 @@ class MeScreenViewModel(application: Application) : AndroidViewModel(application
|
||||
val u = userNameFlow.first()
|
||||
val p = privateKeyFlow.first()
|
||||
|
||||
if (u == "" || p == "") return@launch
|
||||
val ur = urlFlow.first()
|
||||
val c = certFlow.first()
|
||||
|
||||
if (u == "" || p == "" || ur == "" || c == "") return@launch
|
||||
|
||||
try {
|
||||
MediaManager.token = AuthManager.fetchToken(
|
||||
|
||||
@@ -63,8 +63,9 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
|
||||
|
||||
suspend fun init() {
|
||||
_klasses.value = MediaManager.listVideoKlasses()
|
||||
|
||||
MediaManager.listVideos(_klasses.value.first()){
|
||||
v -> videos.add(videos.size, v)
|
||||
v -> if(0 == tabIndex.value && !videos.contains(v)) videos.add(videos.size, v)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,10 +74,11 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
|
||||
viewModelScope.launch()
|
||||
{
|
||||
_tabIndex.intValue = index;
|
||||
|
||||
videos.clear()
|
||||
MediaManager.listVideos(_klasses.value[index])
|
||||
{
|
||||
v -> videos.add(videos.size, v)
|
||||
v -> if(index == tabIndex.value) videos.add(videos.size, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user