Use CarAppService for startActivity instead of CarContext

fixes #375 for startActivity and openUrl

https://issuetracker.google.com/issues/372055514
Warning: You must update to androidx.car.app:1.7.0-alpha01 or later for the permissions dialog to show up on the phone screen when your app is used on a device running Android 14 or higher.

Author: johan12345

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

@@ -166,7 +166,7 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
         }
         if (!prefs.privacyAccepted) {
             screens.add(
-                AcceptPrivacyScreen(carContext)
+                AcceptPrivacyScreen(carContext, this)
             )
         }
         handleACRAIntent(intent)?.let {

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

@@ -3,10 +3,18 @@ package net.vonforst.evmap.auto
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.hardware.CarHardwareManager
 import androidx.car.app.hardware.info.Model
-import androidx.car.app.model.*
+import androidx.car.app.model.Action
+import androidx.car.app.model.ActionStrip
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.ItemList
+import androidx.car.app.model.ListTemplate
+import androidx.car.app.model.Row
+import androidx.car.app.model.SectionedItemList
+import androidx.car.app.model.Template
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
@@ -18,7 +26,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.chargeprice.*
+import net.vonforst.evmap.api.chargeprice.ChargePrice
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
+import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceInclude
+import net.vonforst.evmap.api.chargeprice.ChargepriceMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceOptions
+import net.vonforst.evmap.api.chargeprice.ChargepriceRequest
+import net.vonforst.evmap.api.chargeprice.ChargepriceRequestTariffMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceStation
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
@@ -32,7 +49,9 @@ import retrofit2.HttpException
 import java.io.IOException
 import kotlin.math.roundToInt
 
-class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(ctx) {
+@ExperimentalCarApi
+class ChargepriceScreen(ctx: CarContext, val session: EVMapSession, val charger: ChargeLocation) :
+    Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(carContext)
     private val api by lazy {
@@ -130,7 +149,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                             )
                         ).build()
                     ).setOnClickListener {
-                        openUrl(carContext, ChargepriceApi.getPoiUrl(charger))
+                        openUrl(carContext, session.cas, ChargepriceApi.getPoiUrl(charger))
                     }.build()
                 ).build()
             )

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

@@ -13,6 +13,7 @@ import android.text.Spanned
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.Action
 import androidx.car.app.model.ActionStrip
@@ -68,7 +69,11 @@ import java.time.format.FormatStyle
 import kotlin.math.floor
 import kotlin.math.roundToInt
 
-class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
+class ChargerDetailScreen(
+    ctx: CarContext,
+    val chargerSparse: ChargeLocation,
+    val session: EVMapSession
+) : Screen(ctx) {
     var charger: ChargeLocation? = null
     var photo: Bitmap? = null
     private var availability: ChargeLocationStatus? = null
@@ -128,7 +133,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                             .setFlags(Action.FLAG_PRIMARY)
                         .setBackgroundColor(CarColor.PRIMARY)
                         .setOnClickListener {
-                            navigateToCharger(carContext, charger)
+                            navigateToCharger(carContext, session.cas, charger)
                         }
                         .build())
                         if (ChargepriceApi.isChargerSupported(charger)) {
@@ -145,14 +150,20 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                                     .setTitle(carContext.getString(R.string.auto_prices))
                                 .setOnClickListener {
                                     if (prefs.chargepriceNativeIntegration) {
-                                        screenManager.push(ChargepriceScreen(carContext, charger))
+                                        screenManager.push(
+                                            ChargepriceScreen(
+                                                carContext,
+                                                session,
+                                                charger
+                                            )
+                                        )
                                     } else {
                                         val intent = Intent(
                                             Intent.ACTION_VIEW,
                                             Uri.parse(ChargepriceApi.getPoiUrl(charger))
                                         )
                                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                        carContext.startActivity(intent)
+                                        session.cas.startActivity(intent)
                                     }
                                 }
                                 .build())
@@ -171,12 +182,12 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                                 Action.Builder()
                                     .setTitle(carContext.getString(R.string.open_in_app))
                                     .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                        val intent = Intent(carContext, MapsActivity::class.java)
+                                        val intent = Intent(session.cas, MapsActivity::class.java)
                                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                                             .putExtra(EXTRA_CHARGER_ID, chargerSparse.id)
                                             .putExtra(EXTRA_LAT, chargerSparse.coordinates.lat)
                                             .putExtra(EXTRA_LON, chargerSparse.coordinates.lng)
-                                        carContext.startActivity(intent)
+                                        session.cas.startActivity(intent)
                                         CarToast.makeText(
                                             carContext,
                                             R.string.opened_on_phone,

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

@@ -5,6 +5,7 @@ import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import androidx.car.app.CarContext
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.hardware.info.EnergyLevel
 import androidx.car.app.model.Action
 import androidx.car.app.model.CarColor
@@ -43,7 +44,12 @@ interface ChargerListDelegate : ItemList.OnItemVisibilityChangedListener {
     fun onChargerClick(charger: ChargeLocation)
 }
 
-class ChargerListFormatter(val carContext: CarContext, val screen: ChargerListDelegate) {
+@ExperimentalCarApi
+class ChargerListFormatter(
+    val carContext: CarContext,
+    val screen: ChargerListDelegate,
+    val cas: CarAppService
+) {
     private val iconGen = ChargerIconGenerator(carContext, null, height = 96)
     var favorites: Set<Long> = emptySet()
 
@@ -235,7 +241,7 @@ class ChargerListFormatter(val carContext: CarContext, val screen: ChargerListDe
             setTitle(carContext.getString(R.string.navigate))
             setBackgroundColor(CarColor.PRIMARY)
             setOnClickListener {
-                navigateToCharger(carContext, charger)
+                navigateToCharger(carContext, cas, charger)
             }
         }.build())
     }.build()

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

@@ -126,7 +126,7 @@ class LegacyMapScreen(ctx: CarContext, val session: EVMapSession) :
 
     private var searchLocation: LatLng? = null
 
-    private val formatter = ChargerListFormatter(ctx, this)
+    private val formatter = ChargerListFormatter(ctx, this, session.cas)
 
     init {
         lifecycle.addObserver(this)
@@ -260,7 +260,7 @@ class LegacyMapScreen(ctx: CarContext, val session: EVMapSession) :
     }
 
     override fun onChargerClick(charger: ChargeLocation) {
-        screenManager.push(ChargerDetailScreen(carContext, charger))
+        screenManager.push(ChargerDetailScreen(carContext, charger, session))
         session.mapScreen = null
     }
 

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

@@ -2,6 +2,7 @@ package net.vonforst.evmap.auto
 
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.model.Action
 import androidx.car.app.model.Header
 import androidx.car.app.model.ItemList
@@ -12,8 +13,10 @@ import androidx.car.app.model.Template
 import com.car2go.maps.AttributionClickListener
 import net.vonforst.evmap.R
 
+@ExperimentalCarApi
 class MapAttributionScreen(
     ctx: CarContext,
+    val session: EVMapSession,
     val attributions: List<AttributionClickListener.Attribution>
 ) : Screen(ctx) {
     override fun onGetTemplate(): Template {
@@ -32,7 +35,7 @@ class MapAttributionScreen(
                             .setBrowsable(true)
                             .setOnClickListener(
                                 ParkedOnlyOnClickListener.create {
-                                    openUrl(carContext, attr.url)
+                                    openUrl(carContext, session.cas, attr.url)
                                 }).build()
                     )
                 }

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

@@ -140,7 +140,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
     private var myLocationEnabled = false
     private var myLocationNeedsUpdate = false
 
-    private val formatter = ChargerListFormatter(ctx, this)
+    private val formatter = ChargerListFormatter(ctx, this, session.cas)
     private val backPressedCallback = object : OnBackPressedCallback(false) {
         override fun handleOnBackPressed() {
             clearSelectedCharger()
@@ -188,7 +188,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     selectedCharger,
                     availabilities.get(selectedCharger.id)?.second
                 ) {
-                    screenManager.push(ChargerDetailScreen(carContext, selectedCharger))
+                    screenManager.push(ChargerDetailScreen(carContext, selectedCharger, session))
                     session.mapScreen = null
                 }).apply {
                 setHeader(Header.Builder().apply {
@@ -607,7 +607,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         map.setIndoorEnabled(false)
         map.uiSettings.setIndoorLevelPickerEnabled(false)
         map.setAttributionClickListener { attributions ->
-            screenManager.push(MapAttributionScreen(carContext, attributions))
+            screenManager.push(MapAttributionScreen(carContext, session, attributions))
         }
         map.setOnMapClickListener {
             clearSelectedCharger()