diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-18 11:02:41 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-18 11:02:41 +0200 |
| commit | 3e7ce0008fde176634980a31f61052052698ff93 (patch) | |
| tree | ce0964add7fbff05c0cbce646f05965ecc89cf66 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java | |
| parent | 56fb82203429566d2bbb41473fd64e93af4afb73 (diff) | |
| download | open-keychain-3e7ce0008fde176634980a31f61052052698ff93.tar.gz open-keychain-3e7ce0008fde176634980a31f61052052698ff93.tar.bz2 open-keychain-3e7ce0008fde176634980a31f61052052698ff93.zip | |
Fixes for expiry UI
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.java | 5 |
1 files changed, 4 insertions, 1 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 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>(); |