Apply suggestions and corrections from code review
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user