Use unified storage location for local source

(cherry picked from commit cf9e60fd92b3cea9ab4a48a3b8f62329df388e8d)

# Conflicts:
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt

app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt

@@ -30,6 +30,7 @@ import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 import nl.adaptivity.xmlutil.XmlDeclMode
 import nl.adaptivity.xmlutil.core.XmlVersion
 import nl.adaptivity.xmlutil.serialization.XML
+import tachiyomi.core.provider.AndroidStorageFolderProvider
 import tachiyomi.data.AndroidDatabaseHandler
 import tachiyomi.data.Database
 import tachiyomi.data.DatabaseHandler
@@ -151,7 +152,8 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { ImageSaver(app) }
 
-        addSingletonFactory { LocalSourceFileSystem(app) }
+        addSingletonFactory { AndroidStorageFolderProvider(app) }
+        addSingletonFactory { LocalSourceFileSystem(get<AndroidStorageFolderProvider>()) }
         addSingletonFactory { LocalCoverManager(app, get()) }
 
         // SY -->

app/src/main/java/eu/kanade/tachiyomi/di/PreferenceModule.kt

@@ -54,9 +54,6 @@ class PreferenceModule(val app: Application) : InjektModule {
         addSingletonFactory {
             BackupPreferences(get())
         }
-        addSingletonFactory {
-            AndroidStorageFolderProvider(app)
-        }
         addSingletonFactory {
             StoragePreferences(
                 folderProvider = get<AndroidStorageFolderProvider>(),