Fixed NullPointerExceptions (in particular related to headset plug-in)

jeisfeld · Sep 11, 2017 · df93704 · df93704
1 parent 4b8a621
commit df93704
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ugendiagnoseLib/src/main/java/de/jeisfeld/augendiagnoselib/activities/CameraActivity.java b/...ugendiagnoseLib/src/main/java/de/jeisfeld/augendiagnoselib/activities/CameraActivity.java
@@ -794,7 +794,13 @@ private void registerHeadsetReceiver() {
 			mHeadsetPlugReceiver.register(this, new HeadsetPlugReceiver.HeadsetPlugHandler() {
 				@Override
 				public void handleHeadsetPlug(final boolean plugged) {
-					configureFlashlightButton();
+					try {
+						configureFlashlightButton();
+					}
+					catch (Exception e) {
+						TrackingUtil.sendException("hea1", e);
+						return;
+					}
 					if (plugged && mCurrentFlashlightMode != FlashMode.EXT) {
 						DialogUtil.displayConfirmationMessage(CameraActivity.this, new ConfirmDialogListener() {
 							private static final long serialVersionUID = 1L;

diff --git a/...Idea/augendiagnoseLib/src/main/java/de/jeisfeld/augendiagnoselib/util/Camera2Handler.java b/...Idea/augendiagnoseLib/src/main/java/de/jeisfeld/augendiagnoselib/util/Camera2Handler.java
@@ -773,7 +773,7 @@ private void unlockFocus() {
 			mState = CameraState.STATE_PREVIEW;
 			mCaptureSession.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler);
 		}
-		catch (CameraAccessException | IllegalStateException e) {
+		catch (CameraAccessException | IllegalStateException | NullPointerException e) {
 			mCameraCallback.onCameraError("Failed to unlock focus", "unl1", e);
 		}
 	}