From 0cec75fc9d47c4728678418727559e523295ae21 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Fri, 10 Jul 2015 07:47:38 +0530 Subject: show key name on revoke/delete dialog --- .../keychain/ui/DeleteKeyDialogActivity.java | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java index 57b74f1be..ec9d7d74c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java @@ -92,10 +92,20 @@ public class DeleteKeyDialogActivity extends FragmentActivity { ProviderHelper.FIELD_TYPE_INTEGER } ); + + String name; + KeyRing.UserId mainUserId = KeyRing.splitUserId( + (String) data.get(KeychainContract.KeyRings.USER_ID)); + if (mainUserId.name != null) { + name = mainUserId.name; + } else { + name = getString(R.string.user_id_no_name); + } + if ((long) data.get(KeychainContract.KeyRings.IS_REVOKED) > 0) { showNormalDeleteDialog(); } else { - showRevokeDeleteDialog(); + showRevokeDeleteDialog(name); } } catch (ProviderHelper.NotFoundException e) { Log.e(Constants.TAG, @@ -117,9 +127,9 @@ public class DeleteKeyDialogActivity extends FragmentActivity { } - private void showRevokeDeleteDialog() { + private void showRevokeDeleteDialog(String keyname) { - RevokeDeleteDialogFragment fragment = RevokeDeleteDialogFragment.newInstance(); + RevokeDeleteDialogFragment fragment = RevokeDeleteDialogFragment.newInstance(keyname); fragment.show(getSupportFragmentManager(), "deleteRevokeDialog"); } @@ -310,8 +320,14 @@ public class DeleteKeyDialogActivity extends FragmentActivity { public static class RevokeDeleteDialogFragment extends DialogFragment { - public static RevokeDeleteDialogFragment newInstance() { - return new RevokeDeleteDialogFragment(); + public static final String ARG_KEY_NAME = "arg_key_name"; + + public static RevokeDeleteDialogFragment newInstance(String keyName) { + Bundle args = new Bundle(); + args.putString(ARG_KEY_NAME, keyName); + RevokeDeleteDialogFragment frag = new RevokeDeleteDialogFragment(); + frag.setArguments(args); + return frag; } @NonNull @@ -328,7 +344,8 @@ public class DeleteKeyDialogActivity extends FragmentActivity { R.style.Theme_AppCompat_Light_Dialog); CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(theme); - alert.setTitle(R.string.del_rev_dialog_title); + alert.setTitle(getString(R.string.del_rev_dialog_title, + getArguments().get(ARG_KEY_NAME))); LayoutInflater inflater = LayoutInflater.from(theme); View view = inflater.inflate(R.layout.del_rev_dialog, null); -- cgit v1.2.3