aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-16 12:28:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-16 12:28:49 +0200
commit4d698c896a69148fbae4cccf7528ed9974449482 (patch)
treeb209372da661462a0b9550b4b83f720a72974550 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
parent474fc50b80ae57e3434c2d748895eda28d2ef548 (diff)
downloadopen-keychain-4d698c896a69148fbae4cccf7528ed9974449482.tar.gz
open-keychain-4d698c896a69148fbae4cccf7528ed9974449482.tar.bz2
open-keychain-4d698c896a69148fbae4cccf7528ed9974449482.zip
Fix expiry when adding subkeys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
index cb31978e9..2b8768596 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
@@ -183,9 +183,9 @@ public class AddSubkeyDialogFragment extends DialogFragment {
flags |= KeyFlags.AUTHENTICATION;
}
- Long expiry;
+ long expiry;
if (mNoExpiryCheckBox.isChecked()) {
- expiry = null;
+ expiry = 0L;
} else {
Calendar selectedCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
//noinspection ResourceType