chore: 2.6.2 release

bug fix concerning attributes not taken into account in configuration file
PnX-SI · Mar 2, 2024 · 3d37cd2 · 3d37cd2
1 parent 455e18c
commit 3d37cd2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.6.2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.2) (2024-03-02, release)
+
+### 🐛 Corrections
+
+* Ignorer les attributs inconnus dans le fichier de configuration (https://github.com/PnX-SI/gn_mobile_occtax/issues/248).
+
+### ⚠️ Notes de version
+
+* Code de version : 3220
+
 ## [2.6.1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.1) (2023-05-24, release)
 
 ### 🐛 Corrections

diff --git a/occtax/build.gradle b/occtax/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "fr.geonature.occtax2"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 3210
-        versionName "2.6.1"
+        versionCode 3220
+        versionName "2.6.2"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = project.name + "-" + versionName

diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/io/OnAppSettingsJsonReaderListenerImpl.kt b/occtax/src/main/java/fr/geonature/occtax/settings/io/OnAppSettingsJsonReaderListenerImpl.kt
@@ -136,6 +136,7 @@ class OnAppSettingsJsonReaderListenerImpl :
                 "save_default_values" -> saveDefaultValues = reader.nextBooleanOrElse { false }
                 "information" -> information.addAll(readPropertySettingsAsList(reader))
                 "counting" -> counting.addAll(readPropertySettingsAsList(reader))
+                else -> reader.skipValue()
             }
         }
 

diff --git a/occtax/src/test/resources/fixtures/settings_occtax.json b/occtax/src/test/resources/fixtures/settings_occtax.json
@@ -29,6 +29,7 @@
     ]
   },
   "nomenclature": {
+    "additional_fields": true,
     "save_default_values": true,
     "information": [
       "METH_OBS",