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

Create key: make single user id primary user id, other cleanup

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-05 17:25:22 +02:00
parent 369f6e080c
commit 160e6972d8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
View File

@@ -207,6 +207,7 @@ public class SaveKeyringParcel implements Parcelable {
public String toString() { public String toString() {
String out = "mMasterKeyId: " + mMasterKeyId + "\n"; String out = "mMasterKeyId: " + mMasterKeyId + "\n";
out += "mNewPassphrase: " + mNewPassphrase + "\n"; out += "mNewPassphrase: " + mNewPassphrase + "\n";
out += "mAddUserIds: " + mAddUserIds + "\n";
out += "mAddSubKeys: " + mAddSubKeys + "\n"; out += "mAddSubKeys: " + mAddSubKeys + "\n";
out += "mChangeSubKeys: " + mChangeSubKeys + "\n"; out += "mChangeSubKeys: " + mChangeSubKeys + "\n";
out += "mChangePrimaryUserId: " + mChangePrimaryUserId + "\n"; out += "mChangePrimaryUserId: " + mChangePrimaryUserId + "\n";

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
View File

@@ -174,6 +174,7 @@ public class CreateKeyFinalFragment extends Fragment {
parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, null)); parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, null));
String userId = KeyRing.createUserId(mName, mEmail, null); String userId = KeyRing.createUserId(mName, mEmail, null);
parcel.mAddUserIds.add(userId); parcel.mAddUserIds.add(userId);
parcel.mChangePrimaryUserId = userId;
parcel.mNewPassphrase = mPassphrase; parcel.mNewPassphrase = mPassphrase;
// get selected key entries // get selected key entries

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

@@ -48,7 +48,6 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
public static final String MESSAGE_DATA_EXPIRY_DATE = "expiry_date"; public static final String MESSAGE_DATA_EXPIRY_DATE = "expiry_date";
private Messenger mMessenger; private Messenger mMessenger;
private Calendar mCreationCal;
private Calendar mExpiryCal; private Calendar mExpiryCal;
private DatePicker mDatePicker; private DatePicker mDatePicker;
@@ -79,8 +78,8 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
Date creationDate = new Date(getArguments().getLong(ARG_CREATION_DATE) * 1000); Date creationDate = new Date(getArguments().getLong(ARG_CREATION_DATE) * 1000);
Date expiryDate = new Date(getArguments().getLong(ARG_EXPIRY_DATE) * 1000); Date expiryDate = new Date(getArguments().getLong(ARG_EXPIRY_DATE) * 1000);
mCreationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
mCreationCal.setTime(creationDate); creationCal.setTime(creationDate);
mExpiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); mExpiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
mExpiryCal.setTime(expiryDate); mExpiryCal.setTime(expiryDate);
@@ -101,11 +100,11 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
// will crash with IllegalArgumentException if we set a min date // will crash with IllegalArgumentException if we set a min date
// that is not before expiry // that is not before expiry
if (mCreationCal != null && mCreationCal.before(mExpiryCal)) { if (creationCal.before(mExpiryCal)) {
mDatePicker.setMinDate(mCreationCal.getTime().getTime() mDatePicker.setMinDate(creationCal.getTime().getTime()
+ DateUtils.DAY_IN_MILLIS); + DateUtils.DAY_IN_MILLIS);
} else { } else {
// When created date isn't available // when creation date isn't available
mDatePicker.setMinDate(mExpiryCal.getTime().getTime() mDatePicker.setMinDate(mExpiryCal.getTime().getTime()
+ DateUtils.DAY_IN_MILLIS); + DateUtils.DAY_IN_MILLIS);
} }