Skip to content

Commit f6520dd

Browse files
t895thestinger
authored andcommitted
Fix broken back button press
1 parent 11cff0e commit f6520dd

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt

+2-7
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,6 @@ open class MainActivity : AppCompatActivity(),
507507
}
508508

509509
override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
510-
if (keyCode == KeyEvent.KEYCODE_BACK) {
511-
finish()
512-
return true
513-
}
514-
515510
// there are no camera controls in qr mode
516511
if (camConfig.isQRMode) {
517512
return super.onKeyUp(keyCode, event)
@@ -535,15 +530,15 @@ open class MainActivity : AppCompatActivity(),
535530
cameraControl.zoomOut()
536531
}
537532
}
538-
return true
533+
return super.onKeyUp(keyCode, event)
539534
}
540535

541536
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
542537
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
543538
// Pretend as if the event was handled by the app (avoid volume bar from appearing)
544539
return true
545540
}
546-
return super.onKeyUp(keyCode, event)
541+
return super.onKeyDown(keyCode, event)
547542
}
548543

549544
override fun onResume() {

0 commit comments

Comments
 (0)