extend support to API 23 (#47)

* extend support to API 23 * Updated code to follow API 23 of Android limitations * Set min version to 21 Co-authored-by: Oleksandr Sarapulov <[email protected]>
eu-digital-green-certificates · Jul 27, 2021 · 10eb5a8 · 10eb5a8
1 parent 29c565f
commit 10eb5a8
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 28 deletions.
diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
@@ -23,7 +23,7 @@
 import org.gradle.api.JavaVersion
 
 object Config {
-    const val minSdk = 26
+    const val minSdk = 21
     const val compileSdk = 29
     const val targetSdk = 29
     val javaVersion = JavaVersion.VERSION_1_8

diff --git a/engine/src/main/java/dgca/verifier/app/engine/DefaultAffectedFieldsDataRetriever.kt b/engine/src/main/java/dgca/verifier/app/engine/DefaultAffectedFieldsDataRetriever.kt
@@ -39,7 +39,9 @@ class DefaultAffectedFieldsDataRetriever(
         certificateType: CertificateType
     ): String {
         var affectedFields = StringBuilder()
-        rule.affectedString.forEach { affectedFiledString ->
+
+        for (i in rule.affectedString.indices) {
+            val affectedFiledString = rule.affectedString[i]
             val description: String? = try {
                 val res = evaluate(
                     objectMapper.readTree(

diff --git a/engine/src/main/java/dgca/verifier/app/engine/data/source/remote/rules/RuleRemoteMapper.kt b/engine/src/main/java/dgca/verifier/app/engine/data/source/remote/rules/RuleRemoteMapper.kt
@@ -22,9 +22,9 @@
 
 package dgca.verifier.app.engine.data.source.remote.rules
 
-import dgca.verifier.app.engine.data.RuleCertificateType
 import dgca.verifier.app.engine.data.Description
 import dgca.verifier.app.engine.data.Rule
+import dgca.verifier.app.engine.data.RuleCertificateType
 import dgca.verifier.app.engine.data.Type
 import java.util.*
 
@@ -68,8 +68,9 @@ fun RuleRemote.toRule(): Rule = Rule(
 
 fun List<RuleRemote>.toRules(): List<Rule> {
     val rules = mutableListOf<Rule>()
-    forEach {
-        rules.add(it.toRule())
+    for (i in this.indices) {
+        val ruleRemote = this[i]
+        rules.add(ruleRemote.toRule())
     }
     return rules
 }
@@ -81,8 +82,9 @@ fun DescriptionRemote.toDescriptions(): Description = Description(
 
 fun List<DescriptionRemote>.toDescriptions(): Map<String, String> {
     val descriptions = mutableMapOf<String, String>()
-    forEach {
-        descriptions[it.lang.toLowerCase(Locale.ROOT)] = it.desc
+    for (i in this.indices) {
+        val descriptionRemote = this[i]
+        descriptions[descriptionRemote.lang.toLowerCase(Locale.ROOT)] = descriptionRemote.desc
     }
     return descriptions
 }
diff --git a/...c/main/java/dgca/verifier/app/engine/data/source/remote/valuesets/ValueSetRemoteMapper.kt b/...c/main/java/dgca/verifier/app/engine/data/source/remote/valuesets/ValueSetRemoteMapper.kt
@@ -22,8 +22,7 @@
 
 package dgca.verifier.app.engine.data.source.remote.valuesets
 
-import dgca.verifier.app.engine.data.*
-import java.util.*
+import dgca.verifier.app.engine.data.ValueSet
 
 /*-
  * ---license-start
@@ -54,8 +53,9 @@ fun ValueSetRemote.toValueSet(): ValueSet = ValueSet(
 
 fun List<ValueSetRemote>.toValueSets(): List<ValueSet> {
     val valueSets = mutableListOf<ValueSet>()
-    forEach {
-        valueSets.add(it.toValueSet())
+    for (i in this.indices) {
+        val valueSetRemote = this[i]
+        valueSets.add(valueSetRemote.toValueSet())
     }
     return valueSets
 }
diff --git a/...rc/main/java/dgca/verifier/app/engine/data/source/valuesets/DefaultValueSetsRepository.kt b/...rc/main/java/dgca/verifier/app/engine/data/source/valuesets/DefaultValueSetsRepository.kt
@@ -57,9 +57,10 @@ class DefaultValueSetsRepository(
         val valueSetsRemote = mutableListOf<ValueSetRemote>()
         val valueSetsIdentifiersRemote = remoteDataSource.getValueSetsIdentifiers(url)
 
-        valueSetsIdentifiersRemote.forEach {
+        for (i in valueSetsIdentifiersRemote.indices) {
+            val ruleIdentifierRemote = valueSetsIdentifiersRemote[i]
             val valueSetRemote =
-                remoteDataSource.getValueSet("$url/${it.hash}")
+                remoteDataSource.getValueSet("$url/${ruleIdentifierRemote.hash}")
             if (valueSetRemote != null) {
                 valueSetsRemote.add(valueSetRemote)
             }

diff --git a/engine/src/main/java/dgca/verifier/app/engine/domain/rules/DefaultGetRulesUseCase.kt b/engine/src/main/java/dgca/verifier/app/engine/domain/rules/DefaultGetRulesUseCase.kt
@@ -22,7 +22,6 @@
 
 package dgca.verifier.app.engine.domain.rules
 
-import dgca.verifier.app.engine.UTC_ZONE_ID
 import dgca.verifier.app.engine.data.CertificateType
 import dgca.verifier.app.engine.data.Rule
 import dgca.verifier.app.engine.data.Type
@@ -58,32 +57,42 @@ class DefaultGetRulesUseCase(private val rulesRepository: RulesRepository) : Get
         certificateType: CertificateType,
         region: String?
     ): List<Rule> {
-        val acceptanceRules = mutableMapOf<String, Rule>()
+        val filteredAcceptanceRules = mutableMapOf<String, Rule>()
         val selectedRegion: String = region?.trim() ?: ""
-        rulesRepository.getRulesBy(
-            acceptanceCountryIsoCode, validationClock, Type.ACCEPTANCE, certificateType.toRuleCertificateType()
-        ).forEach {
-            val ruleRegion: String = it.region?.trim() ?: ""
+        val acceptanceRules = rulesRepository.getRulesBy(
+            acceptanceCountryIsoCode,
+            validationClock,
+            Type.ACCEPTANCE,
+            certificateType.toRuleCertificateType()
+        )
+        for (i in acceptanceRules.indices) {
+            val rule = acceptanceRules[i]
+            val ruleRegion: String = rule.region?.trim() ?: ""
             if (selectedRegion.equals(
                     ruleRegion,
                     ignoreCase = true
-                ) && (acceptanceRules[it.identifier]?.version?.toVersion() ?: -1 < it.version.toVersion() ?: 0)
+                ) && (filteredAcceptanceRules[rule.identifier]?.version?.toVersion() ?: -1 < rule.version.toVersion() ?: 0)
             ) {
-                acceptanceRules[it.identifier] = it
+                filteredAcceptanceRules[rule.identifier] = rule
             }
         }
 
-        val invalidationRules = mutableMapOf<String, Rule>()
+        val filteredInvalidationRules = mutableMapOf<String, Rule>()
         if (issuanceCountryIsoCode.isNotBlank()) {
-            rulesRepository.getRulesBy(
-                issuanceCountryIsoCode, validationClock, Type.INVALIDATION, certificateType.toRuleCertificateType()
-            ).forEach {
-                if (invalidationRules[it.identifier]?.version?.toVersion() ?: -1 < it.version.toVersion() ?: 0) {
-                    invalidationRules[it.identifier] = it
+            val invalidationRules = rulesRepository.getRulesBy(
+                issuanceCountryIsoCode,
+                validationClock,
+                Type.INVALIDATION,
+                certificateType.toRuleCertificateType()
+            )
+            for (i in invalidationRules.indices) {
+                val rule = invalidationRules[i]
+                if (filteredInvalidationRules[rule.identifier]?.version?.toVersion() ?: -1 < rule.version.toVersion() ?: 0) {
+                    filteredInvalidationRules[rule.identifier] = rule
                 }
             }
         }
-        return acceptanceRules.values + invalidationRules.values
+        return filteredAcceptanceRules.values + filteredInvalidationRules.values
     }
 
     private fun String.toVersion(): Int? = try {