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

updating the way photos are rotated and saved

Browse source
This commit is contained in:
tibbi 2017-11-01 23:38:19 +01:00
parent 0cc2c3d8f1
commit b72686cefd
2 changed files with 66 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,8 +46,8 @@ import com.simplemobiletools.gallery.models.Medium
import kotlinx.android.synthetic.main.activity_medium.* import kotlinx.android.synthetic.main.activity_medium.*
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.FileOutputStream
import java.util.* import java.util.*
class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, ViewPagerFragment.FragmentListener { class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, ViewPagerFragment.FragmentListener {
@ -454,33 +454,42 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
SaveAsDialog(this, currPath, false) { SaveAsDialog(this, currPath, false) {
Thread({ Thread({
toast(R.string.saving) toast(R.string.saving)
val selectedFile = File(it) if (it.isJpg() && !isPathOnSD(it)) {
val tmpFile = File(selectedFile.parent, ".tmp_${it.getFilenameFromPath()}") if (it == currPath) {
rotateFileByExif(it)
runOnUiThread {
(getCurrentFragment() as? PhotoFragment)?.refreshBitmap()
}
} else {
copyFile(currPath, it)
rotateFileByExif(it)
}
} else {
rotateFileByDegrees(currPath, it)
}
}).start()
}
}
private fun rotateFileByDegrees(sourcePath: String, destinationPath: String) {
val tmpFile = File(File(destinationPath).parent, ".tmp_${destinationPath.getFilenameFromPath()}")
try { try {
val bitmap = BitmapFactory.decodeFile(currPath)
getFileOutputStream(tmpFile) { getFileOutputStream(tmpFile) {
if (it == null) { if (it == null) {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)
deleteFile(tmpFile) {}
return@getFileOutputStream return@getFileOutputStream
} }
if (currPath.isJpg()) { val bitmap = BitmapFactory.decodeFile(sourcePath)
saveRotation(currPath, tmpFile)
} else {
saveFile(tmpFile, bitmap, it as FileOutputStream) saveFile(tmpFile, bitmap, it as FileOutputStream)
}
if (needsStupidWritePermissions(selectedFile.absolutePath)) {
deleteFile(selectedFile) {}
}
renameFile(tmpFile, selectedFile) {
deleteFile(tmpFile) {}
}
it.flush() it.flush()
it.close() it.close()
val destination = File(destinationPath)
deleteFile(destination) {
renameFile(tmpFile, destination) {}
}
toast(R.string.file_saved) toast(R.string.file_saved)
mRotationDegrees = 0f mRotationDegrees = 0f
invalidateOptionsMenu() invalidateOptionsMenu()
@ -492,8 +501,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
showErrorToast(e) showErrorToast(e)
deleteFile(tmpFile) {} deleteFile(tmpFile) {}
} }
}).start()
}
} }
private fun saveFile(file: File, bitmap: Bitmap, out: FileOutputStream) { private fun saveFile(file: File, bitmap: Bitmap, out: FileOutputStream) {
@ -503,25 +510,34 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
bmp.compress(file.getCompressionFormat(), 90, out) bmp.compress(file.getCompressionFormat(), 90, out)
} }
private fun saveRotation(input: String, out: File) { private fun copyFile(sourcePath: String, destinationPath: String) {
var inputStream: FileInputStream? = null var inputStream: FileInputStream? = null
var outputStream: FileOutputStream? = null var outputStream: FileOutputStream? = null
try { try {
inputStream = FileInputStream(input) inputStream = FileInputStream(sourcePath)
outputStream = FileOutputStream(out) outputStream = FileOutputStream(destinationPath)
inputStream.copyTo(outputStream) inputStream.copyTo(outputStream)
scanPath(destinationPath) {}
} catch (ignored: FileNotFoundException) { } catch (ignored: FileNotFoundException) {
} finally { } finally {
inputStream?.close() inputStream?.close()
outputStream?.close() outputStream?.close()
} }
if (out.exists()) { }
val exif = ExifInterface(out.absolutePath)
var orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL) private fun rotateFileByExif(path: String) {
var orientationDegrees = (degreesForRotation(orientation) + mRotationDegrees) % 360 val exif = ExifInterface(path)
val orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
val orientationDegrees = (degreesForRotation(orientation) + mRotationDegrees) % 360
exif.setAttribute(ExifInterface.TAG_ORIENTATION, rotationFromDegrees(orientationDegrees)) exif.setAttribute(ExifInterface.TAG_ORIENTATION, rotationFromDegrees(orientationDegrees))
exif.saveAttributes() exif.saveAttributes()
if (!config.keepLastModified) {
File(getCurrentPath()).setLastModified(System.currentTimeMillis())
} }
mRotationDegrees = 0f
invalidateOptionsMenu()
toast(R.string.file_saved)
} }
private fun degreesForRotation(orientation: Int) = when (orientation) { private fun degreesForRotation(orientation: Int) = when (orientation) {

5
app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
View file

@ -322,4 +322,9 @@ class PhotoFragment : ViewPagerFragment() {
} }
} }
} }
fun refreshBitmap() {
view.subsampling_view.beGone()
loadBitmap()
}
} }