Save to MediaStore/Downloads (#61)

* Save to MediaStore/Downloads - Patch 1

* Save to MediaStore/Downloads - Patch 2

* Save to MediaStore/Downloads - Patch 3

* Save to MediaStore/Downloads - Patch 4

* Save to MediaStore/Downloads - Patch 5

Author: ShiftHackZ

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -10,6 +11,15 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="31"
+        tools:ignore="ScopedStorage" />
+
     <application
         android:name=".AiStableDiffusionClientApp"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/com/shifthackz/aisdv1/app/AiStableDiffusionClientApp.kt

@@ -1,6 +1,8 @@
 package com.shifthackz.aisdv1.app
 
 import android.app.Application
+import android.os.StrictMode
+import android.os.StrictMode.VmPolicy
 import com.shifthackz.aisdv1.app.di.featureModule
 import com.shifthackz.aisdv1.app.di.preferenceModule
 import com.shifthackz.aisdv1.app.di.providersModule
@@ -17,10 +19,12 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import timber.log.Timber
 
+
 class AiStableDiffusionClientApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        StrictMode.setVmPolicy(VmPolicy.Builder().build())
         initializeKoin()
         initializeLogging()
     }

app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt

@@ -7,8 +7,8 @@ import com.shifthackz.aisdv1.core.common.appbuild.BuildVersion
 import com.shifthackz.aisdv1.core.common.file.FileProviderDescriptor
 import com.shifthackz.aisdv1.core.common.links.LinksProvider
 import com.shifthackz.aisdv1.core.common.schedulers.SchedulersProvider
-import com.shifthackz.aisdv1.domain.authorization.AuthorizationCredentials
-import com.shifthackz.aisdv1.domain.authorization.AuthorizationStore
+import com.shifthackz.aisdv1.domain.feature.auth.AuthorizationCredentials
+import com.shifthackz.aisdv1.domain.feature.auth.AuthorizationStore
 import com.shifthackz.aisdv1.domain.preference.PreferenceManager
 import com.shifthackz.aisdv1.network.qualifiers.ApiUrlProvider
 import com.shifthackz.aisdv1.network.qualifiers.CredentialsProvider

app/src/main/res/xml/file_provider_paths.xml

@@ -10,4 +10,5 @@
 
     <external-path name="media" path="." />
     <external-path name="external_files" path="."/>
+    <external-path name="external" path="."/>
 </paths>

core/common/build.gradle

@@ -10,6 +10,7 @@ android {
 }
 
 dependencies {
+    implementation androidx.core
     implementation di.koinCore
     implementation reactive.rxjava
     implementation log.timber

…/aisdv1/core/extensions/UriExtensions.kt …/core/common/extensions/UriExtensions.ktcore/ui/src/main/java/com/shifthackz/aisdv1/core/extensions/UriExtensions.kt renamed to core/common/src/main/java/com/shifthackz/aisdv1/core/common/extensions/UriExtensions.kt core/ui/src/main/java/com/shifthackz/aisdv1/core/extensions/UriExtensions.kt renamed to core/common/src/main/java/com/shifthackz/aisdv1/core/common/extensions/UriExtensions.kt

@@ -1,13 +1,20 @@
-package com.shifthackz.aisdv1.core.extensions
+package com.shifthackz.aisdv1.core.common.extensions
 
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.core.content.FileProvider
 import java.io.File
 
 private const val APP_MARKET_PACKAGE = "com.shifthackz.aisdv1.app"
 
+@ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S_V2)
+fun shouldUseNewMediaStore(): Boolean {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2
+}
+
 fun Context.uriFromFile(file: File, fileProviderPath: String): Uri {
     return FileProvider.getUriForFile(this, fileProviderPath, file)
 }

core/ui/build.gradle

@@ -16,6 +16,7 @@ android {
 }
 
 dependencies {
+    api project(":core:common")
     api platform(androidx.composeBom)
     api androidx.composeRuntime
     api androidx.composeMaterial3

core/ui/src/main/java/com/shifthackz/aisdv1/core/sharing/SharingExtensions.kt

@@ -3,7 +3,7 @@ package com.shifthackz.aisdv1.core.sharing
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import com.shifthackz.aisdv1.core.extensions.uriFromFile
+import com.shifthackz.aisdv1.core.common.extensions.uriFromFile
 import java.io.File
 
 fun Context.shareText(

data/data.gradle

@@ -17,6 +17,7 @@ dependencies {
     implementation project(":network")
     implementation project(":storage")
     implementation di.koinCore
+    implementation di.koinAndroid
     implementation reactive.rxkotlin
     implementation google.gson
 }

data/src/main/java/com/shifthackz/aisdv1/data/core/CoreGenerationRepository.kt

@@ -1,19 +1,23 @@
 package com.shifthackz.aisdv1.data.core
 
+import com.shifthackz.aisdv1.core.imageprocessing.Base64ToBitmapConverter
 import com.shifthackz.aisdv1.domain.datasource.GenerationResultDataSource
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
+import com.shifthackz.aisdv1.domain.gateway.MediaStoreGateway
 import com.shifthackz.aisdv1.domain.preference.PreferenceManager
 import io.reactivex.rxjava3.core.Single
 
 internal abstract class CoreGenerationRepository(
+    mediaStoreGateway: MediaStoreGateway,
+    base64ToBitmapConverter: Base64ToBitmapConverter,
     private val localDataSource: GenerationResultDataSource.Local,
     private val preferenceManager: PreferenceManager,
-) {
+) : CoreMediaStoreRepository(preferenceManager, mediaStoreGateway, base64ToBitmapConverter) {
 
     protected fun insertGenerationResult(ai: AiGenerationResult): Single<AiGenerationResult> {
         if (!preferenceManager.autoSaveAiResults) return Single.just(ai)
         return localDataSource
             .insert(ai)
-            .map { id -> ai.copy(id) }
+            .flatMap { id -> exportToMediaStore(ai).andThen(Single.just(ai.copy(id))) }
     }
 }