release 0.8.3

if there is enough room, the name does not already contain the city, and not all chargers on the list are in the same city
fixes #102

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 50
-        versionName "0.8.2"
+        versionCode 51
+        versionName "0.8.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -139,7 +139,7 @@ dependencies {
     googleImplementation 'androidx.car.app:app:1.0.0'
 
     // AnyMaps
-    def anyMapsVersion = '1f050d860f'
+    def anyMapsVersion = '95ddd6c083'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
     implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"

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

@@ -47,6 +47,7 @@ import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.availabilityText
 import net.vonforst.evmap.ui.getMarkerTint
 import net.vonforst.evmap.utils.distanceBetween
+import net.vonforst.evmap.viewmodel.Status
 import java.io.IOException
 import java.time.Duration
 import java.time.ZoneId
@@ -60,6 +61,7 @@ interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
+@androidx.car.app.annotations.ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
@@ -76,6 +78,7 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
+@androidx.car.app.annotations.ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     var mapScreen: LocationAwareScreen? = null
         set(value) {
@@ -161,6 +164,7 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
 /**
  * Welcome screen with selection between favorites and nearby chargers
  */
+@androidx.car.app.annotations.ExperimentalCarApi
 class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
     private var location: Location? = null
 
@@ -221,6 +225,7 @@ class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), L
 /**
  * Screen to grant location permission
  */
+@androidx.car.app.annotations.ExperimentalCarApi
 class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     override fun onGetTemplate(): Template {
         return MessageTemplate.Builder(carContext.getString(R.string.auto_location_permission_needed))
@@ -275,6 +280,7 @@ class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx)
 /**
  * Main map screen showing either nearby chargers or favorites
  */
+@androidx.car.app.annotations.ExperimentalCarApi
 class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
     Screen(ctx), LocationAwareScreen {
     private var updateCoroutine: Job? = null
@@ -312,8 +318,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             } ?: setLoading(true)
             chargers?.take(maxRows)?.let { chargerList ->
                 val builder = ItemList.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))
+                    builder.addItem(formatCharger(charger, showCity))
                 }
                 builder.setNoItemsMessage(
                     carContext.getString(
@@ -332,7 +340,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         }.build()
     }
 
-    private fun formatCharger(charger: ChargeLocation): Row {
+    private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
         val color = ContextCompat.getColor(carContext, getMarkerTint(charger))
         val place =
             Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
@@ -344,7 +352,16 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 .build()
 
         return Row.Builder().apply {
-            setTitle(charger.name)
+            // only show the city if not all chargers are in the same city (-> showCity == true)
+            // and the city is not already contained in the charger name
+            if (showCity && charger.address.city != null && charger.address.city !in charger.name) {
+                setTitle(CarText.Builder("${charger.name} · ${charger.address.city}")
+                    .addVariant(charger.name)
+                    .build())
+            } else {
+                setTitle(charger.name)
+            }
+
             val text = SpannableStringBuilder()
 
             // distance
@@ -655,8 +672,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
 
     private fun loadCharger() {
         lifecycleScope.launch {
-            try {
-                val response = api.getChargepointDetail(getReferenceData(), chargerSparse.id)
+            val response = api.getChargepointDetail(getReferenceData(), chargerSparse.id)
+            if (response.status == Status.SUCCESS) {
                 charger = response.data!!
 
                 val photo = charger?.photos?.firstOrNull()
@@ -671,7 +688,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 availability = charger?.let { getAvailability(it).data }
 
                 invalidate()
-            } catch (e: IOException) {
+            } else {
                 withContext(Dispatchers.Main) {
                     CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
                         .show()

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

@@ -7,6 +7,7 @@ import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
+import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
@@ -362,30 +363,32 @@ class GoingElectricApiWrapper(
 
     override suspend fun getReferenceData(): Resource<GEReferenceData> =
         withContext(Dispatchers.IO) {
-            try {
-                val plugs = async { api.getPlugs() }
-                val chargeCards = async { api.getChargeCards() }
-                val networks = async { api.getNetworks() }
+            supervisorScope {
+                try {
+                    val plugs = async { api.getPlugs() }
+                    val chargeCards = async { api.getChargeCards() }
+                    val networks = async { api.getNetworks() }
 
-                val plugsResponse = plugs.await()
-                val chargeCardsResponse = chargeCards.await()
-                val networksResponse = networks.await()
+                    val plugsResponse = plugs.await()
+                    val chargeCardsResponse = chargeCards.await()
+                    val networksResponse = networks.await()
 
-                val responses = listOf(plugsResponse, chargeCardsResponse, networksResponse)
+                    val responses = listOf(plugsResponse, chargeCardsResponse, networksResponse)
 
-                if (responses.map { it.isSuccessful }.all { it }) {
-                    Resource.success(
-                        GEReferenceData(
-                            plugsResponse.body()!!.result,
-                            networksResponse.body()!!.result,
-                            chargeCardsResponse.body()!!.result
+                    if (responses.map { it.isSuccessful }.all { it }) {
+                        Resource.success(
+                            GEReferenceData(
+                                plugsResponse.body()!!.result,
+                                networksResponse.body()!!.result,
+                                chargeCardsResponse.body()!!.result
+                            )
                         )
-                    )
-                } else {
-                    Resource.error(responses.find { !it.isSuccessful }!!.message(), null)
+                    } else {
+                        Resource.error(responses.find { !it.isSuccessful }!!.message(), null)
+                    }
+                } catch (e: IOException) {
+                    Resource.error(e.message, null)
                 }
-            } catch (e: IOException) {
-                Resource.error(e.message, null)
             }
         }
 

app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt

@@ -36,15 +36,8 @@ class SettingsFragment : PreferenceFragmentCompat(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
         prefs = PreferenceDataSource(requireContext())
 
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
         myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
         myVehiclePreference.isEnabled = false
         vm.vehicles.observe(viewLifecycleOwner) { res ->
@@ -130,6 +123,13 @@ class SettingsFragment : PreferenceFragmentCompat(),
     override fun onResume() {
         super.onResume()
         preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+
+        val navController = findNavController()
+        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
+        toolbar.setupWithNavController(
+            navController,
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
     }
 
     override fun onPause() {

app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.*
 import com.car2go.maps.AnyMap
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.ChargepointApi
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
@@ -378,9 +379,12 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
         availability.value = getAvailability(charger)
     }
 
+    private var chargerLoadingTask: Job? = null
+
     private fun loadChargerDetails(charger: ChargeLocation, referenceData: ReferenceData) {
         chargerDetails.value = Resource.loading(null)
-        viewModelScope.launch {
+        chargerLoadingTask?.cancel()
+        chargerLoadingTask = viewModelScope.launch {
             try {
                 chargerDetails.value = api.getChargepointDetail(referenceData, charger.id)
             } catch (e: IOException) {

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

@@ -0,0 +1,2 @@
+- Android Auto: Anzeige des Ortsnamens (wenn genug Platz und nicht eindeutig)
+- Abstürze behoben

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

@@ -0,0 +1,2 @@
+- Android Auto: Show place name next to charger name (if enough room available)
+- Fixed various crashes