From cf76a8553a686e1e9c8757b39b6b4e3c4b05bb0c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 4 Apr 2014 16:28:28 +0200 Subject: db-overhaul: fix delete key from ViewKeyActivity --- .../keychain/ui/dialog/DeleteKeyDialogFragment.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java') diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java index 36123a98b..72ea4c013 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java @@ -75,7 +75,6 @@ public class DeleteKeyDialogFragment extends DialogFragment { return frag; } - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -122,7 +121,6 @@ public class DeleteKeyDialogFragment extends DialogFragment { mMainMessage.setText(R.string.key_deletion_confirmation_multi); } - builder.setIcon(R.drawable.ic_dialog_alert_holo_light); builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() { @Override @@ -133,21 +131,16 @@ public class DeleteKeyDialogFragment extends DialogFragment { int count = activity.getContentResolver().delete( KeyRingData.buildPublicKeyRingUri(Long.toString(masterKeyId)), null, null ); - if(count > 0) - success = true; + success = count > 0; } - - dismiss(); - if (success) { sendMessageToHandler(MESSAGE_OKAY, null); } else { sendMessageToHandler(MESSAGE_ERROR, null); } + dismiss(); } - - } - ); + }); builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override -- cgit v1.2.3