From 03fb7f3537077fbed3d973007470536f1ef949da Mon Sep 17 00:00:00 2001 From: Michael Specht <15450970+michaelspecht@users.noreply.github.com> Date: Thu, 7 Jan 2021 17:36:55 -0500 Subject: [PATCH] do not log errors, as they are alreayd logged by the camera engine, and do not put try catch around DNG captures --- .../picture/Full1PictureRecorder.java | 5 ----- .../picture/Full2PictureRecorder.java | 22 ++++++++----------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java index 84d7cf8d..45b6edbe 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java @@ -99,11 +99,6 @@ public class Full1PictureRecorder extends FullPictureRecorder { ); LOG.i("take() returned."); } catch (Exception e) { - String msg = "Error"; - if (e.getMessage() != null) { - msg = e.getMessage(); - } - Log.e("onTakePicture:", msg); mError = e; dispatchResult(); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java index be5a20e6..1c95543b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java @@ -87,24 +87,20 @@ public class Full2PictureRecorder extends FullPictureRecorder public void onCaptureCompleted(@NonNull ActionHolder holder, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) { - super.onCaptureCompleted(holder, request, result); try { - if (mResult.format == PictureFormat.DNG) { - mDngCreator = new DngCreator(holder.getCharacteristics(this), result); - mDngCreator.setOrientation(ExifHelper.getExifOrientation(mResult.rotation)); - if (mResult.location != null) { - mDngCreator.setLocation(mResult.location); - } - } + super.onCaptureCompleted(holder, request, result); } catch (Exception e) { - String msg = "Error"; - if (e.getMessage() != null) { - msg = e.getMessage(); - } - Log.e("onCaptureCompleted:", msg); mError = e; dispatchResult(); } + + if (mResult.format == PictureFormat.DNG) { + mDngCreator = new DngCreator(holder.getCharacteristics(this), result); + mDngCreator.setOrientation(ExifHelper.getExifOrientation(mResult.rotation)); + if (mResult.location != null) { + mDngCreator.setLocation(mResult.location); + } + } } }; }