Release 2.1.3

redirect URI changed
fixes #422

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 Johan von Forstner and contributors
+Copyright (c) 2020-2026 Johan von Forstner and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
         minSdk = 23
         targetSdk = 36
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 272
-        versionName = "2.1.1"
+        versionCode = 276
+        versionName = "2.1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -330,7 +330,7 @@ dependencies {
     implementation("com.github.ev-map:locale-config-x:58b036abf4")
 
     // Android Auto
-    val carAppVersion = "1.7.0"
+    val carAppVersion = "1.8.0-beta01"
     implementation("androidx.car.app:app:$carAppVersion")
     normalImplementation("androidx.car.app:app-projected:$carAppVersion")
     automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")

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

@@ -176,8 +176,7 @@ class AvailabilityRepository(context: Context) {
         teslaOwnerAvailabilityDetector,
         TeslaGuestAvailabilityDetector(okhttp),
         NobilAvailabilityDetector(okhttp, context),
-        EnBwAvailabilityDetector(okhttp),
-        NewMotionAvailabilityDetector(okhttp)
+        EnBwAvailabilityDetector(okhttp)
     )
 
     suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {

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

@@ -136,17 +136,8 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         var markers =
             api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
 
-        markers = markers.flatMap {
-            if (it.grouped) {
-                api.getMarkers(
-                    it.viewPort.lowerLeftLon,
-                    it.viewPort.upperRightLon,
-                    it.viewPort.lowerLeftLat,
-                    it.viewPort.upperRightLat
-                )
-            } else {
-                listOf(it)
-            }
+        repeat(3) {
+            markers = ungroupMarkers(markers)
         }
         if (markers.any { it.grouped }) throw AvailabilityDetectorException("markers still grouped")
 
@@ -241,6 +232,20 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         )
     }
 
+    private suspend fun ungroupMarkers(markers: List<EnBwApi.EnBwLocation>): List<EnBwApi.EnBwLocation> =
+        markers.flatMap {
+            if (it.grouped) {
+                api.getMarkers(
+                    it.viewPort.lowerLeftLon,
+                    it.viewPort.upperRightLon,
+                    it.viewPort.lowerLeftLat,
+                    it.viewPort.upperRightLat
+                )
+            } else {
+                listOf(it)
+            }
+        }
+
     override fun isChargerSupported(charger: ChargeLocation): Boolean {
         val country = charger.chargepriceData?.country ?: charger.address?.country
 

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

@@ -1,231 +0,0 @@
-package net.vonforst.evmap.api.availability
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.utils.distanceBetween
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.GET
-import retrofit2.http.Path
-import java.time.ZonedDateTime
-import java.util.Locale
-
-private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 60  // max distance between reported positions in meters
-
-interface NewMotionApi {
-    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}/{zoom}")
-    suspend fun getMarkers(
-        @Path("lngMin") lngMin: Double,
-        @Path("lngMax") lngMax: Double,
-        @Path("latMin") latMin: Double,
-        @Path("latMax") latMax: Double,
-        @Path("zoom") zoom: Int = 22
-    ): List<NMMarker>
-
-    @GET("locations/{id}")
-    suspend fun getLocation(@Path("id") id: Long): NMLocation
-
-    @JsonClass(generateAdapter = true)
-    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long, val evseCount: Int)
-
-    @JsonClass(generateAdapter = true)
-    data class NMCoordinates(val latitude: Double, val longitude: Double)
-
-    @JsonClass(generateAdapter = true)
-    data class NMLocation(
-        val uid: Long,
-        val coordinates: NMCoordinates,
-        val operatorName: String,
-        val evses: List<NMEvse>
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMEvse(
-        val evseId: String?,
-        val status: String,
-        val connectors: List<NMConnector>,
-        val updated: ZonedDateTime?
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMConnector(
-        val uid: Long,
-        val connectorType: String,
-        val electricalProperties: NMElectricalProperties
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMElectricalProperties(val powerType: String, val voltage: Int, val amperage: Int, val maxElectricPower: Double?) {
-        fun getPower(): Double {
-            maxElectricPower?.let { return it }
-            val phases = when (powerType) {
-                "AC1Phase" -> 1
-                "AC3Phase" -> 3
-                else -> 1
-            }
-            val volt = when (voltage) {
-                277 -> 230
-                else -> voltage
-            }
-            val power = volt * amperage * phases
-            return when (power) {
-                3680 -> 3.7
-                11040 -> 11.0
-                22080 -> 22.0
-                43470 -> 43.0
-                else -> power / 1000.0
-            }
-        }
-    }
-
-    companion object {
-        fun create(client: OkHttpClient, baseUrl: String? = null): NewMotionApi {
-            val retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl ?: "https://ui-map.shellrecharge.com/api/map/v2/")
-                .addConverterFactory(
-                    MoshiConverterFactory.create(
-                        Moshi.Builder().add(ZonedDateTimeAdapter()).build()
-                    )
-                )
-                .client(client)
-                .build()
-            return retrofit.create(NewMotionApi::class.java)
-        }
-    }
-}
-
-internal class ZonedDateTimeAdapter {
-    @FromJson
-    fun fromJson(value: String): ZonedDateTime? = ZonedDateTime.parse(value)
-
-    @ToJson
-    fun toJson(value: ZonedDateTime): String = value.toString()
-}
-
-data class NmStatus(
-    val conn: NewMotionApi.NMConnector,
-    val status: String,
-    val evseId: String?,
-    val updated: ZonedDateTime?
-)
-
-class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
-    BaseAvailabilityDetector(client) {
-    val api = NewMotionApi.create(client, baseUrl)
-
-    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
-        val lat = location.coordinates.lat
-        val lng = location.coordinates.lng
-
-        // find nearest station to this position
-        var markers =
-            api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
-        val nearest = markers.minByOrNull { marker ->
-            distanceBetween(marker.coordinates.latitude, marker.coordinates.longitude, lat, lng)
-        } ?: throw AvailabilityDetectorException("no candidates found.")
-
-        if (distanceBetween(
-                nearest.coordinates.latitude,
-                nearest.coordinates.longitude,
-                lat,
-                lng
-            ) > radius
-        ) {
-            throw AvailabilityDetectorException("no candidates found")
-        }
-
-        markers = if (nearest.evseCount < location.totalChargepoints) {
-            // combine related stations
-            markers.filter { marker ->
-                distanceBetween(
-                    marker.coordinates.latitude,
-                    marker.coordinates.longitude,
-                    nearest.coordinates.latitude,
-                    nearest.coordinates.longitude
-                ) < maxDistance
-            }
-        } else {
-            listOf(nearest)
-        }
-
-        // load details
-        var details = markers.map {
-            api.getLocation(it.locationUid)
-        }
-        // only include stations from same operator
-        details = details.filter {
-            it.operatorName == details[0].operatorName
-        }
-        val connectorStatus = details.flatMap { it.evses }.flatMap { evse ->
-            evse.connectors.map { connector ->
-                NmStatus(connector, evse.status, evse.evseId, evse.updated)
-            }
-        }
-
-        val nmConnectors = mutableMapOf<Long, Pair<Double, String>>()
-        val nmStatus = mutableMapOf<Long, ChargepointStatus>()
-        val nmEvseId = mutableMapOf<Long, String>()
-        val nmUpdated = mutableMapOf<Long, ZonedDateTime>()
-        connectorStatus.forEach { (connector, statusStr, evseId, updated) ->
-            val id = connector.uid
-            val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
-                "type3" -> Chargepoint.TYPE_3C
-                "type2" -> Chargepoint.TYPE_2_UNKNOWN
-                "type1" -> Chargepoint.TYPE_1
-                "domestic" -> Chargepoint.SCHUKO
-                "type1combo" -> Chargepoint.CCS_TYPE_1  // US CCS, aka type1_combo
-                "type2combo" -> Chargepoint.CCS_TYPE_2  // EU CCS, aka type2_combo
-                "tepcochademo" -> Chargepoint.CHADEMO
-                "unspecified" -> "unknown"
-                "unknown" -> "unknown"
-                "saej1772" -> "unknown"
-                else -> "unknown"
-            }
-            val status = when (statusStr) {
-                "Unavailable" -> ChargepointStatus.FAULTED
-                "Available" -> ChargepointStatus.AVAILABLE
-                "Occupied" -> ChargepointStatus.CHARGING
-                "Unspecified" -> ChargepointStatus.UNKNOWN
-                else -> ChargepointStatus.UNKNOWN
-            }
-            nmConnectors.put(id, power to type)
-            nmStatus.put(id, status)
-            evseId?.let { nmEvseId[id] = it }
-            updated?.let { nmUpdated[id] = it }
-        }
-
-        val match = matchChargepoints(nmConnectors, location.chargepointsMerged)
-        val chargepointStatus = match.mapValues { entry ->
-            entry.value.map { nmStatus[it]!! }
-        }
-        val evseIds = if (nmEvseId.size == nmStatus.size) match.mapValues { entry ->
-            entry.value.map { nmEvseId[it]!! }
-        } else null
-        val updated = match.mapValues { entry -> entry.value.map { nmUpdated[it]?.toInstant() } }
-        return ChargeLocationStatus(
-            chargepointStatus,
-            "NewMotion",
-            evseIds,
-            lastChange = updated
-        )
-    }
-
-    override fun isChargerSupported(charger: ChargeLocation): Boolean {
-        // NewMotion is our fallback
-        return when (charger.dataSource) {
-            "goingelectric" -> charger.network != "Tesla Supercharger"
-            "nobil" -> charger.network != "Tesla"
-            "openchargemap" -> charger.chargepriceData?.network !in listOf("23", "3534")
-            "openstreetmap" -> charger.operator !in listOf("Tesla, Inc.", "Tesla")
-            else -> false
-        }
-    }
-
-}

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

@@ -25,7 +25,7 @@ interface TeslaAuthenticationApi {
     class AuthCodeRequest(
         val code: String,
         @Json(name = "code_verifier") val codeVerifier: String,
-        @Json(name = "redirect_uri") val redirectUri: String = "https://auth.tesla.com/void/callback",
+        @Json(name = "redirect_uri") val redirectUri: String = "tesla://auth/callback",
         scope: String = "openid email offline_access",
         @Json(name = "client_id") clientId: String = "ownerapi"
     ) : OAuth2Request(scope, clientId)
@@ -98,13 +98,13 @@ interface TeslaAuthenticationApi {
                 .appendQueryParameter("client_id", "ownerapi")
                 .appendQueryParameter("code_challenge", codeChallenge)
                 .appendQueryParameter("code_challenge_method", "S256")
-                .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
+                .appendQueryParameter("redirect_uri", "tesla://auth/callback")
                 .appendQueryParameter("response_type", "code")
                 .appendQueryParameter("scope", "openid email offline_access phone")
                 .appendQueryParameter("is_in_app", "true")
                 .appendQueryParameter("state", "123").build()
 
-        val resultUrlPrefix = "https://auth.tesla.com/void/callback"
+        val resultUrlPrefix = "tesla://auth/callback"
     }
 }
 

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

@@ -21,6 +21,7 @@ import androidx.car.app.model.Pane
 import androidx.car.app.model.Place
 import androidx.car.app.model.PlaceMarker
 import androidx.car.app.model.Row
+import androidx.car.app.model.RowSection
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.R
@@ -54,7 +55,7 @@ class ChargerListFormatter(
     private val iconGen = ChargerIconGenerator(carContext, null, height = 96)
     var favorites: Set<Long> = emptySet()
 
-    fun buildChargerList(
+    fun buildChargerListLegacy(
         chargers: List<ChargeLocation>?,
         availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>
     ): ItemList? {
@@ -103,6 +104,55 @@ class ChargerListFormatter(
         }
     }
 
+    fun buildChargerList(
+        chargers: List<ChargeLocation>?,
+        availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>
+    ): RowSection? {
+        return if (chargers != null) {
+            val chargerList = chargers.take(screen.maxRows)
+            val builder = RowSection.Builder()
+            // only show the city if not all chargers are in the same city
+            val showCity = chargerList.map { it.address?.city }.distinct().size > 1
+            chargerList.forEach { charger ->
+                builder.addItem(
+                    formatCharger(
+                        charger,
+                        availabilities,
+                        showCity,
+                        charger.id in favorites
+                    )
+                )
+            }
+            builder.setNoItemsMessage(
+                carContext.getString(
+                    if (screen.filterStatus == FILTERS_FAVORITES) {
+                        R.string.auto_no_favorites_found
+                    } else {
+                        R.string.auto_no_chargers_found
+                    }
+                )
+            )
+            builder.setOnItemVisibilityChangedListener(screen)
+            builder.build()
+        } else {
+            if (screen.loadingError) {
+                val builder = RowSection.Builder()
+                builder.setNoItemsMessage(
+                    carContext.getString(R.string.connection_error)
+                )
+                builder.build()
+            } else if (screen.locationError) {
+                val builder = RowSection.Builder()
+                builder.setNoItemsMessage(
+                    carContext.getString(R.string.location_error)
+                )
+                builder.build()
+            } else {
+                null
+            }
+        }
+    }
+
     private fun formatCharger(
         charger: ChargeLocation,
         availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>,

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

@@ -58,7 +58,6 @@ import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
-import kotlin.collections.set
 import kotlin.math.abs
 import kotlin.math.min
 
@@ -164,7 +163,7 @@ class LegacyMapScreen(ctx: CarContext, val session: EVMapSession) :
                     setAnchor(Place.Builder(CarLocation.create(it.latitude, it.longitude)).build())
                 }
             }
-            formatter.buildChargerList(chargers, availabilities)?.let {
+            formatter.buildChargerListLegacy(chargers, availabilities)?.let {
                 setItemList(it)
             } ?: setLoading(true)
             setCurrentLocationEnabled(true)

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

@@ -21,9 +21,9 @@ import androidx.car.app.model.ActionStrip
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
 import androidx.car.app.model.Header
-import androidx.car.app.model.ListTemplate
 import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.PaneTemplate
+import androidx.car.app.model.SectionedItemTemplate
 import androidx.car.app.model.Template
 import androidx.car.app.navigation.model.MapController
 import androidx.car.app.navigation.model.MapWithContentTemplate
@@ -213,7 +213,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     }.build())
                 }.build()
         } else {
-            ListTemplate.Builder().apply {
+            SectionedItemTemplate.Builder().apply {
                 setHeader(Header.Builder().apply {
                     setTitle(title)
                     setStartHeaderAction(Action.APP_ICON)
@@ -223,8 +223,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     chargers?.filterIsInstance<ChargeLocation>(),
                     availabilities
                 )?.let {
-                    setSingleList(it)
+                    addSection(it)
                 } ?: setLoading(true)
+
+                setScrollStatePersistenceStrategy(SectionedItemTemplate.SCROLL_STATE_PRESERVE_INDEX)
             }.build()
         }
         return MapWithContentTemplate.Builder().apply {

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

@@ -29,7 +29,7 @@
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
-    <string name="copyright_summary">©2020–2024 Johan von Forstner and contributors</string>
+    <string name="copyright_summary">©2020–2026 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
     <string name="maplibre_attributionsDialogTitle">MapLibre Maps SDK for Android</string>
 </resources>

app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -1,79 +0,0 @@
-package net.vonforst.evmap.api.availability
-
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
-import net.vonforst.evmap.api.goingelectric.GoingElectricApi
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.okResponse
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.Test
-import java.net.HttpURLConnection
-
-class NewMotionAvailabilityDetectorTest {
-    val api: GoingElectricApi
-    val webServer = MockWebServer()
-    val newMotion: NewMotionAvailabilityDetector
-
-    init {
-        webServer.start()
-
-        val apikey = ""
-        val baseurl = webServer.url("/ge/").toString()
-        api = GoingElectricApi.create(apikey, baseurl)
-        newMotion = NewMotionAvailabilityDetector(
-            OkHttpClient.Builder().build(),
-            webServer.url("/nm/").toString()
-        )
-
-        webServer.dispatcher = object : Dispatcher() {
-            val notFoundResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
-
-            override fun dispatch(request: RecordedRequest): MockResponse {
-                val segments = request.requestUrl!!.pathSegments
-                val urlHead = segments.subList(0, 2).joinToString("/")
-                when (urlHead) {
-                    "ge/chargepoints" -> {
-                        val id = request.requestUrl!!.queryParameter("ge_id")
-                        return okResponse("/chargers/$id.json")
-                    }
-                    "nm/markers" -> {
-                        val urlTail = segments.subList(2, segments.size).joinToString("/")
-                        val id = when (urlTail) {
-                            "9.56608/9.576080000000001/54.5066/54.516600000000004/22" -> 2105
-                            "9.539283999999999/9.549284/54.471699/54.481699000000006/22" -> 18284
-                            else -> -1
-                        }
-                        return okResponse("/newmotion/$id/markers.json")
-                    }
-                    "nm/locations" -> {
-                        val id = segments.last()
-                        return okResponse("/newmotion/$id.json")
-                    }
-                    else -> return notFoundResponse
-                }
-            }
-        }
-    }
-
-    private fun readResource(s: String) =
-        NewMotionAvailabilityDetectorTest::class.java.getResource(s)?.readText()
-
-    @ExperimentalCoroutinesApi
-    @Test
-    fun apiTest() {
-        for (chargepoint in listOf(2105L, 18284L)) {
-            val charger = runBlocking { api.getChargepointDetail(chargepoint).body()!! }
-                .chargelocations!![0].convert("", true) as ChargeLocation
-            println(charger)
-
-            runBlocking {
-                val result = newMotion.getAvailability(charger)
-                println(result)
-            }
-        }
-    }
-}

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

@@ -0,0 +1,2 @@
+Verbesserungen:
+- Verbesserungen bei Echtzeitstatus

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

@@ -0,0 +1,3 @@
+Fehler behoben:
+- Android Auto: Scrollposition in der Liste nach Aktualisierung beibehalten
+- Tesla Login funktionierte nicht

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

@@ -0,0 +1,2 @@
+Improvements:
+- Improvements to realtime status

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

@@ -0,0 +1,3 @@
+Bugfixes:
+- Android Auto: Keep scroll position after refresh
+- Tesla login was not working