From 76756fabaa4ada64a0ae687562e0418eb53f452e Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sun, 28 Feb 2021 14:18:17 +0100
Subject: [PATCH] a bit more readable

---
 .../pump/omnipod/dash/history/DashHistory.kt  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
index d02d1141f97..b5c1c5367d7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
@@ -39,25 +39,21 @@ class DashHistory @Inject constructor(
 
         when {
             commandType == SET_BOLUS && bolusRecord == null               ->
-                Single.error(IllegalArgumentException("bolusRecord missing on SET_BOLUS"))
+                return Single.error(IllegalArgumentException("bolusRecord missing on SET_BOLUS"))
             commandType == SET_TEMPORARY_BASAL && tempBasalRecord == null ->
-                Single.error<String>(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
-            else                                                          -> null
-        }?.let { return it }
+                return Single.error(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
+        }
 
-
-        return dao.save(
-            HistoryRecordEntity(
-                id = id,
-                date = date,
-                createdAt = currentTimeMillis(),
-                commandType = commandType,
-                tempBasalRecord = tempBasalRecord,
-                bolusRecord = bolusRecord,
-                initialResult = initialResult,
-                resolvedResult = resolveResult,
-                resolvedAt = resolvedAt,
-            )
+        return dao.save(HistoryRecordEntity(
+            id = id,
+            date = date,
+            createdAt = currentTimeMillis(),
+            commandType = commandType,
+            tempBasalRecord = tempBasalRecord,
+            bolusRecord = bolusRecord,
+            initialResult = initialResult,
+            resolvedResult = resolveResult,
+            resolvedAt = resolvedAt)
         ).toSingle { id }
     }