Fixed crash related to type of object accepted by an interface (eu-di…

…gital-green-certificates#148) * Fixed crash related to type of object accepted by an interface * Version update
fneur · Jul 14, 2021 · 5c3a86c · 5c3a86c
1 parent 22a91b5
commit 5c3a86c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/dgca/verifier/app/android/CodeReaderFragment.kt b/app/src/main/java/dgca/verifier/app/android/CodeReaderFragment.kt
@@ -147,7 +147,7 @@ class CodeReaderFragment : Fragment(), NavController.OnDestinationChangedListene
                 binding.countrySelector.onItemSelectedListener = object : OnItemSelectedListener {
                     override fun onItemSelected(
                         parentView: AdapterView<*>?,
-                        selectedItemView: View,
+                        selectedItemView: View?,
                         position: Int,
                         id: Long
                     ) {

diff --git a/app/src/main/java/dgca/verifier/app/android/CodeReaderViewModel.kt b/app/src/main/java/dgca/verifier/app/android/CodeReaderViewModel.kt
@@ -49,7 +49,9 @@ class CodeReaderViewModel @Inject constructor(
         }
 
         _countries.addSource(_selectedCountry) {
-            _countries.value = Pair(_countries.value?.first ?: emptyList(), it ?: "")
+            if (_countries.value?.second == null || _countries.value?.second != it) {
+                _countries.value = Pair(_countries.value?.first ?: emptyList(), it ?: "")
+            }
         }
     }
 }
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
@@ -28,8 +28,8 @@ object Config {
     const val targetSdk = 29
     val javaVersion = JavaVersion.VERSION_1_8
 
-    const val versionCode = 14
-    const val versionName = "1.1.6"
+    const val versionCode = 15
+    const val versionName = "1.1.7"
 
     const val androidTestInstrumentation = "androidx.test.runner.AndroidJUnitRunner"
     const val proguardConsumerRules = "consumer-rules.pro"