replace !! operator with null safe ?

Author: empratyush

app/src/main/java/app/grapheneos/camera/CamConfig.kt

@@ -231,7 +231,7 @@ class CamConfig(private val mActivity: MainActivity) {
 
     var latestUri: Uri? = null
 
-    val mPlayer: TunePlayer = TunePlayer(mActivity)
+    val mPlayer: TunePlayer by lazy { TunePlayer(mActivity.applicationContext) }
 
     private val commonPref = when (mActivity) {
         is SecureMainActivity -> {
@@ -271,7 +271,7 @@ class CamConfig(private val mActivity: MainActivity) {
         private set
 
     val isFlashAvailable: Boolean
-        get() = camera!!.cameraInfo.hasFlashUnit()
+        get() = camera?.cameraInfo?.hasFlashUnit() ?: false
 
     var isTorchOn: Boolean = false
         get() {
@@ -1027,10 +1027,8 @@ class CamConfig(private val mActivity: MainActivity) {
     }
 
     fun updatePreview() {
-
-        if (latestUri == null) return
-
-        if (isVideo(latestUri!!)) {
+        val uri = latestUri ?: return
+        if (isVideo(uri)) {
             try {
                 mActivity.imagePreview.setImageBitmap(
                     getVideoThumbnail(mActivity, latestUri)
@@ -1161,7 +1159,7 @@ class CamConfig(private val mActivity: MainActivity) {
             .requireLensFacing(lensFacing)
             .build()
 
-        return cameraProvider!!.hasCamera(tCameraSelector)
+        return cameraProvider?.hasCamera(tCameraSelector) ?: false
     }
 
     // Start the camera with latest hard configuration
@@ -1197,7 +1195,7 @@ class CamConfig(private val mActivity: MainActivity) {
         mActivity.updateLastFrame()
 
         // Unbind/close all other camera(s) [if any]
-        cameraProvider!!.unbindAll()
+        cameraProvider?.unbindAll()
 
         if (extensionsManager.isExtensionAvailable(cameraSelector, extensionMode)) {
             cameraSelector = extensionsManager.getExtensionEnabledCameraSelector(
@@ -1210,18 +1208,19 @@ class CamConfig(private val mActivity: MainActivity) {
         val useCaseGroupBuilder = UseCaseGroup.Builder()
 
         if (isQRMode) {
-            qrAnalyzer = QRAnalyzer(mActivity)
+            val analyzer = QRAnalyzer(mActivity)
+            val mIAnalyzer = ImageAnalysis.Builder()
+                .setTargetResolution(Size(960, 960))
+                .setOutputImageRotationEnabled(true)
+                .build()
+            qrAnalyzer = analyzer
             mActivity.startFocusTimer()
-            iAnalyzer =
-                ImageAnalysis.Builder()
-                    .setTargetResolution(Size(960, 960))
-                    .setOutputImageRotationEnabled(true)
-                    .build()
-            iAnalyzer!!.setAnalyzer(cameraExecutor, qrAnalyzer!!)
+            iAnalyzer = mIAnalyzer
+            mIAnalyzer.setAnalyzer(cameraExecutor, analyzer)
             cameraSelector = CameraSelector.Builder()
                 .requireLensFacing(CameraSelector.LENS_FACING_BACK)
                 .build()
-            useCaseGroupBuilder.addUseCase(iAnalyzer!!)
+            useCaseGroupBuilder.addUseCase(mIAnalyzer)
 
         } else {
             if (isVideoMode) {
@@ -1281,9 +1280,11 @@ class CamConfig(private val mActivity: MainActivity) {
             .setTargetAspectRatio(aspectRatio)
             .build()
 
-        useCaseGroupBuilder.addUseCase(preview!!)
+        preview?.let {
+            useCaseGroupBuilder.addUseCase(it)
+        }
 
-        preview!!.setSurfaceProvider(mActivity.previewView.surfaceProvider)
+        preview?.setSurfaceProvider(mActivity.previewView.surfaceProvider)
 
         mActivity.forceUpdateOrientationSensor()
 
@@ -1295,8 +1296,12 @@ class CamConfig(private val mActivity: MainActivity) {
         } catch (exception : IllegalArgumentException) {
             if (isVideoMode) {
                 val newUseCaseGroupBuilder = UseCaseGroup.Builder()
-                newUseCaseGroupBuilder.addUseCase(videoCapture!!)
-                newUseCaseGroupBuilder.addUseCase(preview!!)
+                videoCapture?.let {
+                    newUseCaseGroupBuilder.addUseCase(it)
+                }
+                preview?.let {
+                    newUseCaseGroupBuilder.addUseCase(it)
+                }
                 imageCapture = null
 
                 camera = cameraProvider!!.bindToLifecycle(
@@ -1311,15 +1316,15 @@ class CamConfig(private val mActivity: MainActivity) {
 
         loadTabs()
 
-        camera!!.cameraInfo.zoomState.observe(mActivity) {
+        camera?.cameraInfo?.zoomState?.observe(mActivity) {
             if (it.linearZoom != 0f) {
                 mActivity.zoomBar.updateThumb()
             }
         }
 
         mActivity.zoomBar.updateThumb(false)
 
-        mActivity.exposureBar.setExposureConfig(camera!!.cameraInfo.exposureState)
+        camera?.cameraInfo?.exposureState?.let { mActivity.exposureBar.setExposureConfig(it) }
 
         mActivity.settingsDialog.torchToggle.isChecked = false
 

app/src/main/java/app/grapheneos/camera/TunePlayer.kt

@@ -1,20 +1,20 @@
 package app.grapheneos.camera
 
+import android.content.Context
 import android.media.MediaPlayer
-import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.MainActivity.Companion.camConfig
 
-class TunePlayer(mActivity: MainActivity) {
+class TunePlayer(context: Context) {
 
-    private val shutterPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.image_shot)
+    private val shutterPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.image_shot)
 
-    private val fSPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.focus_start)
+    private val fSPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.focus_start)
 
-    private val tIPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.timer_increment)
-    private val tCPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.timer_final_second)
+    private val tIPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.timer_increment)
+    private val tCPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.timer_final_second)
 
-    private val vRecPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.video_start)
-    private val vStopPlayer: MediaPlayer = MediaPlayer.create(mActivity, R.raw.video_stop)
+    private val vRecPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.video_start)
+    private val vStopPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.video_stop)
 
     private fun shouldNotPlayTune(): Boolean {
         return !camConfig.enableCameraSounds

app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt

@@ -200,9 +200,10 @@ class ImageCapturer(private val mActivity: MainActivity) {
                         mActivity.capturedFilePaths.add(0, camConfig.latestUri.toString())
                     }
 
-                    fixExif(mActivity, camConfig.latestUri!!)
-
-                    clearExif(mActivity, camConfig.latestUri!!)
+                    camConfig.latestUri?.let {
+                        fixExif(mActivity, it)
+                        clearExif(mActivity, it)
+                    }
 
                     mActivity.previewLoader.visibility = View.GONE
                     camConfig.updatePreview()

app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt

@@ -11,10 +11,10 @@ import android.os.Looper
 import android.provider.MediaStore
 import android.view.View
 import android.webkit.MimeTypeMap
-import androidx.camera.video.Recording
 import androidx.camera.video.FileDescriptorOutputOptions
 import androidx.camera.video.MediaStoreOutputOptions
 import androidx.camera.video.PendingRecording
+import androidx.camera.video.Recording
 import androidx.camera.video.VideoRecordEvent
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -25,10 +25,10 @@ import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.MainActivity.Companion.camConfig
 import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
+import java.io.FileNotFoundException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import java.io.FileNotFoundException
 
 class VideoCapturer(private val mActivity: MainActivity) {
 
@@ -88,7 +88,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
         handler.removeCallbacks(runnable)
     }
 
-    private fun genPendingRecording(): PendingRecording {
+    private fun genPendingRecording(): PendingRecording? {
         var fileName: String
         val sdf = SimpleDateFormat(
             "yyyyMMdd_HHmmss",
@@ -112,15 +112,16 @@ class VideoCapturer(private val mActivity: MainActivity) {
             && mActivity.isOutputUriAvailable()
         ) {
 
-            return camConfig.videoCapture!!.output.prepareRecording(
+            val fd = mActivity.contentResolver.openFileDescriptor(
+                mActivity.outputUri,
+                "w"
+            ) ?: return null
+
+            return camConfig.videoCapture?.output?.prepareRecording(
                 mActivity,
                 FileDescriptorOutputOptions
-                    .Builder(
-                        mActivity.contentResolver.openFileDescriptor(
-                            mActivity.outputUri,
-                            "w"
-                        )!!
-                    ).build()
+                    .Builder(fd)
+                    .build()
             )
 
         } else {
@@ -185,7 +186,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
                 )
                 == PackageManager.PERMISSION_GRANTED
             ) {
-                pendingRecording.withAudioEnabled()
+                pendingRecording?.withAudioEnabled()
             } else {
                 mActivity.requestAudioPermission()
                 return
@@ -194,7 +195,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
 
         beforeRecordingStarts()
 
-        recording = pendingRecording.start(
+        recording = pendingRecording?.start(
             ContextCompat.getMainExecutor(mActivity)
         ) {
             if (it is VideoRecordEvent.Finalize) {