Merge pull request #9968 from wmontwe/feat-core-file-manager

feat: add core file manager

Author: wmontwe

app-common/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
     implementation(projects.core.configstore.implBackend)
 
     implementation(projects.core.featureflag)
+    implementation(projects.core.file)
 
     implementation(projects.core.ui.setting.api)
     implementation(projects.core.ui.setting.implDialog)

app-common/src/main/kotlin/net/thunderbird/app/common/core/AppCommonCoreModule.kt

@@ -1,8 +1,13 @@
 package net.thunderbird.app.common.core
 
+import android.content.Context
 import net.thunderbird.app.common.core.configstore.appCommonCoreConfigStoreModule
 import net.thunderbird.app.common.core.logging.appCommonCoreLogger
 import net.thunderbird.app.common.core.ui.appCommonCoreUiModule
+import net.thunderbird.core.file.AndroidFileSystemManager
+import net.thunderbird.core.file.DefaultFileManager
+import net.thunderbird.core.file.FileManager
+import net.thunderbird.core.file.FileSystemManager
 import org.koin.core.module.Module
 import org.koin.dsl.module
 
@@ -12,4 +17,16 @@ val appCommonCoreModule: Module = module {
         appCommonCoreLogger,
         appCommonCoreUiModule,
     )
+
+    single<FileSystemManager> {
+        AndroidFileSystemManager(
+            contentResolver = get<Context>().contentResolver,
+        )
+    }
+
+    single<FileManager> {
+        DefaultFileManager(
+            fileSystemManager = get(),
+        )
+    }
 }

app-common/src/main/kotlin/net/thunderbird/app/common/core/logging/LoggerModule.kt

@@ -13,7 +13,6 @@ import net.thunderbird.core.logging.LogSink
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.logging.composite.CompositeLogSink
 import net.thunderbird.core.logging.console.ConsoleLogSink
-import net.thunderbird.core.logging.file.AndroidFileSystemManager
 import net.thunderbird.core.logging.file.FileLogSink
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
@@ -64,7 +63,7 @@ val appCommonCoreLogger = module {
             level = LogLevel.DEBUG,
             fileName = "thunderbird-sync-debug",
             fileLocation = get<Context>().filesDir.path,
-            fileSystemManager = AndroidFileSystemManager(get<Context>().contentResolver),
+            fileManager = get(),
         )
     }
 

app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt

@@ -172,6 +172,8 @@ co.touchlab:stately-concurrent-collections:2.1.0
 co.touchlab:stately-strict-jvm:2.1.0
 co.touchlab:stately-strict:2.1.0
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt

@@ -174,6 +174,8 @@ co.touchlab:stately-strict:2.1.0
 com.android.billingclient:billing-ktx:7.1.1
 com.android.billingclient:billing:7.1.1
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt

@@ -177,6 +177,8 @@ co.touchlab:stately-concurrent-collections:2.1.0
 co.touchlab:stately-strict-jvm:2.1.0
 co.touchlab:stately-strict:2.1.0
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt

@@ -177,6 +177,8 @@ co.touchlab:stately-concurrent-collections:2.1.0
 co.touchlab:stately-strict-jvm:2.1.0
 co.touchlab:stately-strict:2.1.0
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt

@@ -177,6 +177,8 @@ co.touchlab:stately-concurrent-collections:2.1.0
 co.touchlab:stately-strict-jvm:2.1.0
 co.touchlab:stately-strict:2.1.0
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt

@@ -179,6 +179,8 @@ co.touchlab:stately-strict:2.1.0
 com.android.billingclient:billing-ktx:7.1.1
 com.android.billingclient:billing:7.1.1
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0

app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt

@@ -179,6 +179,8 @@ co.touchlab:stately-strict:2.1.0
 com.android.billingclient:billing-ktx:7.1.1
 com.android.billingclient:billing:7.1.1
 com.beetstra.jutf7:jutf7:1.0.0
+com.eygraber:uri-kmp-android:0.0.21
+com.eygraber:uri-kmp:0.0.21
 com.github.ByteHamster:SearchPreference:2.7.3
 com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0