From 511e9ce58b299bb541b5a709abe562a91c55e055 Mon Sep 17 00:00:00 2001
From: vladrevers <56305121+vladrevers@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:51:29 +0200
Subject: [PATCH] Apply suggestions and corrections from code review

---
 .../view/ui/preferences/NetworkPreference.kt  |  5 +----
 .../store/viewmodel/auth/AuthViewModel.kt     | 21 ++++++++++++-------
 app/src/main/res/values-ru/strings.xml        |  2 --
 app/src/main/res/values-uk/strings.xml        |  2 --
 app/src/main/res/xml/preferences_network.xml  |  2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
index 991aa0be8..49d000c81 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
@@ -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 {
diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
index 807287972..30ead8e3f 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
@@ -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()) {
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fd0142bd3..a1a408170 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -274,8 +274,6 @@
     <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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 66540040a..7f188f4f1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -274,8 +274,6 @@
     <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>
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
index 0eae5f86c..7ff1c92dc 100644
--- a/app/src/main/res/xml/preferences_network.xml
+++ b/app/src/main/res/xml/preferences_network.xml
@@ -56,4 +56,4 @@
         app:key="PREFERENCE_VENDING_VERSION"
         app:title="@string/pref_vending_version_title"
         app:useSimpleSummaryProvider="true" />
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>