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

properly save the file in an uri, if it is provided by a third party intent

This commit is contained in:
tibbi 2017-09-21 21:04:53 +02:00
parent 5c2e2b83b4
commit 1b01fce15b
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt
View File

@ -7,7 +7,6 @@ import android.media.ExifInterface
import android.net.Uri import android.net.Uri
import android.os.AsyncTask import android.os.AsyncTask
import android.os.Environment import android.os.Environment
import android.util.Log
import com.simplemobiletools.camera.activities.MainActivity import com.simplemobiletools.camera.activities.MainActivity
import com.simplemobiletools.camera.extensions.compensateDeviceRotation import com.simplemobiletools.camera.extensions.compensateDeviceRotation
import com.simplemobiletools.camera.extensions.config import com.simplemobiletools.camera.extensions.config
@ -19,19 +18,9 @@ import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import java.io.File import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.IOException
import java.io.OutputStream import java.io.OutputStream
import java.lang.ref.WeakReference
class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId: Int, val deviceOrientation: Int) : AsyncTask<ByteArray, Void, String>() { class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId: Int, val deviceOrientation: Int) : AsyncTask<ByteArray, Void, String>() {
companion object {
private val TAG = PhotoProcessor::class.java.simpleName
private var mActivity: WeakReference<MainActivity>? = null
}
init {
mActivity = WeakReference(activity)
}
override fun doInBackground(vararg params: ByteArray): String { override fun doInBackground(vararg params: ByteArray): String {
var fos: OutputStream? = null var fos: OutputStream? = null
@ -59,7 +48,11 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
document = document?.createFile("", path.substring(path.lastIndexOf('/') + 1)) document = document?.createFile("", path.substring(path.lastIndexOf('/') + 1))
fos = activity.contentResolver.openOutputStream(document?.uri) fos = activity.contentResolver.openOutputStream(document?.uri)
} else { } else {
fos = FileOutputStream(photoFile) fos = if (uri == null) {
FileOutputStream(photoFile)
} else {
activity.contentResolver.openOutputStream(uri)
}
} }
var image = BitmapFactory.decodeByteArray(data, 0, data.size) var image = BitmapFactory.decodeByteArray(data, 0, data.size)
@ -79,13 +72,9 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
fos?.close() fos?.close()
return photoFile.absolutePath return photoFile.absolutePath
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "PhotoProcessor file not found: $e") activity.showErrorToast(e)
} finally { } finally {
try {
fos?.close() fos?.close()
} catch (e: IOException) {
Log.e(TAG, "PhotoProcessor close ioexception $e")
}
} }
return "" return ""
@ -100,6 +89,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
val matrix = Matrix() val matrix = Matrix()
matrix.setRotate(degree.toFloat()) matrix.setRotate(degree.toFloat())
try { try {
return Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true) return Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true)
} catch (e: OutOfMemoryError) { } catch (e: OutOfMemoryError) {
@ -110,7 +100,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
override fun onPostExecute(path: String) { override fun onPostExecute(path: String) {
super.onPostExecute(path) super.onPostExecute(path)
mActivity?.get()?.mediaSaved(path) activity.mediaSaved(path)
} }
interface MediaSavedListener { interface MediaSavedListener {