Apply suggestions and corrections from code review

This commit is contained in:
vladrevers
2023-11-27 15:51:29 +02:00
committed by vladkryv
parent 582194bb87
commit 511e9ce58b
5 changed files with 15 additions and 17 deletions

View File

@@ -114,10 +114,7 @@ class NetworkPreference : PreferenceFragmentCompat() {
}
}
val vendingVersion: Preference? =
findPreference(Preferences.PREFERENCE_VENDING_VERSION)
vendingVersion?.let {
findPreference<Preference>(Preferences.PREFERENCE_VENDING_VERSION)?.let {
it.setOnPreferenceChangeListener { _, newValue ->
save(Preferences.PREFERENCE_VENDING_VERSION, Integer.parseInt(newValue.toString()))
runOnUiThread {

View File

@@ -291,17 +291,22 @@ class AuthViewModel(application: Application) : BaseAndroidViewModel(application
authData.locale = Locale.getDefault()
}
val versionId = Preferences.getInteger(getApplication(), Preferences.PREFERENCE_VENDING_VERSION)
if(versionId > 0) {
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?.let {
it.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])
it.setProperty(
"Vending.versionString",
resources.getStringArray(R.array.pref_vending_version)[versionId]
)
}
}
if (authData.authToken.isNotEmpty() && authData.deviceConfigToken.isNotEmpty()) {