Add google play version selection to settings
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -113,6 +113,19 @@ class NetworkPreference : PreferenceFragmentCompat() {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
val vendingVersion: Preference? =
|
||||
findPreference(Preferences.PREFERENCE_VENDING_VERSION)
|
||||
|
||||
vendingVersion?.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?) {
|
||||
|
||||
@@ -291,6 +291,19 @@ 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?.setProperty(
|
||||
"Vending.version",
|
||||
resources.getStringArray(R.array.pref_vending_version_codes)[versionId])
|
||||
|
||||
authData.deviceInfoProvider?.properties?.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)
|
||||
|
||||
@@ -274,6 +274,8 @@
|
||||
<string name="account_anonymous_insecure">Анонимный (небезопасно)</string>
|
||||
<string name="installer_am_unavailable">Установите Менеджер Приложений или смените установщик.</string>
|
||||
<string name="pref_install_mode_am">Установщик МП.</string>
|
||||
<string name="pref_vending_version_title">Версия Google Play</string>
|
||||
<string name="pref_vending_version_device">По умолчанию (с конфигурации устройства)</string>
|
||||
<string name="ui_accent_1">Синий</string>
|
||||
<string name="ui_accent_2">Пурпурный</string>
|
||||
<string name="ui_accent_3">Красный</string>
|
||||
|
||||
@@ -274,6 +274,8 @@
|
||||
<string name="pref_install_mode_am">Інсталятор менеджера застосунків.</string>
|
||||
<string name="account_anonymous_insecure">Анонімно (незахищено)</string>
|
||||
<string name="installer_am_unavailable">Встановити Менеджер застосунків або змінити встановлювач.</string>
|
||||
<string name="pref_vending_version_title">Версія Google Play</string>
|
||||
<string name="pref_vending_version_device">За замовчуванням (з конфігурації пристрою)</string>
|
||||
<string name="ui_accent_1">Синій</string>
|
||||
<string name="ui_accent_4">Золотий</string>
|
||||
<string name="ui_accent_2">Пурпуровий</string>
|
||||
|
||||
@@ -224,4 +224,22 @@
|
||||
<item> > 50 M </item>
|
||||
<item> > 100 M </item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_vending_version" translatable="false">
|
||||
<item>@string/pref_vending_version_device</item>
|
||||
<item>7.9.80.Q-all [0] [PR] 159305549</item>
|
||||
<item>22.0.17-21 [0] [PR] 332555730</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_vending_version_codes" translatable="false">
|
||||
<item>-1</item>
|
||||
<item>80798000</item>
|
||||
<item>82201710</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_vending_version_values" translatable="false">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
||||
@@ -233,6 +233,8 @@
|
||||
<string name="pref_install_mode_title">"Installation method"</string>
|
||||
<string name="pref_install_profile_summary">"Select the target profile to install apps to. Only works with the root installation method"</string>
|
||||
<string name="pref_install_profile_title">"Installation profiles (Experimental)"</string>
|
||||
<string name="pref_vending_version_title">Google Play Version</string>
|
||||
<string name="pref_vending_version_device">Default (from device config)</string>
|
||||
<string name="pref_network_title">"Networking"</string>
|
||||
<string name="pref_network_proxy_title">Proxy</string>
|
||||
<string name="pref_network_proxy_enable">"Enable proxy"</string>
|
||||
|
||||
@@ -47,4 +47,13 @@
|
||||
app:key="PREFERENCE_INSECURE_ANONYMOUS"
|
||||
app:summary="@string/pref_insecure_anonymous_summary"
|
||||
app:title="@string/pref_insecure_anonymous_title" />
|
||||
|
||||
<com.aurora.store.view.custom.preference.AuroraListPreference
|
||||
app:defaultValue="0"
|
||||
app:entries="@array/pref_vending_version"
|
||||
app:entryValues="@array/pref_vending_version_values"
|
||||
app:iconSpaceReserved="false"
|
||||
app:key="PREFERENCE_VENDING_VERSION"
|
||||
app:title="@string/pref_vending_version_title"
|
||||
app:useSimpleSummaryProvider="true" />
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user