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

generalize NfcOperationParcel to RequiredInputParcel, including passphrases

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-19 14:21:30 +01:00
parent d46fc3740b
commit 25d89b5550
12 changed files with 147 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java
View File

@@ -3,7 +3,6 @@ package org.sufficientlysecure.keychain.pgp;
import java.nio.ByteBuffer;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.spongycastle.openpgp.PGPException;
@@ -19,8 +18,8 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction;
import org.sufficientlysecure.keychain.service.input.NfcOperationsParcel;
import org.sufficientlysecure.keychain.service.input.NfcOperationsParcel.NfcSignOperationsBuilder;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel.NfcSignOperationsBuilder;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.Log;
@@ -110,7 +109,7 @@ public class PgpCertifyOperation {
public static class PgpCertifyResult {
final NfcOperationsParcel mRequiredInput;
final RequiredInputParcel mRequiredInput;
final UncachedKeyRing mCertifiedRing;
PgpCertifyResult() {
@@ -118,7 +117,7 @@ public class PgpCertifyOperation {
mCertifiedRing = null;
}
PgpCertifyResult(NfcOperationsParcel requiredInput) {
PgpCertifyResult(RequiredInputParcel requiredInput) {
mRequiredInput = requiredInput;
mCertifiedRing = null;
}
@@ -140,7 +139,7 @@ public class PgpCertifyOperation {
return mCertifiedRing;
}
public NfcOperationsParcel getRequiredInput() {
public RequiredInputParcel getRequiredInput() {
return mRequiredInput;
}