From fafcacf8083f98532d7d71a287b3e23de114b4a1 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 14 Oct 2019 15:56:44 +0100 Subject: [PATCH] Remove a couple more API version checks. --- .../briar/android/conversation/ImageActivity.java | 6 +----- .../briar/android/keyagreement/CameraView.java | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index a6b2559d2..5da18922d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java @@ -171,11 +171,7 @@ public class ImageActivity extends BriarActivity viewModel.setToolbarPosition( appBarLayout.getTop(), appBarLayout.getBottom() ); - if (SDK_INT >= 16) { - layout.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } else { - layout.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } + layout.getViewTreeObserver().removeOnGlobalLayoutListener(this); } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java index a9a9a8a95..bbb027939 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java @@ -35,7 +35,6 @@ import static android.hardware.Camera.Parameters.FOCUS_MODE_FIXED; import static android.hardware.Camera.Parameters.FOCUS_MODE_MACRO; import static android.hardware.Camera.Parameters.SCENE_MODE_AUTO; import static android.hardware.Camera.Parameters.SCENE_MODE_BARCODE; -import static android.os.Build.VERSION.SDK_INT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; @@ -415,10 +414,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback, } catch (RuntimeException e) { throw new CameraException(e); } - if (SDK_INT >= 15) { - LOG.info("Video stabilisation enabled: " - + params.getVideoStabilization()); - } + LOG.info("Video stabilisation enabled: " + + params.getVideoStabilization()); LOG.info("Scene mode: " + params.getSceneMode()); LOG.info("Focus mode: " + params.getFocusMode()); LOG.info("Flash mode: " + params.getFlashMode());