From b663081104dc38df462c30d7dfc90e435ef3cf6c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 27 Aug 2021 16:43:46 +0200
Subject: Update libraries and do associated maintenance

---
 .../src/main/java/net/taler/merchantpos/order/LiveOrder.kt          | 2 +-
 .../src/main/java/net/taler/merchantpos/order/OrderAdapter.kt       | 2 +-
 .../src/main/java/net/taler/merchantpos/order/OrderManager.kt       | 6 +++---
 .../src/main/java/net/taler/merchantpos/order/ProductsFragment.kt   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order')

diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
index 738e32b..10aabd4 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt
@@ -54,7 +54,7 @@ internal class MutableLiveOrder(
         MutableLiveData(Order(id, currency, availableCategories))
     override val orderTotal: LiveData<Amount> = Transformations.map(order) { it.total }
     override val restartState = MutableLiveData(DISABLED)
-    private val selectedOrderLine = MutableLiveData<ConfigProduct>()
+    private val selectedOrderLine = MutableLiveData<ConfigProduct?>()
     override val selectedProductKey: String?
         get() = selectedOrderLine.value?.id
     override val modifyOrderAllowed =
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderAdapter.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderAdapter.kt
index 2180ccb..dc98f88 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderAdapter.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderAdapter.kt
@@ -100,7 +100,7 @@ internal class OrderAdapter : Adapter<OrderViewHolder>() {
             list.findChildViewUnder(e.x, e.y)?.let { view ->
                 val holder = list.getChildViewHolder(view)
                 val adapter = list.adapter as OrderAdapter
-                val position = holder.adapterPosition
+                val position = holder.bindingAdapterPosition
                 return object : ItemDetails<String>() {
                     override fun getPosition(): Int = position
                     override fun getSelectionKey(): String = adapter.keyProvider.getKey(position)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
index a89a85d..6c5ecdf 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt
@@ -120,7 +120,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver {
         val currentOrder = order(currentId)
         if (currentOrder.isEmpty()) orders.remove(currentId)
         else currentOrder.lastAddedProduct = null  // not needed anymore and it would get selected
-        mCurrentOrderId.value = nextId
+        mCurrentOrderId.value = requireNotNull(nextId)
     }
 
     @UiThread
@@ -143,7 +143,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver {
         // and would get selected when navigating back instead of last selection
         if (currentOrder.isEmpty()) orders.remove(currentId)
         else currentOrder.lastAddedProduct = null
-        mCurrentOrderId.value = previousId
+        mCurrentOrderId.value = requireNotNull(previousId)
     }
 
     fun hasPreviousOrder(currentOrderId: Int): Boolean {
@@ -159,7 +159,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver {
             forEach { if (it.selected) it.selected = false }
             category.selected = true
         }
-        mCategories.postValue(newCategories)
+        mCategories.postValue(newCategories ?: emptyList())
         mProducts.postValue(productsByCategory[category])
     }
 
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/ProductsFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/ProductsFragment.kt
index a3898fd..b2a245f 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/ProductsFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/ProductsFragment.kt
@@ -100,7 +100,7 @@ private class ProductAdapter(
         notifyDataSetChanged()
     }
 
-    private inner class ProductViewHolder(private val v: View) : ViewHolder(v) {
+    inner class ProductViewHolder(private val v: View) : ViewHolder(v) {
         private val name: TextView = v.findViewById(R.id.name)
         private val price: TextView = v.findViewById(R.id.price)
 
-- 
cgit v1.2.3