null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Invalid uri formatting

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-05-27 10:07:00 +07:00
parent 1ca453b966
commit ad7a45b933
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
View file

@ -11,6 +11,7 @@ import coil3.request.ImageRequest
import coil3.request.SuccessResult
import com.hippo.unifile.UniFile
import dev.yokai.domain.storage.StorageManager
import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.database.DatabaseHelper
@ -728,7 +729,7 @@ class MangaDetailsPresenter(
try {
val uri = saveCover(destDir)
withUIContext {
view?.shareManga(uri.toFile())
view?.shareManga(uri.uri.toFile())
}
} catch (_: java.lang.Exception) {
}
@ -850,7 +851,7 @@ class MangaDetailsPresenter(
return try {
val destDir = UniFile.fromFile(coverCache.context.cacheDir)!!.createDirectory("shared_image")!!
val file = saveCover(destDir)
file
file.uri
} catch (e: Exception) {
null
}
@ -863,15 +864,16 @@ class MangaDetailsPresenter(
} else {
storageManager.getCoversDirectory()!!
}
val uri = saveCover(directory)
DiskUtil.scanMedia(preferences.context, uri.toFile())
val file = saveCover(directory)
DiskUtil.scanMedia(preferences.context, file)
true
} catch (e: Exception) {
if (BuildConfig.DEBUG) e.printStackTrace()
false
}
}
private fun saveCover(directory: UniFile): Uri {
private fun saveCover(directory: UniFile): UniFile {
val cover = coverCache.getCustomCoverFile(manga).takeIf { it.exists() } ?: coverCache.getCoverFile(manga)
val type = ImageUtil.findImageType(cover.inputStream())
?: throw Exception("Not an image")
@ -885,7 +887,7 @@ class MangaDetailsPresenter(
input.copyTo(output)
}
}
return destFile.uri
return destFile
}
fun isTracked(): Boolean =

9
app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
View file

@ -68,11 +68,18 @@ object DiskUtil {
val nomedia = dir.findFile(".nomedia")
if (nomedia == null) {
dir.createFile(".nomedia")
context?.let { scanMedia(it, dir.filePath) }
context?.let { scanMedia(it, dir) }
}
}
}
/**
* Scans the given file so that it can be shown in gallery apps, for example.
*/
fun scanMedia(context: Context, file: UniFile) {
scanMedia(context, file.filePath)
}
/**
* Scans the given file so that it can be shown in gallery apps, for example.
*/