Release 1.6.6

.github/workflows/release.yml

@@ -82,6 +82,6 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fossAutomotive/release/app-google-automotive-release.apk
+          asset_path: app/build/outputs/apk/fossAutomotive/release/app-foss-automotive-release.apk
           asset_name: app-foss-automotive-release.apk
           asset_content_type: application/vnd.android.package-archive

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 190
-        versionName "1.6.5"
+        versionCode 192
+        versionName "1.6.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs supportedLocales.split(',')
@@ -186,7 +186,7 @@ dependencies {
     implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
     implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
     implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
-    implementation 'io.coil-kt:coil:1.1.0'
+    implementation 'io.coil-kt:coil:2.4.0'
     implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"

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

@@ -105,16 +105,18 @@ 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)
+        while (markers.any { it.grouped }) {
+            markers = markers.flatMap {
+                if (it.grouped) {
+                    api.getMarkers(
+                        it.viewPort.lowerLeftLon,
+                        it.viewPort.upperRightLon,
+                        it.viewPort.lowerLeftLat,
+                        it.viewPort.upperRightLat
+                    )
+                } else {
+                    listOf(it)
+                }
             }
         }
 
@@ -149,9 +151,9 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             markers = listOf(nearest)
         }
 
-        val details = markers.map {
+        val details = markers.mapNotNull { it.stationId }.map {
             // load details
-            api.getLocation(it.stationId!!)
+            api.getLocation(it)
         }
 
         val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->

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

@@ -151,8 +151,9 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
             legendPaint.textAlign = Paint.Align.CENTER
 
             data.entries.forEachIndexed { i, (t, v) ->
+                val divisor = maxValue.toFloat().takeIf { it > 0f } ?: 1f
                 val height =
-                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / maxValue.toFloat()
+                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / divisor
                 val left = graphBounds.left + (barWidth + barMargin) * i
 
                 if (left + barWidth > graphBounds.right) return@forEachIndexed

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

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

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

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