build.gradle: add possibility to pass encrypted Mapbox API Key

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 60
-        versionName "1.0.0-beta02"
+        versionCode 61
+        versionName "1.0.0-beta03"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -89,6 +89,9 @@ android {
             variant.resValue "string", "google_maps_key", googleMapsKey
         }
         def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
         if (mapboxKey != null) {
             variant.resValue "string", "mapbox_key", mapboxKey
         }

app/src/google/AndroidManifest.xml

@@ -10,6 +10,10 @@
 
     <uses-sdk tools:overrideLibrary="androidx.car.app,androidx.car.app.projected" />
 
+    <queries>
+        <package android:name="com.google.android.projection.gearhead" />
+    </queries>
+
     <application>
         <meta-data
             android:name="com.google.android.geo.API_KEY"

app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt

@@ -13,7 +13,6 @@ import androidx.car.app.hardware.CarHardwareManager
 import androidx.car.app.hardware.info.CarHardwareLocation
 import androidx.car.app.hardware.info.CarSensors
 import androidx.car.app.validation.HostValidator
-import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
@@ -101,7 +100,7 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun bindLocationService() {
         if (!locationPermissionGranted()) return
-        if (carContext.carAppApiLevel >= CarAppApiLevels.LEVEL_3) {
+        if (supportsCarApiLevel3(carContext)) {
             val exec = ContextCompat.getMainExecutor(carContext)
             hardwareMan.carSensors.addCarHardwareLocationListener(
                 CarSensors.UPDATE_RATE_NORMAL,
@@ -119,13 +118,13 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     private fun unbindLocationService() {
-        if (carContext.carAppApiLevel >= CarAppApiLevels.LEVEL_3) {
+        if (supportsCarApiLevel3(carContext)) {
+            hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
+        } else {
             locationService?.let { service ->
                 service.removeLocationUpdates()
                 cas.unbindService(serviceConnection)
             }
-        } else {
-            hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
         }
     }
 

app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt

@@ -11,7 +11,6 @@ import androidx.car.app.Screen
 import androidx.car.app.hardware.CarHardwareManager
 import androidx.car.app.hardware.info.Model
 import androidx.car.app.model.*
-import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
@@ -148,7 +147,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     }
 
     private fun loadData() {
-        if (carContext.carAppApiLevel >= CarAppApiLevels.LEVEL_3) {
+        if (supportsCarApiLevel3(carContext)) {
             val exec = ContextCompat.getMainExecutor(carContext)
             val hardwareMan =
                 carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager

app/src/google/java/net/vonforst/evmap/auto/Utils.kt

@@ -1,11 +1,13 @@
 package net.vonforst.evmap.auto
 
+import android.content.Context
 import android.graphics.Bitmap
 import androidx.car.app.CarContext
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.hardware.common.CarUnit
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
+import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import java.util.*
@@ -68,4 +70,24 @@ fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
         CarUnit.MILES_PER_HOUR -> "%.0f mph".format(value * 3.6 / kmPerMile)
         else -> ""
     }
+}
+
+fun getAndroidAutoVersion(ctx: Context): List<String> {
+    val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
+    return info.versionName.split(".")
+}
+
+fun supportsCarApiLevel3(ctx: CarContext): Boolean {
+    if (ctx.carAppApiLevel < CarAppApiLevels.LEVEL_3) return false
+    ctx.hostInfo?.let { hostInfo ->
+        if (hostInfo.packageName == "com.google.android.projection.gearhead") {
+            val version = getAndroidAutoVersion(ctx)
+            // Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
+            // but crashes when using it. See: https://issuetracker.google.com/issues/199509584
+            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
+                return false
+            }
+        }
+    }
+    return true
 }

app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt

@@ -7,7 +7,6 @@ import android.os.Looper
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.model.*
-import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.R
 
@@ -82,7 +81,7 @@ class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), L
                                 screenManager.push(MapScreen(carContext, session, favorites = true))
                             }
                             .build())
-                    if (carContext.carAppApiLevel >= CarAppApiLevels.LEVEL_3) {
+                    if (supportsCarApiLevel3(carContext)) {
                         addItem(
                             Row.Builder()
                                 .setTitle(carContext.getString(R.string.auto_vehicle_data))

app/src/google/res/values-de/values.xml

@@ -31,6 +31,6 @@
     <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
     <string name="sounds_cool">klingt cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
-    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%s %s). Bitte wähle in der App ein passendes Fahrzeug aus.</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s). Bitte wähle nur ein passendes Fahrzeug in der App aus.</string>
+    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>

app/src/google/res/values/values.xml

@@ -41,6 +41,6 @@
     <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
     <string name="sounds_cool">sounds cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
-    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%s %s). Please select a matching vehicle from the app.</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s). Bitte wähle nur ein passendes Fahrzeug in der App aus.</string>
+    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>