From 46335c751eaf9852fda9c0de9efd9ef258f80ded Mon Sep 17 00:00:00 2001 From: Iiro Krankka Date: Wed, 8 Feb 2017 20:33:33 +0200 Subject: [PATCH] Fixed potential NPEs waiting to happen if there's no brewing events recorded. --- .idea/misc.xml | 2 +- .../codemate/koffeemate/data/local/CoffeeEventRepository.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/src/main/java/com/codemate/koffeemate/data/local/CoffeeEventRepository.kt b/app/src/main/java/com/codemate/koffeemate/data/local/CoffeeEventRepository.kt index de5c830..b136e98 100644 --- a/app/src/main/java/com/codemate/koffeemate/data/local/CoffeeEventRepository.kt +++ b/app/src/main/java/com/codemate/koffeemate/data/local/CoffeeEventRepository.kt @@ -62,7 +62,7 @@ class RealmCoffeeEventRepository : CoffeeEventRepository { .equalTo("isSuccessful", true) .findAllSorted("time", Sort.ASCENDING) .lastOrNull() - val copy = copyFromRealm(lastEvent) + val copy = if (lastEvent != null) copyFromRealm(lastEvent) else null close() return@with copy @@ -73,7 +73,7 @@ class RealmCoffeeEventRepository : CoffeeEventRepository { .equalTo("isSuccessful", false) .findAllSorted("time", Sort.ASCENDING) .lastOrNull() - val copy = copyFromRealm(accident) + val copy = if (accident != null) copyFromRealm(accident) else null close() return@with copy