cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not ask for passphrase on delete

Browse Source
This commit is contained in:
Dominik Schürmann
2015-07-08 13:39:53 +02:00
parent d4fbaf9397
commit 1ffcffae15
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -95,9 +95,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints"; public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints";
static final int REQUEST_QR_FINGERPRINT = 1; static final int REQUEST_QR_FINGERPRINT = 1;
static final int REQUEST_DELETE = 2; static final int REQUEST_EXPORT = 2;
static final int REQUEST_EXPORT = 3; static final int REQUEST_CERTIFY = 3;
static final int REQUEST_CERTIFY = 4;
public static final String EXTRA_DISPLAY_RESULT = "display_result"; public static final String EXTRA_DISPLAY_RESULT = "display_result";
@@ -330,7 +329,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
return true; return true;
} }
case R.id.menu_key_view_delete: { case R.id.menu_key_view_delete: {
startPassphraseActivity(REQUEST_DELETE); deleteKey();
return true; return true;
} }
case R.id.menu_key_view_advanced: { case R.id.menu_key_view_advanced: {
@@ -490,11 +489,6 @@ public class ViewKeyActivity extends BaseNfcActivity implements
return; return;
} }
case REQUEST_DELETE: {
deleteKey();
return;
}
case REQUEST_EXPORT: { case REQUEST_EXPORT: {
exportToFile(mDataUri, mProviderHelper); exportToFile(mDataUri, mProviderHelper);
return; return;