From bc91c0571bbd1e24e222fc80245c743eb7e384cf Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sat, 14 Oct 2023 19:28:54 +0200
Subject: [PATCH] Chargeprice: Fix switching between vehicles

---
 .../java/net/vonforst/evmap/fragment/ChargepriceFragment.kt     | 2 +-
 .../java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
index 204a4f95..94368832 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
@@ -168,7 +168,7 @@ class ChargepriceFragment : Fragment() {
             chargepriceAdapter.myTariffsAll = it
         }
         vm.chargePricesForChargepoint.observe(viewLifecycleOwner) {
-            it?.data?.let { chargepriceAdapter.submitList(it) }
+            chargepriceAdapter.submitList(it?.data ?: emptyList())
         }
 
         val connectorsAdapter = CheckableConnectorAdapter()
diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
index 1919ee6a..2c13817e 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -116,6 +116,7 @@ class ChargepriceViewModel(
         MediatorLiveData<Resource<List<ChargePrice>>>().apply {
             value = state["chargePrices"] ?: Resource.loading(null)
             listOf(
+                vehicle,
                 batteryRange,
                 batteryRangeSliderDragging,
                 vehicleCompatibleConnectors,