diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 13:45:16 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 13:45:16 +0200 |
commit | d686c55a0a86ef845795fc03a8a5de44b5fe73cc (patch) | |
tree | d5bb8dfe1d451b392c8c88a3fa8b14b1dd43db1e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java | |
parent | 3defd194aaa79309c0a0921a63c5ab157081325c (diff) | |
download | open-keychain-d686c55a0a86ef845795fc03a8a5de44b5fe73cc.tar.gz open-keychain-d686c55a0a86ef845795fc03a8a5de44b5fe73cc.tar.bz2 open-keychain-d686c55a0a86ef845795fc03a8a5de44b5fe73cc.zip |
Work on new result handling (WIP)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java index 9d492e545..e4e843e83 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java @@ -24,15 +24,26 @@ import java.util.Date; public class SignEncryptResult extends OperationResult { // the fourth bit indicates a "data pending" result! (it's also a form of non-success) - public static final int RESULT_PENDING = RESULT_ERROR +8; + public static final int RESULT_PENDING = RESULT_ERROR + 8; // fifth to sixth bit in addition indicate specific type of pending - public static final int RESULT_PENDING_NFC = RESULT_PENDING +16; + public static final int RESULT_PENDING_PASSPHRASE = RESULT_PENDING + 16; + public static final int RESULT_PENDING_NFC = RESULT_PENDING + 32; + + long mKeyIdPassphraseNeeded; byte[] mNfcHash; int mNfcAlgo; Date mNfcTimestamp; + public long getKeyIdPassphraseNeeded() { + return mKeyIdPassphraseNeeded; + } + + public void setKeyIdPassphraseNeeded(long keyIdPassphraseNeeded) { + mKeyIdPassphraseNeeded = keyIdPassphraseNeeded; + } + public void setNfcData(byte[] sessionKey, int nfcAlgo, Date nfcTimestamp) { mNfcHash = sessionKey; mNfcAlgo = nfcAlgo; @@ -52,7 +63,7 @@ public class SignEncryptResult extends OperationResult { } public boolean isPending() { - return (mResult & RESULT_PENDING) != 0; + return (mResult & RESULT_PENDING) == RESULT_PENDING; } public SignEncryptResult(int result, OperationLog log) { |