Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-22 04:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2886 from Aga-C/fix-image-resizing

Browse source 
Fixed exception on image resizing (#2883)
This commit is contained in:
Tibor Kaputa 2023-07-05 10:39:26 +02:00 committed by GitHub
commit d45c371217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ResizeMultipleImagesDialog.kt
View file

@ -87,7 +87,7 @@ class ResizeMultipleImagesDialog(
val lastModified = File(path).lastModified()
try {
resizeImage(path, size) {
resizeImage(path, path, size) {
if (it) {
pathsToRescan.add(path)
pathLastModifiedMap[path] = lastModified

12
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
View file

@ -799,7 +799,7 @@ fun BaseSimpleActivity.launchResizeImageDialog(path: String, callback: (() -> Un
val file = File(newPath)
val pathLastModifiedMap = mapOf(file.absolutePath to file.lastModified())
try {
resizeImage(newPath, newSize) { success ->
resizeImage(path, newPath, newSize) { success ->
if (success) {
toast(R.string.file_saved)
@ -822,17 +822,17 @@ fun BaseSimpleActivity.launchResizeImageDialog(path: String, callback: (() -> Un
}
}
fun BaseSimpleActivity.resizeImage(path: String, size: Point, callback: (success: Boolean) -> Unit) {
fun BaseSimpleActivity.resizeImage(oldPath: String, newPath: String, size: Point, callback: (success: Boolean) -> Unit) {
var oldExif: ExifInterface? = null
if (isNougatPlus()) {
val inputStream = contentResolver.openInputStream(Uri.fromFile(File(path)))
val inputStream = contentResolver.openInputStream(Uri.fromFile(File(oldPath)))
oldExif = ExifInterface(inputStream!!)
}
val newBitmap = Glide.with(applicationContext).asBitmap().load(path).submit(size.x, size.y).get()
val newBitmap = Glide.with(applicationContext).asBitmap().load(oldPath).submit(size.x, size.y).get()
val newFile = File(path)
val newFileDirItem = FileDirItem(path, path.getFilenameFromPath())
val newFile = File(newPath)
val newFileDirItem = FileDirItem(newPath, newPath.getFilenameFromPath())
getFileOutputStream(newFileDirItem, true) { out ->
if (out != null) {
out.use {