Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Remove a couple more API version checks.

Browse Source
This commit is contained in:
akwizgran
2019-10-14 15:56:44 +01:00
parent 234bdf686e
commit fafcacf808
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View File

@@ -171,11 +171,7 @@ public class ImageActivity extends BriarActivity
viewModel.setToolbarPosition( viewModel.setToolbarPosition(
appBarLayout.getTop(), appBarLayout.getBottom() appBarLayout.getTop(), appBarLayout.getBottom()
); );
if (SDK_INT >= 16) { layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
} else {
layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
}
} }
@Override @Override

7
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
View File

@@ -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.FOCUS_MODE_MACRO;
import static android.hardware.Camera.Parameters.SCENE_MODE_AUTO; import static android.hardware.Camera.Parameters.SCENE_MODE_AUTO;
import static android.hardware.Camera.Parameters.SCENE_MODE_BARCODE; 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.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@@ -415,10 +414,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
} catch (RuntimeException e) { } catch (RuntimeException e) {
throw new CameraException(e); throw new CameraException(e);
} }
if (SDK_INT >= 15) { LOG.info("Video stabilisation enabled: "
LOG.info("Video stabilisation enabled: " + params.getVideoStabilization());
+ params.getVideoStabilization());
}
LOG.info("Scene mode: " + params.getSceneMode()); LOG.info("Scene mode: " + params.getSceneMode());
LOG.info("Focus mode: " + params.getFocusMode()); LOG.info("Focus mode: " + params.getFocusMode());
LOG.info("Flash mode: " + params.getFlashMode()); LOG.info("Flash mode: " + params.getFlashMode());