From 4d698c896a69148fbae4cccf7528ed9974449482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 16 Aug 2014 12:28:49 +0200
Subject: Fix expiry when adding subkeys

---
 .../keychain/ui/dialog/AddSubkeyDialogFragment.java                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java')

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
-- 
cgit v1.2.3