fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fixed exception on image resizing (#2883)
This commit is contained in:
Tibor Kaputa 2023-07-05 10:39:26 +02:00 committed by GitHub
parent 7e090a30e1 ad5d192fb1
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() val lastModified = File(path).lastModified()
try { try {
resizeImage(path, size) { resizeImage(path, path, size) {
if (it) { if (it) {
pathsToRescan.add(path) pathsToRescan.add(path)
pathLastModifiedMap[path] = lastModified 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 file = File(newPath)
val pathLastModifiedMap = mapOf(file.absolutePath to file.lastModified()) val pathLastModifiedMap = mapOf(file.absolutePath to file.lastModified())
try { try {
resizeImage(newPath, newSize) { success -> resizeImage(path, newPath, newSize) { success ->
if (success) { if (success) {
toast(R.string.file_saved) 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 var oldExif: ExifInterface? = null
if (isNougatPlus()) { if (isNougatPlus()) {
val inputStream = contentResolver.openInputStream(Uri.fromFile(File(path))) val inputStream = contentResolver.openInputStream(Uri.fromFile(File(oldPath)))
oldExif = ExifInterface(inputStream!!) 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 newFile = File(newPath)
val newFileDirItem = FileDirItem(path, path.getFilenameFromPath()) val newFileDirItem = FileDirItem(newPath, newPath.getFilenameFromPath())
getFileOutputStream(newFileDirItem, true) { out -> getFileOutputStream(newFileDirItem, true) { out ->
if (out != null) { if (out != null) {
out.use { out.use {