From ef517ecc41a5d9d3db094712a7edbfc453da0473 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 6 Jan 2025 01:29:05 -0500 Subject: [PATCH] Fix broken back button press --- .../app/grapheneos/camera/ui/activities/MainActivity.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt index 8ed86a25..6d875dd3 100644 --- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt +++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt @@ -507,11 +507,6 @@ open class MainActivity : AppCompatActivity(), } override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean { - if (keyCode == KeyEvent.KEYCODE_BACK) { - finish() - return true - } - // there are no camera controls in qr mode if (camConfig.isQRMode) { return super.onKeyUp(keyCode, event) @@ -535,7 +530,7 @@ open class MainActivity : AppCompatActivity(), cameraControl.zoomOut() } } - return true + return super.onKeyUp(keyCode, event) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { @@ -543,7 +538,7 @@ open class MainActivity : AppCompatActivity(), // Pretend as if the event was handled by the app (avoid volume bar from appearing) return true } - return super.onKeyUp(keyCode, event) + return super.onKeyDown(keyCode, event) } override fun onResume() {