Merge pull request googlesamples#21 from michaelcarrano/kotlin-vision…

…-quickstart-fix Fix bindPreviewUseCase() in CameraXLivePreviewActivity.kt to match Java implementation
mrapaul · Jun 19, 2020 · bcb7c51 · bcb7c51
2 parents c66c440 + 4a178b1
commit bcb7c51
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...start/app/src/main/java/com/google/mlkit/vision/demo/kotlin/CameraXLivePreviewActivity.kt b/...start/app/src/main/java/com/google/mlkit/vision/demo/kotlin/CameraXLivePreviewActivity.kt
@@ -264,19 +264,19 @@ class CameraXLivePreviewActivity :
     }
 
     private fun bindPreviewUseCase() {
+        if (!PreferenceUtils.isCameraLiveViewportEnabled(this)) {
+            return
+        }
         if (cameraProvider == null) {
             return
         }
         if (previewUseCase != null) {
             cameraProvider!!.unbind(previewUseCase)
         }
+
         previewUseCase = Preview.Builder().build()
-        val camera =
-                cameraProvider!!.bindToLifecycle(
-                        /* lifecycleOwner= */this,
-                        cameraSelector!!, previewUseCase
-                )
         previewUseCase!!.setSurfaceProvider(previewView!!.createSurfaceProvider())
+        cameraProvider!!.bindToLifecycle(/* lifecycleOwner= */this, cameraSelector!!, previewUseCase)
     }
 
     @SuppressLint("NewApi")