athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Add google play version selection to settings

See merge request AuroraOSS/AuroraStore!263
This commit is contained in:
Aayush Gupta
2023-11-27 15:41:24 +00:00
parent 4ef81a04dc 511e9ce58b
commit e08ac77b36
7 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/aurora/store/util/Preferences.kt
View File

@@ -60,6 +60,8 @@ object Preferences {
const val PREFERENCE_PROXY_INFO = "PREFERENCE_PROXY_INFO"
const val PREFERENCE_PROXY_ENABLED = "PREFERENCE_PROXY_ENABLED"
const val PREFERENCE_VENDING_VERSION = "PREFERENCE_VENDING_VERSION"
const val PREFERENCE_UPDATES_EXTENDED = "PREFERENCE_UPDATES_EXTENDED"
const val PREFERENCE_UPDATES_CHECK = "PREFERENCE_UPDATES_CHECK"
const val PREFERENCE_UPDATES_CHECK_INTERVAL = "PREFERENCE_UPDATES_CHECK_INTERVAL"

2
app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt
View File

@@ -60,6 +60,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_CHECK
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_CHECK_INTERVAL
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_EXTENDED
import com.aurora.store.util.Preferences.PREFERENCE_VENDING_VERSION
import com.aurora.store.util.save
import com.google.android.material.tabs.TabLayoutMediator
@@ -174,6 +175,7 @@ class OnboardingFragment : Fragment(R.layout.fragment_onboarding) {
save(PREFERENCE_PROXY_ENABLED, false)
save(PREFERENCE_PROXY_URL, "")
save(PREFERENCE_PROXY_INFO, "{}")
save(PREFERENCE_VENDING_VERSION, 0)
/*Customization*/
save(PREFERENCE_THEME_TYPE, 0)

10
app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
View File

@@ -113,6 +113,16 @@ class NetworkPreference : PreferenceFragmentCompat() {
false
}
}
findPreference<Preference>(Preferences.PREFERENCE_VENDING_VERSION)?.let {
it.setOnPreferenceChangeListener { _, newValue ->
save(Preferences.PREFERENCE_VENDING_VERSION, Integer.parseInt(newValue.toString()))
runOnUiThread {
requireContext().toast(R.string.insecure_anonymous_apply)
}
true
}
}
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

18
app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
View File

@@ -291,6 +291,24 @@ class AuthViewModel(application: Application) : BaseAndroidViewModel(application
authData.locale = Locale.getDefault()
}
val versionId =
Preferences.getInteger(getApplication(), Preferences.PREFERENCE_VENDING_VERSION)
if (versionId != 0) {
val resources = (getApplication() as Context).resources
authData.deviceInfoProvider?.properties?.let {
it.setProperty(
"Vending.version",
resources.getStringArray(R.array.pref_vending_version_codes)[versionId]
)
it.setProperty(
"Vending.versionString",
resources.getStringArray(R.array.pref_vending_version)[versionId]
)
}
}
if (authData.authToken.isNotEmpty() && authData.deviceConfigToken.isNotEmpty()) {
configAuthPref(authData, type, true)
liveData.postValue(AuthState.SignedIn)