Release 1.6.2

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 182
-        versionName "1.6.1"
+        versionCode 184
+        versionName "1.6.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs supportedLocales.split(',')
@@ -246,10 +246,7 @@ dependencies {
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    implementation('com.github.anboralabs:spatia-room:0.2.6') {
-        exclude group: 'com.github.dalgarins', module: 'android-spatialite'
-    }
-    implementation 'com.github.ev-map:android-spatialite:654dca2365'
+    implementation 'com.github.anboralabs:spatia-room:0.2.7'
 
     // billing library
     def billing_version = "6.0.0"

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

@@ -1,6 +1,7 @@
 package net.vonforst.evmap.api.goingelectric
 
 import android.content.Context
+import android.database.DatabaseUtils
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import com.squareup.moshi.Moshi
@@ -539,7 +540,13 @@ class GoingElectricApiWrapper(
             val connectorsList = if (connectors.values.size == 0) {
                 ""
             } else {
-                "'" + connectors.values.joinToString("', '") { GEChargepoint.convertTypeFromGE(it) } + "'"
+                connectors.values.joinToString(",") {
+                    DatabaseUtils.sqlEscapeString(
+                        GEChargepoint.convertTypeFromGE(
+                            it
+                        )
+                    )
+                }
             }
             result.append(" AND json_extract(cp.value, '$.type') IN (${connectorsList})")
             requiresChargepointQuery = true
@@ -550,7 +557,7 @@ class GoingElectricApiWrapper(
             val networksList = if (networks.values.size == 0) {
                 ""
             } else {
-                "'" + networks.values.joinToString("', '") + "'"
+                networks.values.joinToString(",") { DatabaseUtils.sqlEscapeString(it) }
             }
             result.append(" AND network IN (${networksList})")
         }

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt

@@ -1,6 +1,7 @@
 package net.vonforst.evmap.api.openchargemap
 
 import android.content.Context
+import android.database.DatabaseUtils
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import com.squareup.moshi.Moshi
@@ -347,12 +348,14 @@ class OpenChargeMapApiWrapper(
             val connectorsList = if (connectors.values.size == 0) {
                 ""
             } else {
-                "'" + connectors.values.joinToString("', '") {
-                    OCMConnection.convertConnectionTypeFromOCM(
-                        it.toLong(),
-                        refData
+                connectors.values.joinToString(",") {
+                    DatabaseUtils.sqlEscapeString(
+                        OCMConnection.convertConnectionTypeFromOCM(
+                            it.toLong(),
+                            refData
+                        )
                     )
-                } + "'"
+                }
             }
             result.append(" AND json_extract(cp.value, '$.type') IN (${connectorsList})")
             requiresChargepointQuery = true
@@ -363,9 +366,9 @@ class OpenChargeMapApiWrapper(
             val networksList = if (operators.values.size == 0) {
                 ""
             } else {
-                "'" + operators.values.joinToString("', '") { opId ->
-                    refData.operators.find { it.id == opId.toLong() }?.title.orEmpty()
-                } + "'"
+                operators.values.joinToString(",") { opId ->
+                    DatabaseUtils.sqlEscapeString(refData.operators.find { it.id == opId.toLong() }?.title.orEmpty())
+                }
             }
             result.append(" AND network IN (${networksList})")
         }

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

@@ -58,7 +58,7 @@
     <string name="fault_report_date">Com problemas (atualizado: %s)</string>
     <string name="filter_chargecards">Formas de pagamento</string>
     <string name="pref_language">Língua da app</string>
-    <string name="all_selected">Todos selecionados</string>
+    <string name="all_selected">Todas selecionadas</string>
     <string name="edit">editar</string>
     <string name="pref_darkmode">Modo escuro</string>
     <string name="connection_error">Não foi possível carregar a lista de carregadores</string>
@@ -302,7 +302,7 @@
     <string name="charger_website">Website</string>
     <string name="realtime_data_login_needed">Conta Tesla necessária para informação em tempo real</string>
     <string name="charge_price_minute_format">%2$s%1$.2f/min</string>
-    <string name="pref_tesla_account_disabled">Faça o login para ver os dados em tempo real dos Superchargers da Tesla. Não é necessário possuir um veículo da Tesla</string>
+    <string name="pref_tesla_account_disabled">Faça o login para ver informação em tempo real sobre os Tesla Superchargers. Não é necessário possuir um veículo Tesla</string>
     <string name="login">Login</string>
     <string name="login_error">Falha no login</string>
     <string name="pricing_up_to">até %s</string>
@@ -324,4 +324,10 @@
     <string name="pref_map_scale_meters">metros</string>
     <string name="pref_map_scale_miles">milhas</string>
     <string name="pref_map_scale">Barra de escala do mapa</string>
+    <string name="data_retrieved_at">Informação atualizada %s</string>
+    <string name="settings_cache_count">Tamanho da cache</string>
+    <string name="settings_cache_clear">Limpar cache</string>
+    <string name="settings_cache_count_summary">%d carregadores na base de dados, %.1f MB</string>
+    <string name="settings_caching">Caching (base de dados local)</string>
+    <string name="settings_cache_clear_summary">Elimina todos os carregadores guardados na base de dados local, com a exceção dos seus favoritos</string>
 </resources>

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

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

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

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed crashes when some filters are active