From 1ffcffae150806ceb970230f34dc53a49b6a0594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 8 Jul 2015 13:39:53 +0200 Subject: Do not ask for passphrase on delete --- .../org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 3d6ffb39c..122c30cad 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -95,9 +95,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints"; static final int REQUEST_QR_FINGERPRINT = 1; - static final int REQUEST_DELETE = 2; - static final int REQUEST_EXPORT = 3; - static final int REQUEST_CERTIFY = 4; + static final int REQUEST_EXPORT = 2; + static final int REQUEST_CERTIFY = 3; public static final String EXTRA_DISPLAY_RESULT = "display_result"; @@ -330,7 +329,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements return true; } case R.id.menu_key_view_delete: { - startPassphraseActivity(REQUEST_DELETE); + deleteKey(); return true; } case R.id.menu_key_view_advanced: { @@ -490,11 +489,6 @@ public class ViewKeyActivity extends BaseNfcActivity implements return; } - case REQUEST_DELETE: { - deleteKey(); - return; - } - case REQUEST_EXPORT: { exportToFile(mDataUri, mProviderHelper); return; -- cgit v1.2.3