1 files changed, 6 insertions, 6 deletions
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..2efdf4c 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
@@ -21,7 +21,7 @@ import android.util.Log
 import androidx.annotation.UiThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations.map
+import androidx.lifecycle.map
 import net.taler.merchantpos.R
 import net.taler.merchantpos.config.Category
 import net.taler.merchantpos.config.ConfigProduct
@@ -32,7 +32,7 @@ import net.taler.merchantpos.order.RestartState.ENABLED
 class OrderManager(private val context: Context) : ConfigurationReceiver {
 
     companion object {
-        val TAG = OrderManager::class.java.simpleName
+        val TAG: String = OrderManager::class.java.simpleName
     }
 
     private lateinit var currency: String
@@ -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,14 +143,14 @@ 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 {
         return currentOrderId != orders.keys.first()
     }
 
-    fun hasNextOrder(currentOrderId: Int) = map(order(currentOrderId).restartState) { state ->
+    fun hasNextOrder(currentOrderId: Int) = order(currentOrderId).restartState.map { state ->
         state == ENABLED || currentOrderId != orders.keys.last()
     }
 
@@ -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])
     }