From c81adb4a9bd413260b2c7aac590c7dee4b427168 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 12 Jun 2021 15:37:04 +0200
Subject: [PATCH 1/5] chore: upgrade kotlin and gradle

---
 .idea/compiler.xml                       |  2 +-
 .idea/jarRepositories.xml                |  5 +++++
 .idea/misc.xml                           |  2 +-
 .idea/runConfigurations.xml              |  1 +
 build.gradle                             | 11 +++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130c..fb7f4a8a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd8..e34606cc 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a623051b..38e6a07d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,5 +5,5 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d..e497da99 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/build.gradle b/build.gradle
index 8cc327f6..78dd4fe4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.5.10'
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.1"
-        // NOTE: Do not place your application dependencies here; they belong
+        // NOTE: Do not place any application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
@@ -23,8 +23,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
 
     apply plugin: "org.jlleitschuh.gradle.ktlint"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 192acd47..7388ce16 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

From bdf5c82085270cf174de136b7b98b33c41baa3f5 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 12 Jun 2021 15:37:26 +0200
Subject: [PATCH 2/5] chore: IDE global settings

---
 .idea/codeStyles/Project.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2990c816..43602fdf 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -23,15 +23,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="true" />
@@ -170,6 +161,7 @@
       <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
       <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
       <option name="ASSIGNMENT_WRAP" value="0" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="2" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />

From 3f76ef12a702c4175047bc1415c0d005807797f4 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 12 Jun 2021 15:39:58 +0200
Subject: [PATCH 3/5] chore: upgrade libraries dependencies

---
 commons/build.gradle                          |  8 ++--
 .../commons/data/DefaultNomenclature.kt       | 44 +++++++------------
 .../fr/geonature/commons/data/Nomenclature.kt | 44 +++++++------------
 .../fr/geonature/commons/data/Taxonomy.kt     |  3 +-
 .../geonature/commons/input/InputManager.kt   |  2 -
 commons/version.properties                    |  4 +-
 mountpoint/build.gradle                       |  4 +-
 mountpoint/src/main/AndroidManifest.xml       |  4 +-
 mountpoint/version.properties                 |  4 +-
 sync/build.gradle                             |  8 ++--
 viewpager/build.gradle                        |  6 +--
 viewpager/version.properties                  |  4 +-
 12 files changed, 55 insertions(+), 80 deletions(-)

diff --git a/commons/build.gradle b/commons/build.gradle
index 81d93a23..b7a31fe3 100644
--- a/commons/build.gradle
+++ b/commons/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-version = "0.8.3"
+version = "0.8.4"
 
 android {
     compileSdkVersion 29
@@ -46,16 +46,16 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
 
-    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
-    api 'androidx.room:room-runtime:2.2.6'
+    api 'androidx.room:room-runtime:2.3.0'
 
     testImplementation 'androidx.arch.core:core-testing:2.1.0'
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.0.0'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 }
\ No newline at end of file
diff --git a/commons/src/main/java/fr/geonature/commons/data/DefaultNomenclature.kt b/commons/src/main/java/fr/geonature/commons/data/DefaultNomenclature.kt
index 7182e152..8bb3f538 100644
--- a/commons/src/main/java/fr/geonature/commons/data/DefaultNomenclature.kt
+++ b/commons/src/main/java/fr/geonature/commons/data/DefaultNomenclature.kt
@@ -18,33 +18,23 @@ import fr.geonature.commons.data.helper.get
 @Entity(
     tableName = DefaultNomenclature.TABLE_NAME,
     primaryKeys = [DefaultNomenclature.COLUMN_MODULE, DefaultNomenclature.COLUMN_NOMENCLATURE_ID],
-    foreignKeys = [
-        ForeignKey(
-            entity = Nomenclature::class,
-            parentColumns = [Nomenclature.COLUMN_ID],
-            childColumns = [DefaultNomenclature.COLUMN_NOMENCLATURE_ID],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
+    foreignKeys = [ForeignKey(
+        entity = Nomenclature::class,
+        parentColumns = [Nomenclature.COLUMN_ID],
+        childColumns = [DefaultNomenclature.COLUMN_NOMENCLATURE_ID],
+        onDelete = ForeignKey.CASCADE
+    )]
 )
-open class DefaultNomenclature : Parcelable {
-
+open class DefaultNomenclature(
     @ColumnInfo(name = COLUMN_MODULE)
-    var module: String
+    var module: String,
 
     @ColumnInfo(
         name = COLUMN_NOMENCLATURE_ID,
         index = true
     )
     var nomenclatureId: Long
-
-    constructor(
-        module: String,
-        nomenclatureId: Long
-    ) {
-        this.module = module
-        this.nomenclatureId = nomenclatureId
-    }
+) : Parcelable {
 
     internal constructor(source: Parcel) : this(
         source.readString()!!,
@@ -168,16 +158,16 @@ open class DefaultNomenclature : Parcelable {
         }
 
         @JvmField
-        val CREATOR: Parcelable.Creator<DefaultNomenclature> =
-            object : Parcelable.Creator<DefaultNomenclature> {
+        val CREATOR: Parcelable.Creator<DefaultNomenclature> = object :
+            Parcelable.Creator<DefaultNomenclature> {
 
-                override fun createFromParcel(source: Parcel): DefaultNomenclature {
-                    return DefaultNomenclature(source)
-                }
+            override fun createFromParcel(source: Parcel): DefaultNomenclature {
+                return DefaultNomenclature(source)
+            }
 
-                override fun newArray(size: Int): Array<DefaultNomenclature?> {
-                    return arrayOfNulls(size)
-                }
+            override fun newArray(size: Int): Array<DefaultNomenclature?> {
+                return arrayOfNulls(size)
             }
+        }
     }
 }
diff --git a/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt b/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
index 99aaa9ec..f0f6b545 100644
--- a/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
+++ b/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
@@ -18,47 +18,35 @@ import fr.geonature.commons.data.helper.get
  *
  * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
  */
-@Entity(tableName = Nomenclature.TABLE_NAME)
-open class Nomenclature : Parcelable {
-
+@Entity(
+    tableName = Nomenclature.TABLE_NAME,
+    foreignKeys = [ForeignKey(
+        entity = NomenclatureType::class,
+        parentColumns = [NomenclatureType.COLUMN_ID],
+        childColumns = [Nomenclature.COLUMN_TYPE_ID],
+        onDelete = CASCADE
+    )]
+)
+open class Nomenclature(
     /**
      * The unique ID of this nomenclature.
      */
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = COLUMN_ID)
-    var id: Long
+    var id: Long,
 
     @ColumnInfo(name = COLUMN_CODE)
-    var code: String
+    var code: String,
 
     @ColumnInfo(name = COLUMN_HIERARCHY)
-    var hierarchy: String
-
+    var hierarchy: String,
+    
     @ColumnInfo(name = COLUMN_DEFAULT_LABEL)
-    var defaultLabel: String
+    var defaultLabel: String,
 
-    @ForeignKey(
-        entity = NomenclatureType::class,
-        parentColumns = [NomenclatureType.COLUMN_ID],
-        childColumns = [COLUMN_TYPE_ID],
-        onDelete = CASCADE
-    )
     @ColumnInfo(name = COLUMN_TYPE_ID)
     var typeId: Long
-
-    constructor(
-        id: Long,
-        code: String,
-        hierarchy: String,
-        defaultLabel: String,
-        typeId: Long
-    ) {
-        this.id = id
-        this.code = code
-        this.hierarchy = hierarchy
-        this.defaultLabel = defaultLabel
-        this.typeId = typeId
-    }
+) : Parcelable {
 
     internal constructor(source: Parcel) : this(
         source.readLong(),
diff --git a/commons/src/main/java/fr/geonature/commons/data/Taxonomy.kt b/commons/src/main/java/fr/geonature/commons/data/Taxonomy.kt
index 96a2e989..d399e4ce 100644
--- a/commons/src/main/java/fr/geonature/commons/data/Taxonomy.kt
+++ b/commons/src/main/java/fr/geonature/commons/data/Taxonomy.kt
@@ -101,7 +101,8 @@ class Taxonomy : Parcelable {
                     "autre",
                     "all"
                 ).any {
-                    value.toLowerCase(Locale.ROOT)
+                    value
+                        .lowercase(Locale.ROOT)
                         .startsWith(it)
                 }
             ) ANY
diff --git a/commons/src/main/java/fr/geonature/commons/input/InputManager.kt b/commons/src/main/java/fr/geonature/commons/input/InputManager.kt
index 80739c6b..f410fc9a 100644
--- a/commons/src/main/java/fr/geonature/commons/input/InputManager.kt
+++ b/commons/src/main/java/fr/geonature/commons/input/InputManager.kt
@@ -14,7 +14,6 @@ import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileWriter
-import java.io.IOException
 
 /**
  * Manage [AbstractInput]:
@@ -204,7 +203,6 @@ class InputManager<I : AbstractInput> private constructor(
         return "${KEY_PREFERENCE_INPUT}_$id"
     }
 
-    @Throws(IOException::class)
     private suspend fun getInputExportFile(input: AbstractInput): File = withContext(IO) {
         val inputDir = FileUtils.getInputsFolder(application)
         inputDir.mkdirs()
diff --git a/commons/version.properties b/commons/version.properties
index ab311b02..0595f464 100644
--- a/commons/version.properties
+++ b/commons/version.properties
@@ -1,2 +1,2 @@
-#Sun May 23 16:23:47 CEST 2021
-VERSION_CODE=2855
+#Sat Jun 12 15:17:29 CEST 2021
+VERSION_CODE=2890
diff --git a/mountpoint/build.gradle b/mountpoint/build.gradle
index 268d12c5..87d279b9 100644
--- a/mountpoint/build.gradle
+++ b/mountpoint/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-version = "0.0.7"
+version = "0.0.8"
 
 android {
     compileSdkVersion 29
@@ -46,5 +46,5 @@ dependencies {
 
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 }
diff --git a/mountpoint/src/main/AndroidManifest.xml b/mountpoint/src/main/AndroidManifest.xml
index c246b467..51167781 100644
--- a/mountpoint/src/main/AndroidManifest.xml
+++ b/mountpoint/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="fr.geonature.mountpoint" />
+<manifest package="fr.geonature.mountpoint" />
diff --git a/mountpoint/version.properties b/mountpoint/version.properties
index 9e1fdf29..4a039a8a 100644
--- a/mountpoint/version.properties
+++ b/mountpoint/version.properties
@@ -1,2 +1,2 @@
-#Sun Mar 28 16:43:24 CEST 2021
-VERSION_CODE=300
+#Sat Jun 12 15:17:29 CEST 2021
+VERSION_CODE=370
diff --git a/sync/build.gradle b/sync/build.gradle
index 28180ef3..c05da255 100644
--- a/sync/build.gradle
+++ b/sync/build.gradle
@@ -72,18 +72,18 @@ dependencies {
 
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.work:work-runtime-ktx:2.5.0'
-    implementation 'com.google.android.material:material:1.4.0-alpha02'
+    implementation 'com.google.android.material:material:1.4.0-rc01'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
     implementation 'com.squareup.retrofit2:retrofit:2.6.0'
 
-    kapt 'androidx.room:room-compiler:2.2.6'
+    kapt 'androidx.room:room-compiler:2.3.0'
 
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.0.0'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 }
diff --git a/viewpager/build.gradle b/viewpager/build.gradle
index 04ea000f..1c8294e5 100644
--- a/viewpager/build.gradle
+++ b/viewpager/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-version = "0.2.0"
+version = "0.2.1"
 
 android {
     compileSdkVersion 29
@@ -44,11 +44,11 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
 
-    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 }
diff --git a/viewpager/version.properties b/viewpager/version.properties
index 8536f794..164a6a00 100644
--- a/viewpager/version.properties
+++ b/viewpager/version.properties
@@ -1,2 +1,2 @@
-#Sun Mar 28 16:44:53 CEST 2021
-VERSION_CODE=1100
+#Sat Jun 12 15:17:30 CEST 2021
+VERSION_CODE=1170

From 91ece9a36b9ca6f0832516289ac38fa329cdf69f Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 12 Jun 2021 15:45:49 +0200
Subject: [PATCH 4/5] fix: remove obsolete and unnecessary attribute parameter
 'page_max_retry'

see: https://github.com/PnX-SI/gn_mobile_occtax/issues/52
---
 docs/settings.adoc                            | 10 ++-------
 docs/sync.adoc                                |  4 ++--
 sync/README.md                                |  6 ++---
 .../fr/geonature/sync/data/LocalDatabase.kt   |  2 +-
 .../fr/geonature/sync/settings/AppSettings.kt |  6 +----
 .../io/OnAppSettingsJsonReaderListenerImpl.kt |  1 -
 .../geonature/sync/sync/DataSyncViewModel.kt  |  6 ++---
 .../geonature/sync/sync/PackageInfoManager.kt |  5 +++--
 .../sync/sync/io/DatasetJsonReader.kt         |  2 +-
 .../sync/sync/worker/DataSyncWorker.kt        | 22 ++++---------------
 .../fr/geonature/sync/util/TimeUnitHelper.kt  |  4 ++--
 ...OnAppSettingsJsonReaderListenerImplTest.kt |  3 +--
 .../resources/fixtures/settings_sync.json     |  3 +--
 13 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/docs/settings.adoc b/docs/settings.adoc
index eb4cdca6..dd54cfbe 100644
--- a/docs/settings.adoc
+++ b/docs/settings.adoc
@@ -11,8 +11,7 @@
   "observers_list_id": 1,
   "taxa_list_id": 100,
   "code_area_type": "M1",
-  "page_size": 1000,
-  "page_max_retry": 100
+  "page_size": 1000
 }
 ----
 
@@ -53,10 +52,5 @@
 | `page_size`
 | &#9744;
 | Default page size while fetching paginated values
-| 1000
-
-| `page_max_retry`
-| &#9744;
-| Max attempt to fetch data according to given page size
-| 20
+| 10000
 |===
diff --git a/docs/sync.adoc b/docs/sync.adoc
index 7ff94455..86fd481c 100644
--- a/docs/sync.adoc
+++ b/docs/sync.adoc
@@ -122,7 +122,7 @@ group Fetch GeoNature data
     end
 
     group Taxa
-        loop while response is not empty\nand response size matches ""page_size"" from settings\nand loop doesn't exceed ""page_max_retry"" from settings
+        loop while response is not empty\nand response size matches ""page_size"" from settings
             sync -> gn ++ : **GET** ""/api/taxref/allnamebylist/:taxa_list_id""
             note right of sync
                 ""taxa_list_id"" from settings
@@ -142,7 +142,7 @@ group Fetch GeoNature data
             end note
             sync -> sync : update //taxa// table
         end
-        loop while response is not empty\nand response size matches ""page_size"" from settings\nand loop doesn't exceed ""page_max_retry"" from settings
+        loop while response is not empty\nand response size matches ""page_size"" from settings
             sync -> gn ++ : **GET** ""/api/synthese/color_taxon?:code_area_type""
              note right of sync
                 ""code_area_type"" from settings
diff --git a/sync/README.md b/sync/README.md
index e0946329..3dac9950 100644
--- a/sync/README.md
+++ b/sync/README.md
@@ -31,8 +31,7 @@ Example:
   "observers_list_id": 1,
   "taxa_list_id": 100,
   "code_area_type": "M1",
-  "page_size": 1000,
-  "page_max_retry": 100
+  "page_size": 10000
 }
 ```
 
@@ -46,8 +45,7 @@ Example:
 | `observers_list_id`               | &#9744; | GeoNature selected observer list ID in UsersHub        |               |
 | `taxa_list_id`                    | &#9744; | GeoNature selected taxa list ID                        |               |
 | `code_area_type`                  | &#9744; | GeoNature selected area type                           |               |
-| `page_size`                       | &#9744; | Default page size while fetching paginated values      | 1000          |
-| `page_max_retry`                  | &#9744; | Max attempt to fetch data according to given page size | 20            |
+| `page_size`                       | &#9744; | Default page size while fetching paginated values      | 10000         |
 | `sync_periodicity_data_essential` | &#9744; | Configure essential data synchronization periodicity   |               |
 | `sync_periodicity_data`           | &#9744; | Configure all data synchronization periodicity         |               |
 
diff --git a/sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt b/sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt
index af06e788..9afbd9dd 100644
--- a/sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt
+++ b/sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt
@@ -48,7 +48,7 @@ import kotlinx.coroutines.withContext
         NomenclatureTaxonomy::class,
         DefaultNomenclature::class
     ],
-    version = 17,
+    version = 18,
     exportSchema = false
 )
 abstract class LocalDatabase : RoomDatabase() {
diff --git a/sync/src/main/java/fr/geonature/sync/settings/AppSettings.kt b/sync/src/main/java/fr/geonature/sync/settings/AppSettings.kt
index 5e2c8bb4..e539a8b6 100644
--- a/sync/src/main/java/fr/geonature/sync/settings/AppSettings.kt
+++ b/sync/src/main/java/fr/geonature/sync/settings/AppSettings.kt
@@ -17,7 +17,6 @@ data class AppSettings(
     var taxrefListId: Int = 0,
     var codeAreaType: String? = null,
     var pageSize: Int = DEFAULT_PAGE_SIZE,
-    var pageMaxRetry: Int = DEFAULT_PAGE_MAX_RETRY,
     var essentialDataSyncPeriodicity: String? = null,
     var dataSyncPeriodicity: String? = null
 ) : IAppSettings {
@@ -30,7 +29,6 @@ data class AppSettings(
         source.readInt(),
         source.readString(),
         source.readInt(),
-        source.readInt(),
         source.readString(),
         source.readString()
     )
@@ -51,15 +49,13 @@ data class AppSettings(
             it.writeInt(taxrefListId)
             it.writeString(codeAreaType)
             it.writeInt(pageSize)
-            it.writeInt(pageMaxRetry)
             it.writeString(essentialDataSyncPeriodicity)
             it.writeString(dataSyncPeriodicity)
         }
     }
 
     companion object {
-        const val DEFAULT_PAGE_SIZE = 1000
-        const val DEFAULT_PAGE_MAX_RETRY = 20
+        const val DEFAULT_PAGE_SIZE = 10000
 
         @JvmField
         val CREATOR: Parcelable.Creator<AppSettings> = object : Parcelable.Creator<AppSettings> {
diff --git a/sync/src/main/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImpl.kt b/sync/src/main/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImpl.kt
index f11cbf37..dac751e8 100644
--- a/sync/src/main/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImpl.kt
+++ b/sync/src/main/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImpl.kt
@@ -30,7 +30,6 @@ class OnAppSettingsJsonReaderListenerImpl :
             "taxa_list_id" -> appSettings.taxrefListId = reader.nextInt()
             "code_area_type" -> appSettings.codeAreaType = reader.nextString()
             "page_size" -> appSettings.pageSize = reader.nextInt()
-            "page_max_retry" -> appSettings.pageMaxRetry = reader.nextInt()
             "sync_periodicity_data_essential" -> appSettings.essentialDataSyncPeriodicity = reader.nextStringOrNull()
             "sync_periodicity_data" -> appSettings.dataSyncPeriodicity = reader.nextStringOrNull()
             else -> reader.skipValue()
diff --git a/sync/src/main/java/fr/geonature/sync/sync/DataSyncViewModel.kt b/sync/src/main/java/fr/geonature/sync/sync/DataSyncViewModel.kt
index f067b483..1d96d5d9 100644
--- a/sync/src/main/java/fr/geonature/sync/sync/DataSyncViewModel.kt
+++ b/sync/src/main/java/fr/geonature/sync/sync/DataSyncViewModel.kt
@@ -234,7 +234,7 @@ class DataSyncViewModel(application: Application) : AndroidViewModel(application
         )
 
         val request = PeriodicWorkRequestBuilder<DataSyncWorker>(
-            repeatInterval.inSeconds.toLong(),
+            repeatInterval.inWholeSeconds,
             TimeUnit.SECONDS
         )
             .addTag(DataSyncWorker.DATA_SYNC_WORKER_TAG)
@@ -245,12 +245,12 @@ class DataSyncViewModel(application: Application) : AndroidViewModel(application
                     .build()
             )
             .setInitialDelay(
-                (if (withAdditionalData) DEFAULT_MIN_DURATION else (repeatInterval / 2).coerceAtLeast(30.toDuration(DurationUnit.MINUTES))).inSeconds.toLong(),
+                (if (withAdditionalData) DEFAULT_MIN_DURATION else (repeatInterval / 2).coerceAtLeast(30.toDuration(DurationUnit.MINUTES))).inWholeSeconds,
                 TimeUnit.SECONDS
             )
             .setBackoffCriteria(
                 BackoffPolicy.LINEAR,
-                (if (withAdditionalData) 1 else 2).toDuration(DurationUnit.MINUTES).inSeconds.toLong(),
+                (if (withAdditionalData) 1 else 2).toDuration(DurationUnit.MINUTES).inWholeSeconds,
                 TimeUnit.SECONDS
             )
             .setInputData(
diff --git a/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt b/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt
index f8f2196f..fdf19e02 100644
--- a/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt
+++ b/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import retrofit2.awaitResponse
+import java.util.Locale
 
 /**
  * [PackageInfo] manager.
@@ -71,8 +72,8 @@ class PackageInfoManager private constructor(private val applicationContext: Con
                     PackageInfo(
                         it.packageName,
                         it.code
-                            .toLowerCase()
-                            .capitalize(),
+                            .lowercase(Locale.ROOT)
+                            .replaceFirstChar { c -> if (c.isLowerCase()) c.titlecase(Locale.ROOT) else c.toString() },
                         it.versionCode.toLong(),
                         0,
                         null,
diff --git a/sync/src/main/java/fr/geonature/sync/sync/io/DatasetJsonReader.kt b/sync/src/main/java/fr/geonature/sync/sync/io/DatasetJsonReader.kt
index ac80587e..396b0d6f 100644
--- a/sync/src/main/java/fr/geonature/sync/sync/io/DatasetJsonReader.kt
+++ b/sync/src/main/java/fr/geonature/sync/sync/io/DatasetJsonReader.kt
@@ -158,7 +158,7 @@ class DatasetJsonReader {
             when (reader.nextName()) {
                 "module_path" -> module = reader
                     .nextString()
-                    .toLowerCase(Locale.ROOT)
+                    .lowercase(Locale.ROOT)
                 else -> reader.skipValue()
             }
         }
diff --git a/sync/src/main/java/fr/geonature/sync/sync/worker/DataSyncWorker.kt b/sync/src/main/java/fr/geonature/sync/sync/worker/DataSyncWorker.kt
index 9fb80be8..59bc037f 100644
--- a/sync/src/main/java/fr/geonature/sync/sync/worker/DataSyncWorker.kt
+++ b/sync/src/main/java/fr/geonature/sync/sync/worker/DataSyncWorker.kt
@@ -185,10 +185,6 @@ class DataSyncWorker(
                 INPUT_PAGE_SIZE,
                 AppSettings.DEFAULT_PAGE_SIZE
             ),
-            inputData.getInt(
-                INPUT_PAGE_MAX_RETRY,
-                AppSettings.DEFAULT_PAGE_MAX_RETRY
-            ),
             inputData.getBoolean(
                 INPUT_WITH_ADDITIONAL_DATA,
                 true
@@ -758,7 +754,6 @@ class DataSyncWorker(
         listId: Int,
         codeAreaType: String?,
         pageSize: Int,
-        pageMaxRetry: Int,
         withAdditionalData: Boolean = true
     ): Result {
         Log.i(
@@ -811,7 +806,7 @@ class DataSyncWorker(
                             .toRegex()
                             .find(taxRef.description)?.groupValues
                             ?.elementAtOrNull(1)
-                            ?.let { "${it.toUpperCase(Locale.ROOT)} - ${taxRef.id}" })
+                            ?.let { "${it.uppercase(Locale.ROOT)} - ${taxRef.id}" })
                 }
                 .onEach {
                     validTaxaIds.add(it.id)
@@ -848,12 +843,8 @@ class DataSyncWorker(
                 )
             )
 
-            if (taxa.size == pageSize) {
-                offset += pageSize
-                hasNext = offset / pageSize < pageMaxRetry
-            } else {
-                hasNext = false
-            }
+            offset += pageSize
+            hasNext = taxref.size == pageSize
         } while (hasNext)
 
         // delete orphaned taxa
@@ -976,7 +967,7 @@ class DataSyncWorker(
                 )
 
                 offset += pageSize
-                hasNext = offset / pageSize < pageMaxRetry
+                hasNext = taxrefAreas.size == pageSize
             } while (hasNext)
         }
 
@@ -1090,7 +1081,6 @@ class DataSyncWorker(
         private const val INPUT_TAXREF_LIST_ID = "taxrefListId"
         private const val INPUT_CODE_AREA_TYPE = "codeAreaType"
         private const val INPUT_PAGE_SIZE = "pageSize"
-        private const val INPUT_PAGE_MAX_RETRY = "pageMaxRetry"
         private const val INPUT_WITH_ADDITIONAL_DATA = "withAdditionalData"
 
         /**
@@ -1120,10 +1110,6 @@ class DataSyncWorker(
                             INPUT_PAGE_SIZE,
                             appSettings.pageSize
                         ),
-                        Pair(
-                            INPUT_PAGE_MAX_RETRY,
-                            appSettings.pageMaxRetry
-                        ),
                         Pair(
                             INPUT_WITH_ADDITIONAL_DATA,
                             withAdditionalData
diff --git a/sync/src/main/java/fr/geonature/sync/util/TimeUnitHelper.kt b/sync/src/main/java/fr/geonature/sync/util/TimeUnitHelper.kt
index d54c6d19..0f7e7a09 100644
--- a/sync/src/main/java/fr/geonature/sync/util/TimeUnitHelper.kt
+++ b/sync/src/main/java/fr/geonature/sync/util/TimeUnitHelper.kt
@@ -14,8 +14,8 @@ import kotlin.time.toDuration
 
 @ExperimentalTime
 fun String.parseAsDuration(): Duration {
-    return Regex("(\\d+)([s|m|h|d])")
-        .findAll(toLowerCase(Locale.ROOT))
+    return Regex("(\\d+)([smhd])")
+        .findAll(lowercase(Locale.ROOT))
         .map { it.destructured.toList() }
         .map {
             Pair(
diff --git a/sync/src/test/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImplTest.kt b/sync/src/test/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImplTest.kt
index 058d13be..7c951600 100644
--- a/sync/src/test/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImplTest.kt
+++ b/sync/src/test/java/fr/geonature/sync/settings/io/OnAppSettingsJsonReaderListenerImplTest.kt
@@ -47,8 +47,7 @@ class OnAppSettingsJsonReaderListenerImplTest {
                 1,
                 100,
                 "M1",
-                100,
-                5
+                100
             ),
             appSettings
         )
diff --git a/sync/src/test/resources/fixtures/settings_sync.json b/sync/src/test/resources/fixtures/settings_sync.json
index af8c372a..21d5bbff 100644
--- a/sync/src/test/resources/fixtures/settings_sync.json
+++ b/sync/src/test/resources/fixtures/settings_sync.json
@@ -5,6 +5,5 @@
   "observers_list_id": 1,
   "taxa_list_id": 100,
   "code_area_type": "M1",
-  "page_size": 100,
-  "page_max_retry": 5
+  "page_size": 100
 }
\ No newline at end of file

From 716dc175736785a46fcced2d259d9d8cb2273ed4 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 12 Jun 2021 16:38:17 +0200
Subject: [PATCH 5/5] chore: 1.2.0 release

---
 .../src/main/java/fr/geonature/commons/data/Nomenclature.kt   | 2 +-
 sync/build.gradle                                             | 2 +-
 sync/version.properties                                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt b/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
index f0f6b545..63d33b61 100644
--- a/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
+++ b/commons/src/main/java/fr/geonature/commons/data/Nomenclature.kt
@@ -44,7 +44,7 @@ open class Nomenclature(
     @ColumnInfo(name = COLUMN_DEFAULT_LABEL)
     var defaultLabel: String,
 
-    @ColumnInfo(name = COLUMN_TYPE_ID)
+    @ColumnInfo(name = COLUMN_TYPE_ID, index = true)
     var typeId: Long
 ) : Parcelable {
 
diff --git a/sync/build.gradle b/sync/build.gradle
index c05da255..fd556714 100644
--- a/sync/build.gradle
+++ b/sync/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: "kotlin-kapt"
 
-version = "1.1.9"
+version = "1.2.0"
 
 android {
     compileSdkVersion 29
diff --git a/sync/version.properties b/sync/version.properties
index 8f0a2949..ea04ddd2 100644
--- a/sync/version.properties
+++ b/sync/version.properties
@@ -1,2 +1,2 @@
-#Mon May 24 15:03:05 CEST 2021
-VERSION_CODE=2910
+#Sat Jun 12 16:36:37 CEST 2021
+VERSION_CODE=2950