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

fix storing videos on the SD card

This commit is contained in:
tibbi 2018-02-26 11:37:52 +01:00
parent 740a1e4e20
commit 6f8b6c4b49
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,22 +23,24 @@ fun Context.getOutputMediaFile(isPhoto: Boolean): String {
val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date()) val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
return if (isPhoto) { return if (isPhoto) {
"${mediaStorageDir.path}${File.separator}IMG_$timestamp.jpg" "${mediaStorageDir.path}/IMG_$timestamp.jpg"
} else { } else {
"${mediaStorageDir.path}${File.separator}VID_$timestamp.mp4" "${mediaStorageDir.path}/VID_$timestamp.mp4"
} }
} }
val Context.usableScreenSize: Point get() { val Context.usableScreenSize: Point
val size = Point() get() {
windowManager.defaultDisplay.getSize(size) val size = Point()
return size windowManager.defaultDisplay.getSize(size)
} return size
}
val Context.realScreenSize: Point get() { val Context.realScreenSize: Point
val size = Point() get() {
windowManager.defaultDisplay.getRealSize(size) val size = Point()
return size windowManager.defaultDisplay.getRealSize(size)
} return size
}
val Context.navBarHeight: Int get() = realScreenSize.y - usableScreenSize.y val Context.navBarHeight: Int get() = realScreenSize.y - usableScreenSize.y

5
app/src/main/kotlin/com/simplemobiletools/camera/views/Preview.kt
View File

@ -608,8 +608,9 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
// VIDEO RECORDING // VIDEO RECORDING
fun initRecorder(): Boolean { fun initRecorder(): Boolean {
if (mCamera == null || mRecorder != null || !mIsSurfaceCreated) if (mCamera == null || mRecorder != null || !mIsSurfaceCreated) {
return false return false
}
refreshPreview() refreshPreview()
mSwitchToVideoAsap = false mSwitchToVideoAsap = false
@ -680,7 +681,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
} }
try { try {
var document = mActivity!!.getDocumentFile(mCurrVideoPath) var document = mActivity!!.getDocumentFile(mCurrVideoPath.getParentPath())
if (document == null) { if (document == null) {
mActivity!!.toast(R.string.unknown_error_occurred) mActivity!!.toast(R.string.unknown_error_occurred)
return false return false