* Fix for older devices reporting wrong camera (Android 5.0)

thecowan · Aug 10, 2018 · efa556c · efa556c
1 parent 6932d65
commit efa556c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/WallPanelApp/build.gradle b/WallPanelApp/build.gradle
@@ -29,7 +29,7 @@ repositories {
 def versionMajor = 0
 def versionMinor = 8
 def versionPatch = 3
-def versionBuild = 0 // bump for dog food builds, public betas, etc.
+def versionBuild = 1 // bump for dog food builds, public betas, etc.
 
 android {
     kapt {

diff --git a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/modules/CameraReader.kt b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/modules/CameraReader.kt
@@ -144,9 +144,9 @@ constructor(private val context: Context) {
                     Timber.e(e.message)
                     try {
                         if(configuration.cameraId == CAMERA_FACING_FRONT) {
-                            initCamera(CAMERA_FACING_FRONT, configuration.cameraFPS)
-                        } else {
                             initCamera(CAMERA_FACING_BACK, configuration.cameraFPS)
+                        } else {
+                            initCamera(CAMERA_FACING_FRONT, configuration.cameraFPS)
                         }
                     } catch (e : IOException) {
                         Timber.e(e.message)
@@ -172,9 +172,9 @@ constructor(private val context: Context) {
                     override fun onCameraError() {
                         Timber.e("Camera Preview Error")
                         cameraSource = if(configuration.cameraId == CAMERA_FACING_FRONT) {
-                            initCameraPreview(CAMERA_FACING_FRONT, configuration.cameraFPS)
-                        } else {
                             initCameraPreview(CAMERA_FACING_BACK, configuration.cameraFPS)
+                        } else {
+                            initCameraPreview(CAMERA_FACING_FRONT, configuration.cameraFPS)
                         }
                         if(cameraPreview != null) {
                             try {
@@ -211,9 +211,9 @@ constructor(private val context: Context) {
                     override fun onCameraError() {
                         Timber.e("Camera Preview Error")
                         cameraSource = if(configuration.cameraId == CAMERA_FACING_FRONT) {
-                            initCameraPreview(CAMERA_FACING_FRONT, configuration.cameraFPS)
-                        } else {
                             initCameraPreview(CAMERA_FACING_BACK, configuration.cameraFPS)
+                        } else {
+                            initCameraPreview(CAMERA_FACING_FRONT, configuration.cameraFPS)
                         }
                         if(cameraPreview != null) {
                             try {