From f8a222983efe5741a0d79147c6724a49ad7e5b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 5 Aug 2014 20:52:29 +0200 Subject: Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys --- .../keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java index 303ab4363..aa63f9944 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java @@ -56,12 +56,12 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment { * Creates new instance of this dialog fragment */ public static EditSubkeyExpiryDialogFragment newInstance(Messenger messenger, - long creationDate, long expiryDate) { + Long creationDate, Long expiryDate) { EditSubkeyExpiryDialogFragment frag = new EditSubkeyExpiryDialogFragment(); Bundle args = new Bundle(); args.putParcelable(ARG_MESSENGER, messenger); - args.putLong(ARG_CREATION_DATE, creationDate); - args.putLong(ARG_EXPIRY_DATE, expiryDate); + args.putSerializable(ARG_CREATION_DATE, creationDate); + args.putSerializable(ARG_EXPIRY_DATE, expiryDate); frag.setArguments(args); @@ -124,12 +124,12 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment { - (mExpiryCal.getTimeInMillis() / 86400000); if (numDays > 0) { Bundle data = new Bundle(); - data.putLong(MESSAGE_DATA_EXPIRY_DATE, selectedCal.getTime().getTime() / 1000); + data.putSerializable(MESSAGE_DATA_EXPIRY_DATE, selectedCal.getTime().getTime() / 1000); sendMessageToHandler(MESSAGE_NEW_EXPIRY_DATE, data); } } else { Bundle data = new Bundle(); - data.putLong(MESSAGE_DATA_EXPIRY_DATE, selectedCal.getTime().getTime() / 1000); + data.putSerializable(MESSAGE_DATA_EXPIRY_DATE, selectedCal.getTime().getTime() / 1000); sendMessageToHandler(MESSAGE_NEW_EXPIRY_DATE, data); } } @@ -140,9 +140,8 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment { public void onClick(DialogInterface dialog, int id) { dismiss(); - // "no expiry" corresponds to a 0 Bundle data = new Bundle(); - data.putLong(MESSAGE_DATA_EXPIRY_DATE, 0); + data.putSerializable(MESSAGE_DATA_EXPIRY_DATE, null); sendMessageToHandler(MESSAGE_NEW_EXPIRY_DATE, data); } }); -- cgit v1.2.3