From 6b287c408405ccb079eb2abfdae1c3807a4fc8c3 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Thu, 13 Oct 2022 21:26:31 +0200 Subject: [PATCH] ChargepriceScreen: fix crash if car is not selected --- .../java/net/vonforst/evmap/auto/ChargepriceScreen.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt index 5e9b1327..e670e450 100644 --- a/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt +++ b/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt @@ -83,8 +83,8 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c meta.energy / meta.duration * 60 ) } - } ?: "" - addSectionedList(SectionedItemList.create(ItemList.Builder().apply { + } + val list = ItemList.Builder().apply { setNoItemsMessage( errorMessage ?: carContext.getString(R.string.chargeprice_no_tariffs_found) ) @@ -94,7 +94,12 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c addText(formatPrice(price)) }.build()) } - }.build(), header)) + }.build() + if (header != null && list.items.isNotEmpty()) { + addSectionedList(SectionedItemList.create(list, header)) + } else { + setSingleList(list) + } } setActionStrip( ActionStrip.Builder().addAction(