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

fix unit tests (for real)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-20 18:45:00 +01:00
parent e00ce86de9
commit 3e51da3afa
7 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ public class SaveKeyringParcel implements Parcelable {
/** Returns true iff this parcel does not contain any operations which require a passphrase. */
public boolean isRestrictedOnly() {
if (mNewUnlock != null || !mAddUserIds.isEmpty() || !mAddUserAttribute.isEmpty()
|| !mAddSubKeys.isEmpty() || mChangePrimaryUserId != null || !mRevokeSubKeys .isEmpty()
|| !mAddSubKeys.isEmpty() || mChangePrimaryUserId != null || !mRevokeUserIds.isEmpty()
|| !mRevokeSubKeys.isEmpty()) {
return false;
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/CryptoInputParcel.java
View File

@@ -36,7 +36,7 @@ public class CryptoInputParcel implements Parcelable {
public CryptoInputParcel(Passphrase passphrase) {
mSignatureTime = new Date();
mPassphrase = null;
mPassphrase = passphrase;
}
public CryptoInputParcel(Date signatureTime) {