Fix possible OOM's

core/crash/src/main/java/ru/tech/imageresizershrinker/core/crash/presentation/screenLogic/CrashComponent.kt

@@ -56,11 +56,9 @@ class CrashComponent @AssistedInject internal constructor(
 
     fun shareLogs() {
         componentScope.launch {
-            shareProvider.shareData(
+            shareProvider.shareUri(
-                writeData = {
+                uri = settingsManager.createLogsExport(),
-                    it.writeBytes(settingsManager.createLogsExport())
+                onComplete = {}
-                },
-                filename = settingsManager.createLogsFilename()
             )
         }
     }

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidShareProvider.kt

@@ -128,7 +128,7 @@ internal class AndroidShareProvider @Inject constructor(
                 )
                 onComplete()
             }.onFailure {
-                val uri = cacheData(
+                val newUri = cacheData(
                     writeData = {
                         it.copyFrom(
                             UriReadable(
@@ -143,7 +143,7 @@ internal class AndroidShareProvider @Inject constructor(
                         )
                 )
                 shareUriImpl(
-                    uri = uri ?: return@onFailure,
+                    uri = newUri ?: return@onFailure,
                     type = type
                 )
                 onComplete()

core/settings/src/main/java/ru/tech/imageresizershrinker/core/settings/domain/SettingsInteractor.kt

@@ -221,13 +221,11 @@ interface SettingsInteractor : SimpleSettingsInteractor {
 
     suspend fun removeCustomFont(font: DomainFontFamily.Custom)
 
-    suspend fun createCustomFontsExport(): ByteArray
+    suspend fun createCustomFontsExport(): String?
 
     suspend fun toggleEnableToolExitConfirmation()
 
-    suspend fun createLogsExport(): ByteArray
+    suspend fun createLogsExport(): String
-
-    fun createLogsFilename(): String
 }
 
 fun SettingsInteractor.toSimpleSettingsInteractor(): SimpleSettingsInteractor =

feature/apng-tools/src/main/java/ru/tech/imageresizershrinker/feature/apng_tools/data/AndroidApngConverter.kt

@@ -34,6 +34,7 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 import oupson.apng.decoder.ApngDecoder
 import oupson.apng.encoder.ApngEncoder
+import ru.tech.imageresizershrinker.core.data.utils.outputStream
 import ru.tech.imageresizershrinker.core.domain.dispatchers.DispatchersHolder
 import ru.tech.imageresizershrinker.core.domain.image.ImageGetter
 import ru.tech.imageresizershrinker.core.domain.image.ImageScaler
@@ -46,13 +47,12 @@ import ru.tech.imageresizershrinker.core.domain.model.IntegerSize
 import ru.tech.imageresizershrinker.core.domain.utils.runSuspendCatching
 import ru.tech.imageresizershrinker.feature.apng_tools.domain.ApngConverter
 import ru.tech.imageresizershrinker.feature.apng_tools.domain.ApngParams
-import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 
 
 internal class AndroidApngConverter @Inject constructor(
     private val imageGetter: ImageGetter<Bitmap>,
-    private val imageShareProvider: ShareProvider<Bitmap>,
+    private val shareProvider: ShareProvider<Bitmap>,
     private val imageScaler: ImageScaler<Bitmap>,
     @ApplicationContext private val context: Context,
     dispatchersHolder: DispatchersHolder
@@ -71,7 +71,7 @@ internal class AndroidApngConverter @Inject constructor(
                 currentCoroutineContext().cancel(null)
                 return@decodeAsync
             }
-            imageShareProvider.cacheImage(
+            shareProvider.cacheImage(
                 image = frame,
                 imageInfo = ImageInfo(
                     width = frame.width,
@@ -88,8 +88,7 @@ internal class AndroidApngConverter @Inject constructor(
         params: ApngParams,
         onFailure: (Throwable) -> Unit,
         onProgress: () -> Unit
-    ): ByteArray? = withContext(defaultDispatcher) {
+    ): String? = withContext(defaultDispatcher) {
-        val out = ByteArrayOutputStream()
         val size = params.size ?: imageGetter.getImage(data = imageUris[0])!!.run {
             IntegerSize(width, height)
         }
@@ -99,8 +98,10 @@ internal class AndroidApngConverter @Inject constructor(
             return@withContext null
         }
 
+        shareProvider.cacheData(
+            writeData = { writeable ->
                 val encoder = ApngEncoder(
-            outputStream = out,
+                    outputStream = writeable.outputStream(),
                     width = size.width,
                     height = size.height,
                     numberOfFrames = imageUris.size
@@ -134,8 +135,9 @@ internal class AndroidApngConverter @Inject constructor(
                     onProgress()
                 }
                 encoder.writeEnd()
-
+            },
-        out.toByteArray()
+            filename = "temp_apng.png"
+        )
     }
 
     override suspend fun convertApngToJxl(

feature/apng-tools/src/main/java/ru/tech/imageresizershrinker/feature/apng_tools/domain/ApngConverter.kt

@@ -34,7 +34,7 @@ interface ApngConverter {
         params: ApngParams,
         onFailure: (Throwable) -> Unit,
         onProgress: () -> Unit
-    ): ByteArray?
+    ): String?
 
     suspend fun convertApngToJxl(
         apngUris: List<String>,

feature/apng-tools/src/main/java/ru/tech/imageresizershrinker/feature/apng_tools/presentation/screenLogic/ApngToolsComponent.kt

@@ -108,7 +108,7 @@ class ApngToolsComponent @AssistedInject internal constructor(
     private val _jxlQuality: MutableState<Quality.Jxl> = mutableStateOf(Quality.Jxl())
     val jxlQuality by _jxlQuality
 
-    private var apngData: ByteArray? = null
+    private var _outputApngUri: String? = null
 
     fun setType(type: Screen.ApngTools.Type) {
         when (type) {
@@ -166,7 +166,7 @@ class ApngToolsComponent @AssistedInject internal constructor(
         collectionJob = null
         _type.update { null }
         _convertedImageUris.update { emptyList() }
-        apngData = null
+        _outputApngUri = null
         savingJob = null
         updateParams(ApngParams.Default)
         registerChangesCleared()
@@ -191,14 +191,14 @@ class ApngToolsComponent @AssistedInject internal constructor(
     ) {
         savingJob = componentScope.launch {
             _isSaving.value = true
-            apngData?.let { byteArray ->
+            _outputApngUri?.let { apngUri ->
-                fileController.writeBytes(
+                fileController.transferBytes(
-                    uri = uri.toString(),
+                    fromUri = apngUri,
-                    block = { it.writeBytes(byteArray) }
+                    toUri = uri.toString(),
                 ).also(onResult).onSuccess(::registerSave)
             }
             _isSaving.value = false
-            apngData = null
+            _outputApngUri = null
         }
     }
 
@@ -267,7 +267,7 @@ class ApngToolsComponent @AssistedInject internal constructor(
 
                 is Screen.ApngTools.Type.ImageToApng -> {
                     _left.value = type.imageUris?.size ?: -1
-                    apngData = type.imageUris?.map { it.toString() }?.let { list ->
+                    _outputApngUri = type.imageUris?.map { it.toString() }?.let { list ->
                         apngConverter.createApngFromImageUris(
                             imageUris = list,
                             params = params,
@@ -441,13 +441,8 @@ class ApngToolsComponent @AssistedInject internal constructor(
                                 _done.update { it + 1 }
                             },
                             onFailure = {}
-                        )?.also { byteArray ->
+                        )?.also { uri ->
-                            shareProvider.cacheByteArray(
+                            onComplete(listOf(uri.toUri()))
-                                byteArray = byteArray,
-                                filename = "APNG_${timestamp()}.png"
-                            )?.let {
-                                onComplete(listOf(it.toUri()))
-                            }
                         }
                     }
                 }

feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/data/AndroidSettingsManager.kt

@@ -18,6 +18,7 @@
 package ru.tech.imageresizershrinker.feature.settings.data
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.graphics.Typeface
 import androidx.core.net.toFile
 import androidx.core.net.toUri
@@ -27,6 +28,7 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import com.t8rin.logger.Logger
 import com.t8rin.logger.makeLog
+import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -37,9 +39,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import ru.tech.imageresizershrinker.core.data.utils.getFilename
 import ru.tech.imageresizershrinker.core.data.utils.isInstalledFromPlayStore
+import ru.tech.imageresizershrinker.core.data.utils.outputStream
 import ru.tech.imageresizershrinker.core.domain.BackupFileExtension
 import ru.tech.imageresizershrinker.core.domain.GlobalStorageName
 import ru.tech.imageresizershrinker.core.domain.dispatchers.DispatchersHolder
+import ru.tech.imageresizershrinker.core.domain.image.ShareProvider
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageScaleMode
 import ru.tech.imageresizershrinker.core.domain.image.model.ResizeType
 import ru.tech.imageresizershrinker.core.domain.model.ColorModel
@@ -151,7 +155,6 @@ import ru.tech.imageresizershrinker.feature.settings.data.keys.USE_RANDOM_EMOJIS
 import ru.tech.imageresizershrinker.feature.settings.data.keys.VIBRATION_STRENGTH
 import ru.tech.imageresizershrinker.feature.settings.data.keys.toSettingsState
 import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.util.zip.ZipEntry
@@ -162,6 +165,7 @@ import kotlin.random.Random
 internal class AndroidSettingsManager @Inject constructor(
     @ApplicationContext private val context: Context,
     private val dataStore: DataStore<Preferences>,
+    private val shareProvider: Lazy<ShareProvider<Bitmap>>,
     dispatchersHolder: DispatchersHolder,
 ) : DispatchersHolder by dispatchersHolder, SettingsManager {
 
@@ -225,9 +229,9 @@ internal class AndroidSettingsManager @Inject constructor(
         it[APP_COLOR_TUPLE] = colorTuple
     }
 
-    override suspend fun setPresets(newPresets: List<Int>) = edit {
+    override suspend fun setPresets(newPresets: List<Int>) = edit { preferences ->
         if (newPresets.size > 3) {
-            it[PRESETS] = newPresets
+            preferences[PRESETS] = newPresets
                 .map { it.coerceIn(10..500) }
                 .toSortedSet()
                 .toList()
@@ -454,13 +458,15 @@ internal class AndroidSettingsManager @Inject constructor(
         it[INITIAL_OCR_MODE] ?: 1
     }
 
-    override suspend fun createLogsExport(): ByteArray = withContext(ioDispatcher) {
+    override suspend fun createLogsExport(): String = withContext(ioDispatcher) {
         "Start Logs Export".makeLog("SettingsManager")
 
         val logsFile = Logger.getLogsFile().toFile()
         val settingsFile = createBackupFile()
 
-        val out = ByteArrayOutputStream()
+        shareProvider.get().cacheData(
+            writeData = { writeable ->
+                val out = writeable.outputStream()
 
                 ZipOutputStream(out).use { zipOut ->
                     FileInputStream(logsFile).use { fis ->
@@ -476,12 +482,11 @@ internal class AndroidSettingsManager @Inject constructor(
                         zipOut.closeEntry()
                     }
                 }
-
+            },
-        out.toByteArray()
+            filename = "image_toolbox_logs_${timestamp()}.zip"
+        ) ?: ""
     }
 
-    override fun createLogsFilename(): String = "image_toolbox_logs_${timestamp()}.zip"
-
     override suspend fun setScreensWithBrightnessEnforcement(data: String) = edit {
         it[SCREENS_WITH_BRIGHTNESS_ENFORCEMENT] = data
     }
@@ -561,8 +566,8 @@ internal class AndroidSettingsManager @Inject constructor(
 
     override suspend fun setOneTimeSaveLocations(
         value: List<OneTimeSaveLocation>
-    ) = edit {
+    ) = edit { preferences ->
-        it[ONE_TIME_SAVE_LOCATIONS] = value.filter {
+        preferences[ONE_TIME_SAVE_LOCATIONS] = value.filter {
             it.uri.isNotEmpty() && it.date != null
         }.distinctBy { it.uri }.joinToString(", ")
     }
@@ -570,7 +575,7 @@ internal class AndroidSettingsManager @Inject constructor(
     override suspend fun toggleRecentColor(
         color: ColorModel,
         forceExclude: Boolean,
-    ) = edit {
+    ) = edit { preferences ->
         val current = currentSettings.recentColors
         val newColors = if (color in current) {
             if (forceExclude) {
@@ -582,13 +587,13 @@ internal class AndroidSettingsManager @Inject constructor(
             listOf(color) + current
         }
 
-        it[RECENT_COLORS] = newColors.take(30).map { it.colorInt.toString() }.toSet()
+        preferences[RECENT_COLORS] = newColors.take(30).map { it.colorInt.toString() }.toSet()
     }
 
     override suspend fun toggleFavoriteColor(
         color: ColorModel,
         forceExclude: Boolean
-    ) = edit {
+    ) = edit { preferences ->
         val current = currentSettings.favoriteColors
         val newColors = if (color in current) {
             if (forceExclude) {
@@ -600,7 +605,7 @@ internal class AndroidSettingsManager @Inject constructor(
             listOf(color) + current
         }
 
-        it[FAVORITE_COLORS] = newColors.map { it.colorInt.toString() }.joinToString("/")
+        preferences[FAVORITE_COLORS] = newColors.joinToString("/") { it.colorInt.toString() }
     }
 
     override suspend fun toggleOpenEditInsteadOfPreview() = toggle(
@@ -668,7 +673,7 @@ internal class AndroidSettingsManager @Inject constructor(
             current + screenId
         }
 
-        it[FAVORITE_SCREENS] = newScreens.joinToString("/") { it.toString() }
+        it[FAVORITE_SCREENS] = newScreens.joinToString("/")
     }
 
     override suspend fun toggleIsLinkPreviewEnabled() = toggle(
@@ -698,8 +703,8 @@ internal class AndroidSettingsManager @Inject constructor(
         it[IS_TELEGRAM_GROUP_OPENED] = true
     }
 
-    override suspend fun setDefaultResizeType(resizeType: ResizeType) = edit {
+    override suspend fun setDefaultResizeType(resizeType: ResizeType) = edit { preferences ->
-        it[DEFAULT_RESIZE_TYPE] = ResizeType.entries.indexOfFirst {
+        preferences[DEFAULT_RESIZE_TYPE] = ResizeType.entries.indexOfFirst {
             it::class.isInstance(resizeType)
         }
     }
@@ -742,8 +747,8 @@ internal class AndroidSettingsManager @Inject constructor(
     override suspend fun toggleSettingsGroupVisibility(
         key: Int,
         value: Boolean
-    ) = edit {
+    ) = edit { preferences ->
-        it[SETTINGS_GROUP_VISIBILITY] =
+        preferences[SETTINGS_GROUP_VISIBILITY] =
             currentSettings.settingGroupsInitialVisibility.toMutableMap().run {
                 this[key] = value
                 map {
@@ -758,8 +763,8 @@ internal class AndroidSettingsManager @Inject constructor(
 
     override suspend fun updateFavoriteColors(
         colors: List<ColorModel>
-    ) = edit {
+    ) = edit { preferences ->
-        it[FAVORITE_COLORS] = colors.map { it.colorInt.toString() }.joinToString("/")
+        preferences[FAVORITE_COLORS] = colors.joinToString("/") { it.colorInt.toString() }
     }
 
     override suspend fun setBackgroundColorForNoAlphaFormats(
@@ -832,10 +837,10 @@ internal class AndroidSettingsManager @Inject constructor(
         setCustomFonts(currentSettings.customFonts - font)
     }
 
-    override suspend fun createCustomFontsExport(): ByteArray = withContext(ioDispatcher) {
+    override suspend fun createCustomFontsExport(): String? = withContext(ioDispatcher) {
-        val out = ByteArrayOutputStream()
+        shareProvider.get().cacheData(
-
+            writeData = { writeable ->
-        ZipOutputStream(out).use { zipOut ->
+                ZipOutputStream(writeable.outputStream()).use { zipOut ->
                     val dir = File(context.filesDir, "customFonts")
                     dir.listFiles()?.forEach { file ->
                         FileInputStream(file).use { fis ->
@@ -846,8 +851,9 @@ internal class AndroidSettingsManager @Inject constructor(
                         }
                     }
                 }
-
+            },
-        out.toByteArray()
+            filename = "fonts_export.zip"
+        )
     }
 
     override suspend fun toggleEnableToolExitConfirmation() = toggle(
@@ -863,7 +869,7 @@ internal class AndroidSettingsManager @Inject constructor(
         this[key] = !value
     }
 
-    suspend fun toggle(
+    private suspend fun toggle(
         key: Preferences.Key<Boolean>,
         defaultValue: Boolean,
     ) = edit {
@@ -873,7 +879,7 @@ internal class AndroidSettingsManager @Inject constructor(
         )
     }
 
-    suspend fun edit(
+    private suspend fun edit(
         transform: suspend (MutablePreferences) -> Unit
     ) {
         dataStore.edit(transform)

feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/screenLogic/SettingsComponent.kt

@@ -248,9 +248,9 @@ class SettingsComponent @AssistedInject internal constructor(
         uri: Uri,
         onResult: (SaveResult) -> Unit,
     ) = settingsScope {
-        fileController.writeBytes(
+        fileController.transferBytes(
-            uri = uri.toString(),
+            fromUri = createCustomFontsExport().toString(),
-            block = { it.writeBytes(createCustomFontsExport()) }
+            toUri = uri.toString()
         ).also(onResult)
     }
 
@@ -466,11 +466,9 @@ class SettingsComponent @AssistedInject internal constructor(
     fun toggleEnableToolExitConfirmation() = settingsScope { toggleEnableToolExitConfirmation() }
 
     fun shareLogs() = settingsScope {
-        shareProvider.shareData(
+        shareProvider.shareUri(
-            writeData = {
+            uri = settingsManager.createLogsExport(),
-                it.writeBytes(settingsManager.createLogsExport())
+            onComplete = {}
-            },
-            filename = settingsManager.createLogsFilename()
         )
     }