From 0206b5f8c0635e02039973ea1ddd0ece61b12dca Mon Sep 17 00:00:00 2001 From: Andrea Brighi Date: Wed, 17 May 2023 16:39:34 +0200 Subject: [PATCH] fix(desktop): in DesktopLocalDataSource throw exception if backpack not saved --- .../desktopdata/datasource/DesktopLocalDataSource.kt | 2 +- .../desktopdata/datasource/DesktopLocalDataSourceImpl.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSource.kt b/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSource.kt index 90de57a8..b20c996f 100644 --- a/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSource.kt +++ b/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSource.kt @@ -60,7 +60,7 @@ interface DesktopLocalDataSource { /** * Get the backpack hash */ - fun getBackpack(): String + fun getBackpack(): String? /** * Associate the backpack to the desktop diff --git a/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSourceImpl.kt b/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSourceImpl.kt index 08f18bb9..0bb7a39b 100644 --- a/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSourceImpl.kt +++ b/desktopData/src/main/kotlin/com/intelligentbackpack/desktopdata/datasource/DesktopLocalDataSourceImpl.kt @@ -86,9 +86,12 @@ class DesktopLocalDataSourceImpl( database.desktopDao().takeSchoolSuppliesFromBackpack(rfid) } - override fun getBackpack(): String { - return storage.getBackpack() - } + override fun getBackpack(): String? = + if (storage.isBackpackSaved()) { + storage.getBackpack() + } else { + null + } override fun associateBackpack(hash: String) { storage.saveBackpack(hash)