cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplifications for expiry dialog

Browse Source
This commit is contained in:
Dominik Schürmann
2015-07-08 03:45:36 +02:00
parent 4837d4cc5c
commit d98a321f66
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
View File

@@ -85,9 +85,9 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
long expiry = getArguments().getLong(ARG_EXPIRY); long expiry = getArguments().getLong(ARG_EXPIRY);
final Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); final Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
creationCal.setTime(new Date(creation * 1000)); creationCal.setTimeInMillis(creation * 1000);
Calendar expiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); Calendar expiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
expiryCal.setTime(new Date(expiry * 1000)); expiryCal.setTimeInMillis(expiry * 1000);
// date picker works with default time zone, we need to convert from UTC to default timezone // date picker works with default time zone, we need to convert from UTC to default timezone
creationCal.setTimeZone(TimeZone.getDefault()); creationCal.setTimeZone(TimeZone.getDefault());
@@ -128,11 +128,8 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
noExpiry.setChecked(false); noExpiry.setChecked(false);
expiryLayout.setVisibility(View.VISIBLE); expiryLayout.setVisibility(View.VISIBLE);
// convert from UTC to time zone of device
Calendar expiryCalTimeZone = (Calendar) expiryCal.clone();
expiryCalTimeZone.setTimeZone(TimeZone.getDefault());
currentExpiry.setText(DateFormat.getDateFormat( currentExpiry.setText(DateFormat.getDateFormat(
getActivity()).format(expiryCalTimeZone.getTime())); getActivity()).format(expiryCal.getTime()));
} }
// date picker works based on default time zone // date picker works based on default time zone