From fab62ee3b8b96fa6d32df439fe07cd01fa9189f7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 21 Apr 2020 22:21:27 +0200 Subject: [PATCH] fix saving files on some SD cards --- .../com/simplemobiletools/camera/helpers/PhotoProcessor.kt | 2 +- .../com/simplemobiletools/camera/views/AutoFitTextureView.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt index a7f1785e..65219f4d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt @@ -56,7 +56,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr } var document = activity.getDocumentFile(path.getParentPath()) - document = document?.createFile("", path.substring(path.lastIndexOf('/') + 1)) + document = document?.createFile("", path.substring(path.lastIndexOf('/') + 1)) ?: activity.getDocumentFile(path) if (document == null) { activity.toast(R.string.save_error_internal_storage) return "" diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/AutoFitTextureView.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/AutoFitTextureView.kt index ec20a370..6e2399c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/AutoFitTextureView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/AutoFitTextureView.kt @@ -3,7 +3,6 @@ package com.simplemobiletools.camera.views import android.content.Context import android.util.AttributeSet import android.view.TextureView -import android.view.View // taken from the official Camera2 sample at https://github.com/googlesamples/android-Camera2Basic class AutoFitTextureView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) : TextureView(context, attrs, defStyle) { @@ -23,8 +22,8 @@ class AutoFitTextureView @JvmOverloads constructor(context: Context, attrs: Attr override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, heightMeasureSpec) - val width = View.MeasureSpec.getSize(widthMeasureSpec) - val height = View.MeasureSpec.getSize(heightMeasureSpec) + val width = MeasureSpec.getSize(widthMeasureSpec) + val height = MeasureSpec.getSize(heightMeasureSpec) if (mRatioWidth == 0 || mRatioHeight == 0) { setMeasuredDimension(width, height)