diff --git a/app/src/main/java/rocks/poopjournal/morse/MainActivity.java b/app/src/main/java/rocks/poopjournal/morse/MainActivity.java index a9a9402..4393e58 100644 --- a/app/src/main/java/rocks/poopjournal/morse/MainActivity.java +++ b/app/src/main/java/rocks/poopjournal/morse/MainActivity.java @@ -513,7 +513,7 @@ protected void onCreate(Bundle savedInstanceState) { if (!Build.MANUFACTURER.equals("HUAWEI")) { - camera = Camera.open(); + openCamera(); } @@ -528,10 +528,7 @@ protected void onCreate(Bundle savedInstanceState) { turnOff(); } } - - camera.release(); - camera = null; - + releaseCamera(); } } else { if (!TextUtils.isEmpty(input.getText().toString())) { @@ -561,8 +558,7 @@ protected void onCreate(Bundle savedInstanceState) { turnOff(); } } - camera.release(); - camera = null; + releaseCamera(); } } }); @@ -997,7 +993,7 @@ public void onAutoFocus(boolean b, Camera camera) { public void turnOn() { try { if (android.os.Build.MANUFACTURER.equals("HUAWEI")) { - camera = Camera.open(); + openCamera(); } Log.d("cameraMorseCheck","turning camera on at " + System.currentTimeMillis()); @@ -1234,7 +1230,7 @@ private boolean setKeySelectedForTelegraph(MotionEvent event) { telegraphPlayer.start(); } else { time = System.currentTimeMillis(); - camera = Camera.open(); + openCamera(); turnOn(); } return true; @@ -1255,14 +1251,12 @@ private boolean setKeySelectedForTelegraph(MotionEvent event) { if (System.currentTimeMillis() - time >= 200) { turnOff(); - camera.release(); - camera = null; + releaseCamera(); } else { final Handler handler = new Handler(Looper.getMainLooper()); handler.postDelayed(() -> { turnOff(); - camera.release(); - camera = null; + releaseCamera(); }, 100); } } @@ -1270,4 +1264,15 @@ private boolean setKeySelectedForTelegraph(MotionEvent event) { } return false; } + + private void openCamera() { + camera = Camera.open(); + } + + private void releaseCamera() { + if (camera != null) { + camera.release(); + camera = null; + } + } } diff --git a/build.gradle b/build.gradle index ff46107..e4e5bfd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19b1114..fe68ea7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jun 09 15:32:18 PKT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME