From 91e00d897f190ec6ab5330f7b3f43d6d7f3e57fb Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 8 Jan 2021 19:43:52 +0530 Subject: app: cleanup how we handle menu item presses (#1275) Fixes #1274 Signed-off-by: Harsh Shandilya --- app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt | 4 +++- .../main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/crypto') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt index 8f36cd25..739d18a1 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt @@ -60,6 +60,7 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + supportActionBar?.setDisplayHomeAsUpEnabled(true) bindToOpenKeychain(this) title = name with(binding) { @@ -100,8 +101,9 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { R.id.edit_password -> editPassword() R.id.share_password_as_plaintext -> shareAsPlaintext() R.id.copy_password -> copyPasswordToClipboard(passwordEntry?.password) + else -> return super.onOptionsItemSelected(item) } - return super.onOptionsItemSelected(item) + return true } override fun onBound(service: IOpenPgpService2) { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt index 2ddcc8b8..a6385e7a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt @@ -135,6 +135,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + supportActionBar?.setDisplayHomeAsUpEnabled(true) bindToOpenKeychain(this) title = if (editing) getString(R.string.edit_password) @@ -232,7 +233,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB when (item.itemId) { android.R.id.home -> { setResult(RESULT_CANCELED) - finish() + onBackPressed() } R.id.save_password -> { copy = false -- cgit v1.2.3