diff options
author | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 11:35:55 +0000 |
---|---|---|
committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 11:35:55 +0000 |
commit | 4119757699083889c8288960c7581a3060bd60c1 (patch) | |
tree | a5f665065feafaa40511d4f7641fc2f6cdea473c /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget | |
parent | 358ab7d7e44314acc4659809e6f7a3e8b78b532b (diff) | |
download | open-keychain-4119757699083889c8288960c7581a3060bd60c1.tar.gz open-keychain-4119757699083889c8288960c7581a3060bd60c1.tar.bz2 open-keychain-4119757699083889c8288960c7581a3060bd60c1.zip |
bouncycastle uses the Date class, based off of UTC. Force all GregorianCalendars to use UTC, so get and set of key dates works as expected
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java index dba9ba1ad..6c265057e 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java @@ -20,6 +20,7 @@ import java.text.DateFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.TimeZone; import java.util.Vector; import org.spongycastle.openpgp.PGPPublicKey; @@ -64,7 +65,8 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) { // Note: Ignore results after the first one - android sends multiples. if (mDatePickerResultCount++ == 0) { - GregorianCalendar date = new GregorianCalendar(year, monthOfYear, dayOfMonth); + GregorianCalendar date = new GregorianCalendar(TimeZone.getTimeZone("UTC")); + date.set(year, monthOfYear, dayOfMonth); setExpiryDate(date); } } @@ -109,7 +111,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { public void onClick(View v) { GregorianCalendar date = mExpiryDate; if (date == null) { - date = new GregorianCalendar(); + date = new GregorianCalendar(TimeZone.getTimeZone("UTC")); } DatePickerDialog dialog = new DatePickerDialog(getContext(), @@ -201,10 +203,10 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { } } - GregorianCalendar cal = new GregorianCalendar(); + GregorianCalendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC")); cal.setTime(PgpKeyHelper.getCreationDate(key)); mCreationDate.setText(DateFormat.getDateInstance().format(cal.getTime())); - cal = new GregorianCalendar(); + cal = new GregorianCalendar(TimeZone.getTimeZone("UTC")); Date expiryDate = PgpKeyHelper.getExpiryDate(key); if (expiryDate == null) { setExpiryDate(null); |