mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2024-11-10 01:01:56 +01:00
fix: always use default patch selection if customization is disabled
This commit is contained in:
parent
de6fddf405
commit
2eca45d397
1 changed files with 5 additions and 10 deletions
|
@ -1,6 +1,5 @@
|
||||||
package app.revanced.manager.ui.viewmodel
|
package app.revanced.manager.ui.viewmodel
|
||||||
|
|
||||||
import android.app.Application
|
|
||||||
import android.content.pm.PackageInfo
|
import android.content.pm.PackageInfo
|
||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import androidx.compose.runtime.MutableState
|
import androidx.compose.runtime.MutableState
|
||||||
|
@ -38,7 +37,6 @@ class SelectedAppInfoViewModel(input: Params) : ViewModel(), KoinComponent {
|
||||||
private val optionsRepository: PatchOptionsRepository = get()
|
private val optionsRepository: PatchOptionsRepository = get()
|
||||||
private val pm: PM = get()
|
private val pm: PM = get()
|
||||||
private val savedStateHandle: SavedStateHandle = get()
|
private val savedStateHandle: SavedStateHandle = get()
|
||||||
private val app: Application = get()
|
|
||||||
val prefs: PreferencesManager = get()
|
val prefs: PreferencesManager = get()
|
||||||
|
|
||||||
private val persistConfiguration = input.patches == null
|
private val persistConfiguration = input.patches == null
|
||||||
|
@ -82,20 +80,17 @@ class SelectedAppInfoViewModel(input: Params) : ViewModel(), KoinComponent {
|
||||||
private set
|
private set
|
||||||
|
|
||||||
private var selectionState by savedStateHandle.saveable {
|
private var selectionState by savedStateHandle.saveable {
|
||||||
if (input.patches != null) {
|
if (input.patches != null)
|
||||||
return@saveable mutableStateOf(SelectionState.Customized(input.patches))
|
return@saveable mutableStateOf(SelectionState.Customized(input.patches))
|
||||||
}
|
|
||||||
|
|
||||||
val selection: MutableState<SelectionState> = mutableStateOf(SelectionState.Default)
|
val selection: MutableState<SelectionState> = mutableStateOf(SelectionState.Default)
|
||||||
|
|
||||||
// Get previous selection (if present).
|
// Try to get the previous selection if customization is enabled.
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
|
if (!prefs.disableSelectionWarning.get()) return@launch
|
||||||
|
|
||||||
val previous = selectionRepository.getSelection(selectedApp.packageName)
|
val previous = selectionRepository.getSelection(selectedApp.packageName)
|
||||||
|
if (previous.values.sumOf { it.size } == 0) return@launch
|
||||||
if (previous.values.sumOf { it.size } == 0) {
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
|
|
||||||
selection.value = SelectionState.Customized(previous)
|
selection.value = SelectionState.Customized(previous)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue