Skip to content

Commit 8a2fa29

Browse files
committed
add error message for OS/hardware camera failures
1 parent 3393e03 commit 8a2fa29

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

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

+22-18
Original file line numberDiff line numberDiff line change
@@ -1289,29 +1289,33 @@ class CamConfig(private val mActivity: MainActivity) {
12891289
mActivity.forceUpdateOrientationSensor()
12901290

12911291
try {
1292-
camera = cameraProvider!!.bindToLifecycle(
1293-
mActivity, cameraSelector,
1294-
useCaseGroupBuilder.build()
1295-
)
1296-
} catch (exception : IllegalArgumentException) {
1297-
if (isVideoMode) {
1298-
val newUseCaseGroupBuilder = UseCaseGroup.Builder()
1299-
videoCapture?.let {
1300-
newUseCaseGroupBuilder.addUseCase(it)
1301-
}
1302-
preview?.let {
1303-
newUseCaseGroupBuilder.addUseCase(it)
1304-
}
1305-
imageCapture = null
1306-
1292+
try {
13071293
camera = cameraProvider!!.bindToLifecycle(
13081294
mActivity, cameraSelector,
1309-
newUseCaseGroupBuilder.build()
1295+
useCaseGroupBuilder.build()
13101296
)
1297+
} catch (exception: IllegalArgumentException) {
1298+
if (isVideoMode) {
1299+
val newUseCaseGroupBuilder = UseCaseGroup.Builder()
1300+
videoCapture?.let {
1301+
newUseCaseGroupBuilder.addUseCase(it)
1302+
}
1303+
preview?.let {
1304+
newUseCaseGroupBuilder.addUseCase(it)
1305+
}
1306+
imageCapture = null
13111307

1312-
} else {
1313-
throw exception
1308+
camera = cameraProvider!!.bindToLifecycle(
1309+
mActivity, cameraSelector,
1310+
newUseCaseGroupBuilder.build()
1311+
)
1312+
} else {
1313+
throw exception
1314+
}
13141315
}
1316+
} catch (exception: IllegalArgumentException) {
1317+
mActivity.showMessage(mActivity.getString(R.string.bind_failure))
1318+
return
13151319
}
13161320

13171321
loadTabs()

app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,5 @@
112112
<string name="cancel">Cancel</string>
113113
<string name="no_image">Please capture a photo/video before trying to view them.</string>
114114

115-
115+
<string name="bind_failure">Failed to open camera due to an OS or hardware issue. Try rebooting.</string>
116116
</resources>

0 commit comments

Comments
 (0)