From 51c55811d634f182fed6ee53e8cb4cbf4f0b3784 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 16 Feb 2020 22:19:49 +0100 Subject: [PATCH] do some preparations for target SDK 29 --- .../camera/helpers/Config.kt | 4 +-- .../camera/helpers/PhotoProcessor.kt | 4 +-- .../camera/views/CameraPreview.kt | 34 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt index d52c6cfb..6679a39c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/Config.kt @@ -17,7 +17,7 @@ class Config(context: Context) : BaseConfig(context) { path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() savePhotosFolder = path } - return path + return path!! } set(path) = prefs.edit().putString(SAVE_PHOTOS, path).apply() @@ -42,7 +42,7 @@ class Config(context: Context) : BaseConfig(context) { set(flipPhotos) = prefs.edit().putBoolean(FLIP_PHOTOS, flipPhotos).apply() var lastUsedCamera: String - get() = prefs.getString(LAST_USED_CAMERA, "0") + get() = prefs.getString(LAST_USED_CAMERA, "0")!! set(cameraId) = prefs.edit().putString(LAST_USED_CAMERA, cameraId).apply() var initPhotoMode: Boolean 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 74e7a55f..a7f1785e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt @@ -30,7 +30,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr val path: String try { path = if (saveUri != null) { - saveUri.path + saveUri.path!! } else { activity.getOutputMediaFile(true) } @@ -124,7 +124,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr val documentFile = activity.getSomeDocumentFile(path) if (documentFile != null) { val parcelFileDescriptor = activity.contentResolver.openFileDescriptor(documentFile.uri, "rw") - val fileDescriptor = parcelFileDescriptor.fileDescriptor + val fileDescriptor = parcelFileDescriptor!!.fileDescriptor ExifInterface(fileDescriptor) } else { null diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt index e90d80cd..cee49a8c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt @@ -239,8 +239,8 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { } private fun handleZoom(event: MotionEvent) { - val maxZoom = getCameraCharacteristics().get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) * 10 - val sensorRect = getCameraCharacteristics(mCameraId).get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) + val maxZoom = getCameraCharacteristics().get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM)!! * 10 + val sensorRect = getCameraCharacteristics(mCameraId).get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)!! val currentFingerSpacing = getFingerSpacing(event) if (mZoomFingerSpacing != 0f) { if (currentFingerSpacing > mZoomFingerSpacing && maxZoom > mZoomLevel) { @@ -260,7 +260,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { mZoomRect = Rect(cropWidth, cropHeight, sensorRect.width() - cropWidth, sensorRect.height() - cropHeight) mPreviewRequestBuilder!!.set(CaptureRequest.SCALER_CROP_REGION, mZoomRect) mPreviewRequest = mPreviewRequestBuilder!!.build() - mCaptureSession!!.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) + mCaptureSession!!.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler) } mZoomFingerSpacing = currentFingerSpacing } @@ -284,7 +284,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { } private fun getCurrentResolution(): MySize { - val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP) + val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)!! val resIndex = if (mUseFrontCamera) { if (mIsInVideoMode) { mActivity.config.frontVideoResIndex @@ -322,7 +322,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { mCameraId = cameraId mActivity.config.lastUsedCamera = mCameraId - val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP) + val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)!! val currentResolution = getCurrentResolution() if (mIsInVideoMode) { @@ -372,7 +372,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { characteristics.apply { mIsFlashSupported = get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ?: false mIsZoomSupported = get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 0f > 0f - mIsFocusSupported = get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES).size > 1 + mIsFocusSupported = get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES)!!.size > 1 } mActivity.setFlashAvailable(mIsFlashSupported) mActivity.updateCameraIcon(mUseFrontCamera) @@ -465,7 +465,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { setFlashAndExposure(this) mPreviewRequest = build() } - mCaptureSession!!.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) + mCaptureSession!!.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler) } mCameraState = STATE_PREVIEW } catch (e: Exception) { @@ -495,7 +495,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { } private fun getFrameRange(): Range { - val ranges = getCameraCharacteristics().get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES) + val ranges = getCameraCharacteristics().get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)!! var currRangeSize = -1 var currMinRange = 0 var result: Range? = null @@ -599,7 +599,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { mActivity.toggleBottomButtons(false) } - override fun onCaptureFailed(session: CameraCaptureSession?, request: CaptureRequest?, failure: CaptureFailure?) { + override fun onCaptureFailed(session: CameraCaptureSession, request: CaptureRequest, failure: CaptureFailure) { super.onCaptureFailed(session, request, failure) mActivity.toggleBottomButtons(false) } @@ -640,9 +640,9 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { // touch-to-focus inspired by OpenCamera val characteristics = getCameraCharacteristics() - if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) { + if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF)!! >= 1) { val focusArea = getFocusArea(x, y) - val sensorRect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) + val sensorRect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)!! val meteringRect = convertAreaToMeteringRectangle(sensorRect, focusArea) set(CaptureRequest.CONTROL_AF_REGIONS, arrayOf(meteringRect)) } @@ -746,7 +746,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { mCaptureSession?.capture(build(), mCaptureCallback, mBackgroundHandler) } mCameraState = STATE_PREVIEW - mCaptureSession?.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) + mCaptureSession?.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler) if (mLastFocusX != 0f && mLastFocusY != 0f) { focusArea(mLastFocusX, mLastFocusY, false) @@ -784,7 +784,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { Uri.fromFile(File(mLastVideoPath)) } - val fileDescriptor = context.contentResolver.openFileDescriptor(uri, "w").fileDescriptor + val fileDescriptor = context.contentResolver.openFileDescriptor(uri, "w")!!.fileDescriptor val rotation = mActivity.windowManager.defaultDisplay.rotation mMediaRecorder!!.apply { @@ -839,7 +839,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { } val captureCallback = object : CameraCaptureSession.StateCallback() { - override fun onConfigured(session: CameraCaptureSession?) { + override fun onConfigured(session: CameraCaptureSession) { mCaptureSession = session updatePreview() mIsRecording = true @@ -850,7 +850,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { mCameraState = STATE_RECORDING } - override fun onConfigureFailed(session: CameraCaptureSession?) { + override fun onConfigureFailed(session: CameraCaptureSession) { mCameraState = STATE_PREVIEW } } @@ -917,7 +917,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { private fun openResolutionsDialog(openVideoResolutions: Boolean) { val oldResolution = getCurrentResolution() - val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP) + val configMap = getCameraCharacteristics().get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)!! val photoResolutions = configMap.getOutputSizes(ImageFormat.JPEG).map { MySize(it.width, it.height) } as ArrayList val videoResolutions = getAvailableVideoSizes(configMap).map { MySize(it.width, it.height) } as ArrayList ChangeResolutionDialog(mActivity, mUseFrontCamera, photoResolutions, videoResolutions, openVideoResolutions) { @@ -994,7 +994,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview { try { setFlashAndExposure(mPreviewRequestBuilder!!) mPreviewRequest = mPreviewRequestBuilder!!.build() - mCaptureSession?.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) + mCaptureSession?.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler) mActivity.updateFlashlightState(mFlashlightState) } catch (e: Exception) { }