conditional statements were joined incorrectly, now camera popup shou…

…ld only appear when camera is in use AND video settings appear incorrect. (#33)
opensensorhub · Sep 15, 2021 · 76fa2a1 · 76fa2a1
1 parent 10d44e0
commit 76fa2a1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
@@ -450,7 +450,10 @@ public void onClick(DialogInterface dialog, int whichButton)
                 AndroidSensorsConfig androidSensorConfig = (AndroidSensorsConfig) sensorhubConfig.get("ANDROID_SENSORS");
                 VideoEncoderConfig videoConfig = androidSensorConfig.videoConfig;
 
-                if ((androidSensorConfig.activateBackCamera || androidSensorConfig.activateFrontCamera) && videoConfig.selectedPreset < 0 || videoConfig.selectedPreset >= videoConfig.presets.length) {
+                boolean cameraInUse = (androidSensorConfig.activateBackCamera || androidSensorConfig.activateFrontCamera);
+                boolean improperVideoSettings = (videoConfig.selectedPreset < 0 || videoConfig.selectedPreset >= videoConfig.presets.length);
+
+                if (cameraInUse && improperVideoSettings) {
                     showVideoConfigErrorPopup();
                     newStatusMessage("Video Config Error: Check Settings");
                 } else {