aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 13:39:53 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 13:39:53 +0200
commit1ffcffae150806ceb970230f34dc53a49b6a0594 (patch)
treecbc9336e48a3c7fcf1d2335069184dcb4ce5b66c /OpenKeychain
parentd4fbaf9397da725489c6b86341d9eb9db6c14bdb (diff)
downloadopen-keychain-1ffcffae150806ceb970230f34dc53a49b6a0594.tar.gz
open-keychain-1ffcffae150806ceb970230f34dc53a49b6a0594.tar.bz2
open-keychain-1ffcffae150806ceb970230f34dc53a49b6a0594.zip
Do not ask for passphrase on delete
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java12
1 files changed, 3 insertions, 9 deletions
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;