Release 1.6.3

Currently translated at 100.0% (313 of 313 strings)

Co-authored-by: Celso Azevedo <mail@celsoazevedo.com>
Translate-URL: https://hosted.weblate.org/projects/evmap/android/pt/
Translation: EVMap/Android

app/build.gradle

@@ -21,8 +21,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 184
-        versionName "1.6.2"
+        versionCode 186
+        versionName "1.6.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs supportedLocales.split(',')

app/src/main/java/net/vonforst/evmap/api/availability/TeslaAvailabilityDetector.kt

@@ -281,7 +281,7 @@ interface TeslaGraphQlApi {
         val siteDynamic: SiteDynamic,
         val siteStatic: SiteStatic,
         val pricing: Pricing,
-        val congestionPriceHistogram: CongestionPriceHistogram,
+        val congestionPriceHistogram: CongestionPriceHistogram?,
     )
 
     @JsonClass(generateAdapter = true)
@@ -574,12 +574,13 @@ class TeslaAvailabilityDetector(
             i += connector.count
         }
 
-        val indexOfMidnight =
-            details.congestionPriceHistogram.dataAttributes.indexOfFirst { it.label == "12AM" }
-        val congestionHistogram = indexOfMidnight.takeIf { it >= 0 }?.let { index ->
-            val data = details.congestionPriceHistogram.data.toMutableList()
-            Collections.rotate(data, -index)
-            data
+        val congestionHistogram = details.congestionPriceHistogram?.let { cph ->
+            val indexOfMidnight = cph.dataAttributes.indexOfFirst { it.label == "12AM" }
+            indexOfMidnight.takeIf { it >= 0 }?.let { index ->
+                val data = cph.data.toMutableList()
+                Collections.rotate(data, -index)
+                data
+            }
         }
 
         return ChargeLocationStatus(

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -324,6 +324,8 @@ class GoingElectricApiWrapper(
         val freeparking = filters?.getBooleanValue("freeparking")
         val open247 = filters?.getBooleanValue("open_247")
         val barrierfree = filters?.getBooleanValue("barrierfree")
+        val networks = filters?.getMultipleChoiceValue("networks")
+        val chargecards = filters?.getMultipleChoiceValue("chargecards")
 
         return chargers.filter { it ->
             // apply filters which GoingElectric does not support natively
@@ -356,7 +358,13 @@ class GoingElectricApiWrapper(
                             ?: GEOpeningHours(twentyfourSeven = true)
                     )
                 }
-                if (barrierfree == true) {
+                if (barrierfree == true
+                    && (networks == null || networks.all || it.network !in networks.values)
+                    && (chargecards == null || chargecards.all)
+                ) {
+                    /* barrierfree, networks and chargecards are combined with OR - so we can only
+                    * be sure that the charger is barrierFree if the other filters are not active
+                    * or the charger does not match the other filters */
                     inferred = inferred.copy(barrierFree = true)
                 }
                 inferred
@@ -522,9 +530,6 @@ class GoingElectricApiWrapper(
         if (filters.getBooleanValue("open_247") == true) {
             result.append(" AND twentyfourSeven IS 1")
         }
-        if (filters.getBooleanValue("barrierfree") == true) {
-            result.append(" AND barrierFree IS 1")
-        }
         if (filters.getBooleanValue("exclude_faults") == true) {
             result.append(" AND fault_report_description IS NULL AND fault_report_created IS NULL")
         }
@@ -552,25 +557,34 @@ class GoingElectricApiWrapper(
             requiresChargepointQuery = true
         }
 
+        // networks, chargecards and barrierFree filters are combined with OR in the GE API
         val networks = filters.getMultipleChoiceValue("networks")
-        if (networks != null && !networks.all) {
-            val networksList = if (networks.values.size == 0) {
-                ""
-            } else {
-                networks.values.joinToString(",") { DatabaseUtils.sqlEscapeString(it) }
-            }
-            result.append(" AND network IN (${networksList})")
-        }
-
         val chargecards = filters.getMultipleChoiceValue("chargecards")
-        if (chargecards != null && !chargecards.all) {
-            val chargecardsList = if (chargecards.values.size == 0) {
-                ""
-            } else {
-                chargecards.values.joinToString(",")
+        val barrierFree = filters.getBooleanValue("barrierfree")
+
+        if ((networks != null && !networks.all) || barrierFree == true || (chargecards != null && !chargecards.all)) {
+            val queries = mutableListOf<String>()
+            if (networks != null && !networks.all) {
+                val networksList = if (networks.values.size == 0) {
+                    ""
+                } else {
+                    networks.values.joinToString(",") { DatabaseUtils.sqlEscapeString(it) }
+                }
+                queries.add("network IN (${networksList})")
             }
-            result.append(" AND json_extract(cc.value, '$.id') IN (${chargecardsList})")
-            requiresChargeCardQuery = true
+            if (barrierFree == true) {
+                queries.add("barrierFree IS 1")
+            }
+            if (chargecards != null && !chargecards.all) {
+                val chargecardsList = if (chargecards.values.size == 0) {
+                    ""
+                } else {
+                    chargecards.values.joinToString(",")
+                }
+                queries.add("json_extract(cc.value, '$.id') IN (${chargecardsList})")
+                requiresChargeCardQuery = true
+            }
+            result.append(" AND (${queries.joinToString(" OR ")})")
         }
 
         val categories = filters.getMultipleChoiceValue("categories")

app/src/main/res/values-pt/strings.xml

@@ -97,7 +97,7 @@
     <string name="save_as_profile">Guardar como perfil</string>
     <string name="filterprofiles_empty_state">Não existem filtros guardados</string>
     <string name="welcome_2">Cada cor corresponde a potência máxima do carregador</string>
-    <string name="welcome_to_evmap">Bem-vindo ao EVMap</string>
+    <string name="welcome_to_evmap">Bem-vindo(a) ao EVMap</string>
     <string name="pref_darkmode_always_off">Sempre desligado</string>
     <string name="welcome_2_title">Escolha a potência</string>
     <string name="navigate">Navegar</string>

fastlane/metadata/android/de-DE/changelogs/186.txt

@@ -0,0 +1,3 @@
+Fehler behoben:
+- Fehler im Caching-Algorithmus im Zusammenspiel mit bestimmten Filtern behoben
+- Abstürze behoben

fastlane/metadata/android/en-US/changelogs/186.txt

@@ -0,0 +1,3 @@
+Bugfixes:
+- Fixed error in caching algorithm when some filters are active
+- Fixed crashes