feat(core-file): ensure Uri is used for the FileSystemManager

wmontwe · wmontwe · commit 270436b8e732 · 2025-10-22T09:56:25.000+02:00
diff --git a/core/file/build.gradle.kts b/core/file/build.gradle.kts
@@ -9,9 +9,10 @@ android {
 kotlin {
     sourceSets {
         commonMain.dependencies {
+            api(libs.uri)
+
             implementation(projects.core.outcome)
 
-            implementation(libs.uri)
             implementation(libs.kotlinx.io.core)
         }
         androidUnitTest.dependencies {
diff --git a/core/file/src/androidMain/kotlin/net/thunderbird/core/file/AndroidFileSystemManager.kt b/core/file/src/androidMain/kotlin/net/thunderbird/core/file/AndroidFileSystemManager.kt
@@ -1,8 +1,8 @@
 package net.thunderbird.core.file
 
 import android.content.ContentResolver
-import android.net.Uri
-import androidx.core.net.toUri
+import com.eygraber.uri.Uri
+import com.eygraber.uri.toAndroidUri
 import kotlinx.io.RawSink
 import kotlinx.io.RawSource
 import kotlinx.io.asSink
@@ -14,14 +14,12 @@ import kotlinx.io.asSource
 class AndroidFileSystemManager(
     private val contentResolver: ContentResolver,
 ) : FileSystemManager {
-    override fun openSink(uriString: String): RawSink? {
-        val uri: Uri = uriString.toUri()
+    override fun openSink(uri: Uri): RawSink? {
         // Use truncate/overwrite mode by default
-        return contentResolver.openOutputStream(uri, "wt")?.asSink()
+        return contentResolver.openOutputStream(uri.toAndroidUri(), "wt")?.asSink()
     }
 
-    override fun openSource(uriString: String): RawSource? {
-        val uri: Uri = uriString.toUri()
-        return contentResolver.openInputStream(uri)?.asSource()
+    override fun openSource(uri: Uri): RawSource? {
+        return contentResolver.openInputStream(uri.toAndroidUri())?.asSource()
     }
 }
diff --git a/core/file/src/androidUnitTest/kotlin/net/thunderbird/core/file/AndroidFileSystemManagerTest.kt b/core/file/src/androidUnitTest/kotlin/net/thunderbird/core/file/AndroidFileSystemManagerTest.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import com.eygraber.uri.toKmpUri
 import kotlinx.io.Buffer
 import org.junit.Rule
 import org.junit.Test
@@ -33,13 +34,13 @@ class AndroidFileSystemManagerTest {
         val testText = "Hello Thunderbird Android!"
 
         // Act
-        val sink = checkNotNull(testSubject.openSink(uri.toString()))
+        val sink = checkNotNull(testSubject.openSink(uri.toKmpUri()))
         val writeBuffer = Buffer().apply { write(testText.encodeToByteArray()) }
         sink.write(writeBuffer, writeBuffer.size)
         sink.flush()
         sink.close()
 
-        val source = checkNotNull(testSubject.openSource(uri.toString()))
+        val source = checkNotNull(testSubject.openSource(uri.toKmpUri()))
         val readBuffer = Buffer()
         source.readAtMostTo(readBuffer, 1024)
         val bytes = ByteArray(readBuffer.size.toInt())
diff --git a/core/file/src/commonMain/kotlin/net/thunderbird/core/file/FileSystemManager.kt b/core/file/src/commonMain/kotlin/net/thunderbird/core/file/FileSystemManager.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.core.file
 
+import com.eygraber.uri.Uri
 import kotlinx.io.RawSink
 import kotlinx.io.RawSource
 
@@ -12,16 +13,16 @@ interface FileSystemManager {
      *
      * Implementations should open the destination for writing in overwrite/truncate mode.
      *
-     * @param uriString The URI string to open a sink for
+     * @param uri The URI to open a sink for
      * @return A sink for writing to the URI, or null if the URI couldn't be opened
      */
-    fun openSink(uriString: String): RawSink?
+    fun openSink(uri: Uri): RawSink?
 
     /**
      * Opens a source for reading from a URI.
      *
-     * @param uriString The URI string to open a source for
+     * @param uri The URI to open a source for
      * @return A source for reading from the URI, or null if the URI couldn't be opened
      */
-    fun openSource(uriString: String): RawSource?
+    fun openSource(uri: Uri): RawSource?
 }
diff --git a/core/file/src/commonMain/kotlin/net/thunderbird/core/file/command/CopyCommand.kt b/core/file/src/commonMain/kotlin/net/thunderbird/core/file/command/CopyCommand.kt
@@ -15,11 +15,11 @@ internal class CopyCommand(
 ) : FileCommand<Unit> {
     override suspend fun invoke(fs: FileSystemManager): Outcome<Unit, FileOperationError> {
         // Open endpoints
-        val source = fs.openSource(sourceUri.toString())
+        val source = fs.openSource(sourceUri)
             ?: return Outcome.Failure(
                 FileOperationError.Unavailable(sourceUri, "Unable to open source: $sourceUri"),
             )
-        val sink = fs.openSink(destinationUri.toString())
+        val sink = fs.openSink(destinationUri)
             ?: return Outcome.Failure(
                 FileOperationError.Unavailable(destinationUri, "Unable to open destination: $destinationUri"),
             )
@@ -29,31 +29,31 @@ internal class CopyCommand(
             while (true) {
                 val read = try {
                     source.readAtMostTo(buffer, BUFFER_SIZE)
-                } catch (t: Throwable) {
-                    return Outcome.Failure(FileOperationError.ReadFailed(sourceUri, t.message), cause = t)
+                } catch (e: Exception) {
+                    return Outcome.Failure(FileOperationError.ReadFailed(sourceUri, e.message), cause = e)
                 }
                 if (read <= 0L) break
                 try {
                     sink.write(buffer, read)
-                } catch (t: Throwable) {
-                    return Outcome.Failure(FileOperationError.WriteFailed(destinationUri, t.message), cause = t)
+                } catch (e: Exception) {
+                    return Outcome.Failure(FileOperationError.WriteFailed(destinationUri, e.message), cause = e)
                 }
             }
             try {
                 sink.flush()
-            } catch (t: Throwable) {
-                return Outcome.Failure(FileOperationError.WriteFailed(destinationUri, t.message), cause = t)
+            } catch (e: Exception) {
+                return Outcome.Failure(FileOperationError.WriteFailed(destinationUri, e.message), cause = e)
             }
             Outcome.Success(Unit)
-        } catch (t: Throwable) {
-            Outcome.Failure(FileOperationError.Unknown(t.message), cause = t)
+        } catch (e: Exception) {
+            Outcome.Failure(FileOperationError.Unknown(e.message), cause = e)
         } finally {
             try {
                 source.close()
-            } catch (_: Throwable) {}
+            } catch (_: Exception) {}
             try {
                 sink.close()
-            } catch (_: Throwable) {}
+            } catch (_: Exception) {}
         }
     }
 
diff --git a/core/file/src/commonTest/kotlin/net/thunderbird/core/file/FakeFileSystemManager.kt b/core/file/src/commonTest/kotlin/net/thunderbird/core/file/FakeFileSystemManager.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.core.file
 
+import com.eygraber.uri.Uri
 import kotlinx.io.Buffer
 import kotlinx.io.RawSink
 import kotlinx.io.RawSource
@@ -12,7 +13,8 @@ class FakeFileSystemManager : FileSystemManager {
 
     private val storage = mutableMapOf<String, ByteArray>()
 
-    override fun openSink(uriString: String): RawSink? {
+    override fun openSink(uri: Uri): RawSink? {
+        val key = uri.toString()
         return object : RawSink {
             private val collected = mutableListOf<Byte>()
 
@@ -26,7 +28,7 @@ class FakeFileSystemManager : FileSystemManager {
             }
 
             override fun flush() {
-                storage[uriString] = collected.toByteArray()
+                storage[key] = collected.toByteArray()
             }
 
             override fun close() {
@@ -36,8 +38,9 @@ class FakeFileSystemManager : FileSystemManager {
         }
     }
 
-    override fun openSource(uriString: String): RawSource? {
-        val bytes = storage[uriString] ?: return null
+    override fun openSource(uri: Uri): RawSource? {
+        val key = uri.toString()
+        val bytes = storage[key] ?: return null
         return object : RawSource {
             private val buffer = Buffer().apply { write(bytes) }
             override fun readAtMostTo(sink: Buffer, byteCount: Long): Long {
diff --git a/core/file/src/jvmMain/kotlin/net/thunderbird/core/file/JvmFileSystemManager.kt b/core/file/src/jvmMain/kotlin/net/thunderbird/core/file/JvmFileSystemManager.kt
@@ -1,5 +1,7 @@
 package net.thunderbird.core.file
 
+import com.eygraber.uri.Uri
+import com.eygraber.uri.toURI
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -12,10 +14,10 @@ import kotlinx.io.asSource
  * JVM implementation of [FileSystemManager] using java.io streams.
  */
 class JvmFileSystemManager : FileSystemManager {
-    override fun openSink(uriString: String): RawSink? {
+    override fun openSink(uri: Uri): RawSink? {
         // Only support simple file paths for JVM implementation
         return try {
-            val file = File(uriString)
+            val file = File(uri.toURI())
             // create parent directories if necessary
             file.parentFile?.mkdirs()
             val append = false // overwrite/truncate by default
@@ -25,9 +27,9 @@ class JvmFileSystemManager : FileSystemManager {
         }
     }
 
-    override fun openSource(uriString: String): RawSource? {
+    override fun openSource(uri: Uri): RawSource? {
         return try {
-            val file = File(uriString)
+            val file = File(uri.toURI())
             FileInputStream(file).asSource()
         } catch (_: Throwable) {
             null
diff --git a/core/file/src/jvmTest/kotlin/net/thunderbird/core/file/JvmFileSystemManagerTest.kt b/core/file/src/jvmTest/kotlin/net/thunderbird/core/file/JvmFileSystemManagerTest.kt
@@ -2,6 +2,7 @@ package net.thunderbird.core.file
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import com.eygraber.uri.Uri
 import java.io.File
 import kotlinx.io.Buffer
 import org.junit.Rule
@@ -21,15 +22,16 @@ class JvmFileSystemManagerTest {
         // Arrange
         val tempFile: File = folder.newFile("tb-file-fs-test.txt")
         val testText = "Hello Thunderbird!"
-        val sink = checkNotNull(testSubject.openSink(tempFile.absolutePath))
+        val uri = Uri.parse(tempFile.toURI().toString())
+        val sink = checkNotNull(testSubject.openSink(uri))
 
         // Act
         val writeBuffer = Buffer().apply { write(testText.encodeToByteArray()) }
         sink.write(writeBuffer, writeBuffer.size)
         sink.flush()
         sink.close()
 
-        val source = checkNotNull(testSubject.openSource(tempFile.absolutePath))
+        val source = checkNotNull(testSubject.openSource(uri))
         val readBuffer = Buffer()
         source.readAtMostTo(readBuffer, 1024)
         val bytes = ByteArray(readBuffer.size.toInt())
diff --git a/legacy/ui/legacy/build.gradle.kts b/legacy/ui/legacy/build.gradle.kts
@@ -69,6 +69,7 @@ dependencies {
     implementation(libs.mime4j.core)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.uri)
 
     implementation(libs.glide)
     annotationProcessor(libs.glide.compiler)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package net.thunderbird.core.file`
`2`	`2`
	`3`	`+import com.eygraber.uri.Uri`
`3`	`4`	`import kotlinx.io.RawSink`
`4`	`5`	`import kotlinx.io.RawSource`
`5`	`6`
`@@ -12,16 +13,16 @@ interface FileSystemManager {`
`12`	`13`	`*`
`13`	`14`	`* Implementations should open the destination for writing in overwrite/truncate mode.`
`14`	`15`	`*`
`15`		`- * @param uriString The URI string to open a sink for`
	`16`	`+ * @param uri The URI to open a sink for`
`16`	`17`	`* @return A sink for writing to the URI, or null if the URI couldn't be opened`
`17`	`18`	`*/`
`18`		`- fun openSink(uriString: String): RawSink?`
	`19`	`+ fun openSink(uri: Uri): RawSink?`
`19`	`20`
`20`	`21`	`/**`
`21`	`22`	`* Opens a source for reading from a URI.`
`22`	`23`	`*`
`23`		`- * @param uriString The URI string to open a source for`
	`24`	`+ * @param uri The URI to open a source for`
`24`	`25`	`* @return A source for reading from the URI, or null if the URI couldn't be opened`
`25`	`26`	`*/`
`26`		`- fun openSource(uriString: String): RawSource?`
	`27`	`+ fun openSource(uri: Uri): RawSource?`
`27`	`28`	`}`