added runCatching Wrappings to FileStorage

Signed-off-by: Basler182 <[email protected]>
StanfordSpezi · Jun 23, 2024 · cf52b3e · cf52b3e
1 parent 58b191d
commit cf52b3e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/...s/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/file/EncryptedFileStorage.kt b/...s/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/file/EncryptedFileStorage.kt
@@ -30,28 +30,36 @@ class EncryptedFileStorage @Inject constructor(
         ).build()
     }
 
-    override suspend fun saveFile(fileName: String, data: ByteArray) = withContext(ioDispatcher) {
-        deleteFile(fileName)
-        val encryptedFile = getEncryptedFile(fileName)
-        encryptedFile.openFileOutput().use { outputStream ->
-            outputStream.write(data)
+    override suspend fun saveFile(fileName: String, data: ByteArray): Result<Unit> =
+        withContext(ioDispatcher) {
+            runCatching {
+                deleteFile(fileName)
+                val encryptedFile = getEncryptedFile(fileName)
+                encryptedFile.openFileOutput().use { outputStream ->
+                    outputStream.write(data)
+                }
+            }
         }
-    }
 
-    override suspend fun readFile(fileName: String): ByteArray? = withContext(ioDispatcher) {
-        val file = File(context.filesDir, fileName)
-        if (!file.exists()) return@withContext null
+    override suspend fun readFile(fileName: String): Result<ByteArray?> =
+        withContext(ioDispatcher) {
+            runCatching {
+                val file = File(context.filesDir, fileName)
+                if (!file.exists()) return@runCatching null
 
-        val encryptedFile = getEncryptedFile(fileName)
-        return@withContext encryptedFile.openFileInput().use { inputStream ->
-            inputStream.readBytes()
+                val encryptedFile = getEncryptedFile(fileName)
+                encryptedFile.openFileInput().use { inputStream ->
+                    inputStream.readBytes()
+                }
+            }
         }
-    }
 
-    override suspend fun deleteFile(fileName: String) = withContext(ioDispatcher) {
-        val file = File(context.filesDir, fileName)
-        if (file.exists()) {
-            file.delete()
+    override suspend fun deleteFile(fileName: String): Result<Unit> = withContext(ioDispatcher) {
+        runCatching {
+            val file = File(context.filesDir, fileName)
+            if (file.exists()) {
+                file.delete()
+            }
         }
     }
 }
diff --git a/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/file/FileStorage.kt b/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/file/FileStorage.kt
@@ -1,7 +1,7 @@
 package edu.stanford.spezi.modules.storage.file
 
 interface FileStorage {
-    suspend fun readFile(fileName: String): ByteArray?
-    suspend fun deleteFile(fileName: String)
-    suspend fun saveFile(fileName: String, data: ByteArray)
+    suspend fun readFile(fileName: String): Result<ByteArray?>
+    suspend fun deleteFile(fileName: String): Result<Unit>
+    suspend fun saveFile(fileName: String, data: ByteArray): Result<Unit>
 }