PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

Merge pull request #443 from ltGuillaume/patch-1

Browse source 
Adding handleSAFDialog for EXIF rotation
This commit is contained in:
Tibor Kaputa 2017-11-07 23:55:42 +01:00 committed by GitHub
commit 6bc3e4cfa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View file

@ -456,41 +456,43 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
val currPath = getCurrentPath() val currPath = getCurrentPath()
SaveAsDialog(this, currPath, false) { SaveAsDialog(this, currPath, false) {
Thread({ Thread({
toast(R.string.saving)
val selectedFile = File(it) val selectedFile = File(it)
val tmpFile = File(filesDir, ".tmp_${it.getFilenameFromPath()}") handleSAFDialog(selectedFile) {
try { toast(R.string.saving)
val bitmap = BitmapFactory.decodeFile(currPath) val tmpFile = File(filesDir, ".tmp_${it.getFilenameFromPath()}")
getFileOutputStream(tmpFile) { try {
if (it == null) { val bitmap = BitmapFactory.decodeFile(currPath)
toast(R.string.unknown_error_occurred) getFileOutputStream(tmpFile) {
return@getFileOutputStream if (it == null) {
} toast(R.string.unknown_error_occurred)
return@getFileOutputStream
}
if (currPath.isJpg()) { if (currPath.isJpg()) {
saveRotation(getCurrentFile(), tmpFile) saveRotation(getCurrentFile(), tmpFile)
} else { } else {
saveFile(tmpFile, bitmap, it as FileOutputStream) saveFile(tmpFile, bitmap, it as FileOutputStream)
} }
if (tmpFile.length() > 0 && selectedFile.exists()) { if (tmpFile.length() > 0 && selectedFile.exists()) {
deleteFile(selectedFile) {} deleteFile(selectedFile) {}
} }
copyFile(tmpFile, selectedFile) copyFile(tmpFile, selectedFile)
scanPath(selectedFile.absolutePath) {} scanPath(selectedFile.absolutePath) {}
toast(R.string.file_saved) toast(R.string.file_saved)
it.flush() it.flush()
it.close() it.close()
mRotationDegrees = 0f mRotationDegrees = 0f
invalidateOptionsMenu() invalidateOptionsMenu()
}
} catch (e: OutOfMemoryError) {
toast(R.string.out_of_memory_error)
} catch (e: Exception) {
showErrorToast(e)
} finally {
deleteFile(tmpFile) {}
} }
} catch (e: OutOfMemoryError) {
toast(R.string.out_of_memory_error)
} catch (e: Exception) {
showErrorToast(e)
} finally {
deleteFile(tmpFile) {}
} }
}).start() }).start()
} }