Release 1.9.4

may help with #351

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 222
-        versionName = "1.9.2"
+        versionCode = 226
+        versionName = "1.9.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -306,6 +306,7 @@ dependencies {
     implementation("com.google.guava:guava:29.0-android")
     implementation("com.github.pengrad:mapscaleview:1.6.0")
     implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
+    implementation("com.github.ev-map:locale-config-x:e9e56b4111")
 
     // Android Auto
     val carAppVersion = "1.4.0"
@@ -314,7 +315,7 @@ dependencies {
     automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
 
     // AnyMaps
-    val anyMapsVersion = "a5b9abca40"
+    val anyMapsVersion = "1e00650bc7"
     implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
     googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
     googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
@@ -322,6 +323,9 @@ dependencies {
         // duplicates classes from mapbox-sdk-services
         exclude("org.maplibre.gl", "android-sdk-geojson")
     }
+    implementation("org.maplibre.gl:android-sdk:10.3.2-pre2") {
+        exclude("org.maplibre.gl", "android-sdk-geojson")
+    }
 
     // Google Places
     googleImplementation("com.google.android.libraries.places:places:3.5.0")

app/src/main/java/net/vonforst/evmap/EvMapApplication.kt

@@ -3,7 +3,11 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.app.Application
 import android.os.Build
-import androidx.work.*
+import androidx.work.Configuration
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
 import net.vonforst.evmap.storage.CleanupCacheWorker
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateAppLocale
@@ -24,7 +28,7 @@ class EvMapApplication : Application(), Configuration.Provider {
 
         // Convert to new AppCompat storage for app language
         val lang = prefs.language
-        if (lang != null && lang !in listOf("", "default")) {
+        if (lang != null) {
             updateAppLocale(lang)
             prefs.language = null
         }

app/src/main/java/net/vonforst/evmap/MapsActivity.kt

@@ -136,7 +136,7 @@ class MapsActivity : AppCompatActivity(),
                         .createPendingIntent()
                 }
             } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                val id = intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
                 if (id != null) {
                     if (prefs.dataSource != "goingelectric") {
                         prefs.dataSource = "goingelectric"
@@ -157,7 +157,7 @@ class MapsActivity : AppCompatActivity(),
                 }
             } else if (intent?.scheme == "https" && intent?.data?.host in listOf("openchargemap.org", "map.openchargemap.io")) {
                 val id = when (intent.data?.host) {
-                    "openchargemap.org" -> intent.data?.pathSegments?.last()?.toLongOrNull()
+                    "openchargemap.org" -> intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
                     "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
                     else -> null
                 }

app/src/main/java/net/vonforst/evmap/Utils.kt

@@ -17,6 +17,7 @@ import android.text.SpannedString
 import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.Currency
 import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
@@ -139,4 +140,6 @@ fun PackageManager.isAppInstalled(packageName: String): Boolean {
     } catch (e: PackageManager.NameNotFoundException) {
         false
     }
-}
+}
+
+fun currencyDisplayName(code: String) = "${Currency.getInstance(code).displayName} ($code)"

app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt

@@ -9,7 +9,6 @@ import androidx.core.text.buildSpannedString
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.availability.tesla.Rates
-import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard

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

@@ -52,32 +52,31 @@ class TeslaGuestAvailabilityDetector(
 
         val (detailsA, guestPricing) = coroutineScope {
             val details = async {
-                api.getChargingSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                api.getSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
                             TeslaChargingGuestGraphQlApi.Identifier(
                                 TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId
+                                    trtId, TeslaChargingGuestGraphQlApi.Experience.ADHOC
                                 )
                             ),
-                            TeslaChargingGuestGraphQlApi.Experience.ADHOC
                         )
                     )
-                ).data.site ?: throw AvailabilityDetectorException("no candidates found.")
+                ).data.chargingNetwork?.site
+                    ?: throw AvailabilityDetectorException("no candidates found.")
             }
             val guestPricing = async {
-                api.getChargingSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                api.getSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
                             TeslaChargingGuestGraphQlApi.Identifier(
                                 TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId
+                                    trtId, TeslaChargingGuestGraphQlApi.Experience.GUEST
                                 )
                             ),
-                            TeslaChargingGuestGraphQlApi.Experience.GUEST
                         )
                     )
-                ).data.site?.pricing
+                ).data.chargingNetwork?.site?.pricing
             }
             details to guestPricing
         }
@@ -103,12 +102,9 @@ class TeslaGuestAvailabilityDetector(
             "charger has unknown connectors"
         )
 
-        val chargerDetails = details.chargersAvailable.chargerDetails
-        val chargers = details.chargers.associateBy { it.id }
-        var detailsSorted = chargerDetails
-            .sortedBy { chargers[it.id]?.labelLetter }
-            .sortedBy { chargers[it.id]?.labelNumber }
-
+        var detailsSorted = details.chargerList
+            .sortedBy { c -> c.labelLetter }
+            .sortedBy { c -> c.labelNumber }
 
         if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
             // apparently some connectors are missing in Tesla data
@@ -120,7 +116,7 @@ class TeslaGuestAvailabilityDetector(
                     detailsSorted + List(numMissing) {
                         TeslaChargingGuestGraphQlApi.ChargerDetail(
                             ChargerAvailability.UNKNOWN,
-                            ""
+                            "", ""
                         )
                     }
             } else {
@@ -151,7 +147,7 @@ class TeslaGuestAvailabilityDetector(
         }
 
         val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
-        val labelsMap = detailsMap.mapValues { it.value.map { chargers[it.id]?.label } }
+        val labelsMap = detailsMap.mapValues { it.value.map { it.label } }
 
         val pricing = details.pricing.copy(memberRates = guestPricing.await()?.userRates)
 

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

@@ -1,12 +1,8 @@
 package net.vonforst.evmap.api.availability.tesla
 
 import com.squareup.moshi.Json
-import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
 import okhttp3.CacheControl
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -15,7 +11,6 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
-import java.lang.reflect.Type
 import java.util.concurrent.TimeUnit
 
 interface TeslaCuaApi {
@@ -71,24 +66,22 @@ interface TeslaCuaApi {
 
 interface TeslaChargingGuestGraphQlApi {
     @POST("graphql")
-    suspend fun getChargingSiteDetails(
-        @Body request: GetChargingSiteDetailsRequest,
-        @Query("operationName") operationName: String = "getGuestChargingSiteDetails"
+    suspend fun getSiteDetails(
+        @Body request: GetSiteDetailsRequest,
+        @Query("operationName") operationName: String = "GetSiteDetails"
     ): GetChargingSiteDetailsResponse
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsRequest(
-        override val variables: GetChargingSiteInformationVariables,
-        override val operationName: String = "getGuestChargingSiteDetails",
+    data class GetSiteDetailsRequest(
+        override val variables: GetSiteDetailsVariables,
+        override val operationName: String = "GetSiteDetails",
         override val query: String =
-            "\n    query getGuestChargingSiteDetails(\$identifier: ChargingSiteIdentifierInput!, \$deviceLocale: String!, \$experience: ChargingExperienceEnum!) {\n  site(\n    identifier: \$identifier\n    deviceLocale: \$deviceLocale\n    experience: \$experience\n  ) {\n    activeOutages\n    address {\n      countryCode\n    }\n    chargers {\n      id\n      label\n    }\n    chargersAvailable {\n      chargerDetails {\n        id\n        availability\n      }\n    }\n    holdAmount {\n      holdAmount\n      currencyCode\n    }\n    maxPowerKw\n    name\n    programType\n    publicStallCount\n    id\n    pricing(experience: \$experience) {\n      userRates {\n        activePricebook {\n          charging {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          parking {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          congestion {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    "
+            "\n    query GetSiteDetails(\$siteId: SiteIdInput!) {\n  chargingNetwork {\n    site(siteId: \$siteId) {\n      address {\n        countryCode\n      }\n      chargerList {\n        id\n        label\n        availability\n      }\n      holdAmount {\n        amount\n        currencyCode\n      }\n      maxPowerKw\n      name\n      programType\n      publicStallCount\n      trtId\n      pricing {\n        userRates {\n          activePricebook {\n            charging {\n              ...ChargingRate\n            }\n            parking {\n              ...ChargingRate\n            }\n            congestion {\n              ...ChargingRate\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    \n    fragment ChargingRate on ChargingUserRate {\n  uom\n  rates\n  buckets {\n    start\n    end\n  }\n  bucketUom\n  currencyCode\n  programType\n  vehicleMakeType\n  touRates {\n    enabled\n    activeRatesByTime {\n      startTime\n      endTime\n      rates\n    }\n  }\n}\n    "
     ) : GraphQlRequest()
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteInformationVariables(
-        val identifier: Identifier,
-        val experience: Experience,
-        val deviceLocale: String = "de-DE",
+    data class GetSiteDetailsVariables(
+        val siteId: Identifier,
     )
 
     enum class Experience {
@@ -97,22 +90,22 @@ interface TeslaChargingGuestGraphQlApi {
 
     @JsonClass(generateAdapter = true)
     data class Identifier(
-        val siteId: ChargingSiteIdentifier
+        val byTrtId: ChargingSiteIdentifier
     )
 
     @JsonClass(generateAdapter = true)
     data class ChargingSiteIdentifier(
-        val id: Long,
-        val siteType: SiteType = SiteType.SUPERCHARGER
+        val trtId: Long,
+        val chargingExperience: Experience,
+        val programType: String = "PTSCH",
+        val locale: String = "de-DE",
     )
 
-    enum class SiteType {
-        @Json(name = "SITE_TYPE_SUPERCHARGER")
-        SUPERCHARGER
-    }
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseDataNetwork)
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseData)
+    data class GetChargingSiteDetailsResponseDataNetwork(val chargingNetwork: GetChargingSiteDetailsResponseData?)
 
     @JsonClass(generateAdapter = true)
     data class GetChargingSiteDetailsResponseData(val site: ChargingSiteInformation?)
@@ -120,9 +113,8 @@ interface TeslaChargingGuestGraphQlApi {
     @JsonClass(generateAdapter = true)
     data class ChargingSiteInformation(
         val activeOutages: List<Outage>?,
-        val chargers: List<ChargerId>,
-        val chargersAvailable: ChargersAvailable,
-        val id: Long,
+        val chargerList: List<ChargerDetail>,
+        val trtId: Long,
         val maxPowerKw: Int,
         val name: String,
         val pricing: Pricing,
@@ -130,9 +122,10 @@ interface TeslaChargingGuestGraphQlApi {
     )
 
     @JsonClass(generateAdapter = true)
-    data class ChargerId(
-        val id: String,
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
         val label: String?,
+        val id: String
     ) {
         val labelNumber
             get() = label?.replace(Regex("""\D"""), "")?.toInt()
@@ -140,15 +133,6 @@ interface TeslaChargingGuestGraphQlApi {
             get() = label?.replace(Regex("""\d"""), "")
     }
 
-    @JsonClass(generateAdapter = true)
-    data class ChargersAvailable(val chargerDetails: List<ChargerDetail>)
-
-    @JsonClass(generateAdapter = true)
-    data class ChargerDetail(
-        val availability: ChargerAvailability,
-        val id: String
-    )
-
     companion object {
         fun create(
             client: OkHttpClient,

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

@@ -452,7 +452,10 @@ class GoingElectricApiWrapper(
                     if (responses.map { it.isSuccessful }.all { it }
                         && plugsResponse.body()!!.status == STATUS_OK
                         && chargeCardsResponse.body()!!.status == STATUS_OK
-                        && networksResponse.body()!!.status == STATUS_OK) {
+                        && networksResponse.body()!!.status == STATUS_OK
+                        && plugsResponse.body()!!.result != null
+                        && chargeCardsResponse.body()!!.result != null
+                        && networksResponse.body()!!.result != null) {
                         Resource.success(
                             GEReferenceData(
                                 plugsResponse.body()!!.result!!,

app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt

@@ -13,6 +13,7 @@ import android.text.SpannableStringBuilder
 import android.text.Spanned
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
+import androidx.car.app.HostException
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.Action
@@ -551,8 +552,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
             )
         try {
             carContext.startCarApp(intent)
-        } catch (e: UnsupportedOperationException) {
+        } catch (e: HostException) {
             CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
+        } catch (ignored: SecurityException) {
+
         }
     }
 

app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt

@@ -43,6 +43,7 @@ import net.vonforst.evmap.api.availability.tesla.TeslaOwnerApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
+import net.vonforst.evmap.currencyDisplayName
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.getPackageInfoCompat
@@ -486,10 +487,9 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_currency))
 
-                    val names =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
                     val values =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
+                    val names = values.map(::currencyDisplayName)
                     val index = values.indexOf(prefs.chargepriceCurrency)
                     addText(if (index >= 0) names[index] else "")
 
@@ -629,8 +629,8 @@ class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<Strin
     override fun getLabel(it: Pair<String, String>): String = it.first
 
     override suspend fun loadData(): List<Pair<String, String>> {
-        val names = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
-        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
+        val names = values.map(::currencyDisplayName)
         return names.zip(values)
     }
 }

app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt

@@ -8,7 +8,9 @@ import android.text.style.RelativeSizeSpan
 import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.preference.CheckBoxPreference
+import androidx.preference.ListPreference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.currencyDisplayName
 import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -73,6 +75,11 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
             }
         }
         updateNativeIntegrationState()
+
+        val currencyPreference = findPreference<ListPreference>("chargeprice_currency")!!
+        currencyPreference.entries = currencyPreference.entryValues.map {
+            currencyDisplayName(it.toString()).replaceFirstChar { it.uppercase() }
+        }.toTypedArray()
     }
 
     private fun updateNativeIntegrationState() {

app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt

@@ -9,9 +9,11 @@ import android.provider.Settings
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
+import com.github.erfansn.localeconfigx.configuredLocales
 import net.vonforst.evmap.R
 import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
+import net.vonforst.evmap.ui.map
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 
@@ -23,11 +25,7 @@ class UiSettingsFragment : BaseSettingsFragment() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_ui, rootKey)
 
-        langPref = findPreference("language")!!
-        langPref.setOnPreferenceChangeListener { _, newValue ->
-            updateAppLocale(newValue as String)
-            true
-        }
+        setupLangPref()
 
         val appLinkPref = findPreference<Preference>("applink_associate")!!
         appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
@@ -36,6 +34,31 @@ class UiSettingsFragment : BaseSettingsFragment() {
         immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
+    private fun setupLangPref() {
+        langPref = findPreference("language")!!
+        val configuredLocales = requireContext().configuredLocales
+        val numLocalesByLang = configuredLocales.map { it.language }.groupingBy { it }.eachCount()
+
+        val localeNames = configuredLocales.map {
+            val name = if (numLocalesByLang[it.language]!! > 1) {
+                it.getDisplayName(it)
+            } else {
+                it.getDisplayLanguage(it)
+            }
+            name.replaceFirstChar { c -> c.uppercase(it) }
+        }
+        val localeTags = configuredLocales.map { it.toLanguageTag() }
+
+        langPref.entries =
+            (listOf(getString(R.string.pref_language_device_default)) + localeNames).toTypedArray()
+        langPref.entryValues =
+            (listOf("default") + localeTags).toTypedArray()
+        langPref.setOnPreferenceChangeListener { _, newValue ->
+            updateAppLocale(newValue as String)
+            true
+        }
+    }
+
     private fun isGoogleMapsInstalled() =
         requireContext().packageManager.isAppInstalled("com.google.android.apps.maps")
 

app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt

@@ -3,8 +3,9 @@ package net.vonforst.evmap.ui
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import net.vonforst.evmap.R
+import com.github.erfansn.localeconfigx.configuredLocales
 import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.Locale
 
 
 fun updateNightMode(prefs: PreferenceDataSource) {
@@ -33,8 +34,11 @@ fun getAppLocale(context: Context): String? {
         "default"
     } else {
         val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
-        val choices =
-            context.resources.getStringArray(R.array.pref_language_values).joinToString(",")
-        LocaleListCompat.forLanguageTags(choices).getFirstMatch(arr)?.toLanguageTag()
+        val choices = context.configuredLocales
+        choices.getFirstMatch(arr)?.toLanguageTag()
     }
 }
+
+inline fun <R> LocaleListCompat.map(transform: (Locale) -> R): List<R> = List(size()) {
+    transform(get(it)!!)
+}

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

@@ -199,8 +199,6 @@
     <string name="autocomplete_connection_error">Nepodařilo se načíst návrhy</string>
     <string name="pref_language_device_default">Podle zařízení</string>
     <string name="pref_darkmode_device_default">Podle zařízení</string>
-    <string name="pref_chargeprice_currency_sek">Švédská koruna (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Americký dolar (USD)</string>
     <string name="pref_provider_google_maps">Mapy Google</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Přispěvatelé</string>
@@ -351,16 +349,6 @@
     <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
     <string name="pref_darkmode_always_on">vždy zapnut</string>
     <string name="pref_darkmode_always_off">vždy vypnut</string>
-    <string name="pref_chargeprice_currency_chf">Švýcarský frank (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Česká koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Dánská koruna (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Britská libra (GBP)</string>
-    <string name="pref_chargeprice_currency_huf">Maďarský forint (HUF)</string>
-    <string name="pref_chargeprice_currency_hrk">Chorvatská kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_isk">Islandská koruna (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norská koruna (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polský zlotý (PLN)</string>
     <string name="chargeprice_header_other_tariffs">Ostatní plány</string>
     <string name="charger_website">Webové stránky</string>
     <string name="compass">Kompas</string>

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

@@ -258,18 +258,6 @@
     <string name="pref_darkmode_device_default">Geräteeinstellung verwenden</string>
     <string name="pref_darkmode_always_on">immer an</string>
     <string name="pref_darkmode_always_off">immer aus</string>
-    <string name="pref_chargeprice_currency_chf">Schweizer Franken (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tschechische Krone (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Dänische Krone (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Britisches Pfund (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Ungarischer Forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Isländische Krone (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norwegische Krone (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polnischer Złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>

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

@@ -128,9 +128,6 @@
     <string name="pref_darkmode_device_default">Utiliser le réglage de l\'appareil</string>
     <string name="pref_darkmode_always_on">toujours allumé</string>
     <string name="pref_darkmode_always_off">toujours éteint</string>
-    <string name="pref_chargeprice_currency_czk">Couronne tchèque (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Couronne danoise (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
     <string name="show_more">plus…</string>
     <string name="fav_remove">Retirer des favoris</string>
     <string name="amenities">Commodités</string>
@@ -230,9 +227,6 @@
         <item quantity="other">(seront mis en évidence dans la comparaison des prix)</item>
     </plurals>
     <string name="deleted_recent_search_results">Les résultats de recherche récents ont été supprimés</string>
-    <string name="pref_chargeprice_currency_gbp">Livre sterling (GBP)</string>
-    <string name="pref_chargeprice_currency_isk">Couronne islandaise (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Couronne norvégienne (NOK)</string>
     <string name="settings_charger_data">Stations de recharge</string>
     <string name="got_it">J\'ai compris</string>
     <string name="powered_by_mapbox">propulsé par Mapbox</string>
@@ -246,15 +240,9 @@
     <string name="settings_data_sources">Sources de données</string>
     <string name="data_sources_description">Veuillez choisir une source de données pour les stations de recharge. Vous pourrez la modifier ultérieurement dans les paramètres de l\'application.</string>
     <string name="pref_search_provider_info">Les données pour la recherche de lieux, en particulier celles de Google Maps, sont relativement coûteuses à récupérer. Veuillez envisager de faire un don via \"À propos\" -&gt; \"Faire un don\".</string>
-    <string name="pref_chargeprice_currency_hrk">Kuna croate (HRK)</string>
     <string name="help">Aide</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary">Autoriser la charge en courant alternatif monophasé de plus de 4,5 kW</string>
-    <string name="pref_chargeprice_currency_huf">Forint hongrois (HUF)</string>
-    <string name="pref_chargeprice_currency_pln">Złoty polonais (PLN)</string>
     <string name="pref_map_rotate_gestures_on">Utilisez deux doigts pour faire pivoter la carte</string>
-    <string name="pref_chargeprice_currency_chf">Franc suisse (CHF)</string>
-    <string name="pref_chargeprice_currency_usd">Dollar américain (USD)</string>
-    <string name="pref_chargeprice_currency_sek">Couronne suédoise (SEK)</string>
     <string name="cost_detail_charging"><b>Recharge %s</b></string>
     <string name="cost_detail_parking"><b>Stationnement %s</b></string>
     <string name="navigate">Naviguer vers</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -84,10 +84,6 @@
     <string name="got_it">Skjønner</string>
     <string name="settings_data_sources">Datakilder</string>
     <string name="pref_search_delete_recent">Slett nylige søkeresultater</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_nok">Norske kroner (NOK)</string>
-    <string name="pref_chargeprice_currency_gbp">Britiske pund (GBP)</string>
-    <string name="pref_chargeprice_currency_sek">Svenske kroner (SEK)</string>
     <string name="realtime_data_loading">Sjekker sanntidsstatus …</string>
     <string name="realtime_data_source">Kilde for sanntidsstatus (beta): %s</string>
     <string name="realtime_data_unavailable">Sanntidsstatus utilgjengelig</string>
@@ -183,16 +179,9 @@
     <string name="deleted_recent_search_results">Nylige søkeresultater slettet</string>
     <string name="autocomplete_connection_error">Kunne ikke laste inn forslag</string>
     <string name="pref_language_device_default">Enhetsforvalg</string>
-    <string name="pref_chargeprice_currency_chf">Sveitserfranc (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tsjekkiske kroner (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Danske kroner (DKK)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatiske kroner (HRK)</string>
     <string name="pref_map_rotate_gestures_on">Bruk to fingre for å rotere kartet</string>
     <string name="pref_map_rotate_gestures_off">Rotasjon avslått (nord er alltid oppover)</string>
     <string name="refresh_live_data">oppdater sanntidsstatus</string>
-    <string name="pref_chargeprice_currency_isk">Islandske kroner (ISK)</string>
-    <string name="pref_chargeprice_currency_pln">Polske zloty (PLN)</string>
-    <string name="pref_chargeprice_currency_usd">Amerikanske dollar (USD)</string>
     <string name="filters_deactivated">Filtre deaktivert</string>
     <string name="pref_navigate_use_maps_off">Navigasjonsknapp åpner kartprogrammet med laderposisjon</string>
     <string name="show_more">flere …</string>
@@ -217,7 +206,6 @@
     <string name="filter_exclude_faults">Utelat ladere med rapporterte feil</string>
     <string name="plug_cee_blau">CEE blå</string>
     <string name="filter_open_247">Døgnåpent</string>
-    <string name="pref_chargeprice_currency_huf">Ungarske forint (HUF)</string>
     <string name="donation_dialog_detail">EVMap er fri programvare. Kodebidrag mottas med takk. Overvei å gi din støtte gjennom GitHub-sponsorer for å dekke løpende utgifter.</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary">Tillat enfaselading over 4.5 kW</string>
     <string name="connectors">Tilkobling</string>

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

@@ -5,7 +5,6 @@
     <string name="pref_search_provider_info">Gegevens opzoeken is duur, vooral via Google Maps. Overweeg aub om een donatie te doen via “Over” -&gt; “Doneer”.</string>
     <string name="data_source_openchargemap_desc">Werelddekkend, met variabele kwaliteit. Beschrijving in Engels of lokale taal. Onderhouden door de gebruikers. Ook open overheidswege eens in sommige landen (bv. Noord-Amerika, UK, Frankrijk, Noorwegen).</string>
     <string name="pref_darkmode_always_off">altijd uit</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
     <string name="chargeprice_select_car_first">Kiest eerst je voertuig model in de instellingen</string>
     <string name="chargeprice_no_compatible_connectors">Geen compatibele connectoren aan dit laadstation</string>
     <string name="license">Licentie</string>
@@ -228,17 +227,6 @@
     <string name="pref_language_device_default">Standaardtaal van toestel</string>
     <string name="pref_darkmode_device_default">Standaardinstelling van toestel</string>
     <string name="pref_darkmode_always_on">altijd aan</string>
-    <string name="pref_chargeprice_currency_chf">Zwitserse Frank (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tsjechische koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Deense kroon (DKK)</string>
-    <string name="pref_chargeprice_currency_gbp">Britse Pond (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Hongaarse Forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">IJslandse Kroon (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Noorse Kroon (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Poolse Złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Zweedse Kroon (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Amerikaanse Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="edit_filter_profile">“%s” editeren</string>
     <string name="compass">Kompas</string>

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

@@ -177,11 +177,6 @@
     <string name="pref_language_device_default">Língua do dispositivo</string>
     <string name="pref_darkmode_device_default">Padrão do dispositivo</string>
     <string name="pref_darkmode_always_on">Sempre ligado</string>
-    <string name="pref_chargeprice_currency_chf">Franco suíço (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Coroa checa (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Coroa dinamarquesa (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Libra esterlina (GBP)</string>
     <string name="chargeprice_header_my_tariffs">Os meus planos</string>
     <string name="chargeprice_header_other_tariffs">Outros planos</string>
     <string name="developer_options">Opções de desenvolvedor</string>
@@ -287,13 +282,6 @@
     <string name="welcome_1">Encontre carregadores elétricos perto de si</string>
     <string name="close">Fechar</string>
     <string name="edit_filter_profile">Editar “%s”</string>
-    <string name="pref_chargeprice_currency_hrk">Cuna croata (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Florim húngaro (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Coroa islandesa (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Coroa norueguesa (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Złoty polaco (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Coroa sueca (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Dólar americano (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Contribuidores</string>

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

@@ -259,18 +259,6 @@
     <string name="pref_darkmode_device_default">Implicit dispozitiv</string>
     <string name="pref_darkmode_always_on">permanent</string>
     <string name="pref_darkmode_always_off">dezactivat</string>
-    <string name="pref_chargeprice_currency_chf">Franci elvetieni (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Coroane cehe (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Coroane daneze (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Lire sterline (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Forinti maghiari (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Coroane islandeze (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Coroane norvegiene (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Zloti polonezi (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Coroane suedeze (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Dolari americani (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Contribuitori</string>

app/src/main/res/values/arrays.xml

@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_language_names">
-        <item>@string/pref_language_device_default</item>
-        <item>@string/pref_language_en</item>
-        <item>@string/pref_language_de</item>
-        <item>@string/pref_language_cs</item>
-        <item>@string/pref_language_fr</item>
-        <item>@string/pref_language_nb_rNO</item>
-        <item>@string/pref_language_nl</item>
-        <item>@string/pref_language_pt</item>
-        <item>@string/pref_language_ro</item>
-    </string-array>
-    <string-array name="pref_language_values" translatable="false">
-        <item>default</item>
-        <item>en</item>
-        <item>de</item>
-        <item>cs</item>
-        <item>fr</item>
-        <item>nb-NO</item>
-        <item>nl</item>
-        <item>pt</item>
-        <item>ro</item>
-    </string-array>
     <string-array name="pref_darkmode_names">
         <item>@string/pref_darkmode_device_default</item>
         <item>@string/pref_darkmode_always_on</item>
@@ -32,21 +10,7 @@
         <item>on</item>
         <item>off</item>
     </string-array>
-    <string-array name="pref_chargeprice_currency_names">
-        <item>@string/pref_chargeprice_currency_chf</item>
-        <item>@string/pref_chargeprice_currency_czk</item>
-        <item>@string/pref_chargeprice_currency_dkk</item>
-        <item>@string/pref_chargeprice_currency_eur</item>
-        <item>@string/pref_chargeprice_currency_gbp</item>
-        <item>@string/pref_chargeprice_currency_hrk</item>
-        <item>@string/pref_chargeprice_currency_huf</item>
-        <item>@string/pref_chargeprice_currency_isk</item>
-        <item>@string/pref_chargeprice_currency_nok</item>
-        <item>@string/pref_chargeprice_currency_pln</item>
-        <item>@string/pref_chargeprice_currency_sek</item>
-        <item>@string/pref_chargeprice_currency_usd</item>
-    </string-array>
-    <string-array name="pref_chargeprice_currency_values" translatable="false">
+    <string-array name="pref_chargeprice_currencies" translatable="false">
         <item>CHF</item>
         <item>CZK</item>
         <item>DKK</item>

app/src/main/res/values/donottranslate.xml

@@ -10,14 +10,6 @@
     <string name="chargeprice_api_url">https://api.chargeprice.app/v1/</string>
     <string name="fronyx_url">https://fronyx.io/</string>
     <string name="website_url">https://ev-map.app</string>
-    <string name="pref_language_en">English</string>
-    <string name="pref_language_de">Deutsch</string>
-    <string name="pref_language_fr">Français</string>
-    <string name="pref_language_nb_rNO">Norsk Bokmål</string>
-    <string name="pref_language_nl">Nederlands</string>
-    <string name="pref_language_pt">Português</string>
-    <string name="pref_language_ro">Romana</string>
-    <string name="pref_language_cs">Czech</string>
     <string name="about_contributors_list">
         Danilo Bargen\n
         Altonss\n

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

@@ -258,18 +258,6 @@
     <string name="pref_darkmode_device_default">Device default</string>
     <string name="pref_darkmode_always_on">always on</string>
     <string name="pref_darkmode_always_off">always off</string>
-    <string name="pref_chargeprice_currency_chf">Swiss franc (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Czech koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Danish krone (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Pound sterling (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Hungarian forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Icelandic króna (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norwegian krone (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polish złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>

app/src/main/res/xml/settings_chargeprice.xml

@@ -18,8 +18,7 @@
     <ListPreference
         android:key="chargeprice_currency"
         android:title="@string/pref_chargeprice_currency"
-        android:entries="@array/pref_chargeprice_currency_names"
-        android:entryValues="@array/pref_chargeprice_currency_values"
+        android:entryValues="@array/pref_chargeprice_currencies"
         android:defaultValue="EUR"
         app:useSimpleSummaryProvider="true" />
     <CheckBoxPreference

app/src/main/res/xml/settings_ui.xml

@@ -4,8 +4,6 @@
         android:key="language"
         android:persistent="false"
         android:title="@string/pref_language"
-        android:entries="@array/pref_language_names"
-        android:entryValues="@array/pref_language_values"
         android:defaultValue="default"
         android:summary="%s" />
     <ListPreference

build.gradle.kts

@@ -10,7 +10,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.3.2")
+        classpath("com.android.tools.build:gradle:8.4.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")

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

@@ -0,0 +1,3 @@
+Fehler behoben:
+- Probleme mit OpenStreetMap behoben
+- Abstürze behoben

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

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Abstürze behoben

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

@@ -0,0 +1,3 @@
+Bugfixes:
+- Fixed problems with OpenStreetMap
+- Fixed crashes

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

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed crashes

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 06 15:33:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME