From 3e7ce0008fde176634980a31f61052052698ff93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 18 Aug 2014 11:02:41 +0200
Subject: Fixes for expiry UI

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

(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 56c004f97..d5c80d18a 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
@@ -132,7 +132,10 @@ public class AddSubkeyDialogFragment extends DialogFragment {
         });
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
-            mExpiryDatePicker.setMinDate(new Date().getTime() + DateUtils.DAY_IN_MILLIS);
+            // date picker works based on default time zone
+            Calendar minDateCal = Calendar.getInstance(TimeZone.getDefault());
+            minDateCal.add(Calendar.DAY_OF_YEAR, 1); // at least one day after creation (today)
+            mExpiryDatePicker.setMinDate(minDateCal.getTime().getTime());
         }
 
         ArrayList<Choice> choices = new ArrayList<Choice>();
-- 
cgit v1.2.3