Skip to content

Commit 10d44e0

Browse files
Improve implementation of the Video Config Error Popup (#32)
1 parent 92216c6 commit 10d44e0

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

sensorhub-android-app/src/org/sensorhub/android/MainActivity.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -448,20 +448,17 @@ public void onClick(DialogInterface dialog, int whichButton)
448448
updateConfig(PreferenceManager.getDefaultSharedPreferences(MainActivity.this), runName);
449449

450450
AndroidSensorsConfig androidSensorConfig = (AndroidSensorsConfig) sensorhubConfig.get("ANDROID_SENSORS");
451-
Log.d("OSH-DEBUG", androidSensorConfig.toString());
452451
VideoEncoderConfig videoConfig = androidSensorConfig.videoConfig;
453452

454-
if(videoConfig.selectedPreset >= 0 && videoConfig.selectedPreset < videoConfig.presets.length){
455-
Log.d("OSH-DEBUG", "TEST MESSAGE...");
456-
453+
if ((androidSensorConfig.activateBackCamera || androidSensorConfig.activateFrontCamera) && videoConfig.selectedPreset < 0 || videoConfig.selectedPreset >= videoConfig.presets.length) {
454+
showVideoConfigErrorPopup();
455+
newStatusMessage("Video Config Error: Check Settings");
456+
} else {
457457
sostClients.clear();
458458
boundService.startSensorHub(sensorhubConfig, showVideo, MainActivity.this);
459459

460460
if (boundService.hasVideo())
461461
mainInfoArea.setBackgroundColor(0x80FFFFFF);
462-
}else{
463-
showVideoConfigErrorPopup();
464-
newStatusMessage("Video Config Error: Check Settings");
465462
}
466463

467464
}

0 commit comments

Comments
 (0)