aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-18 22:05:27 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-18 22:05:27 +0200
commita454bfd7012993fe85b7d0bc57fbe8fea94b45e8 (patch)
tree7891e5e30ff9e53d98ef8809e20bb4d171897c7b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parenta77c217b82a567a71ff22a419772fce861c9df95 (diff)
downloadopen-keychain-a454bfd7012993fe85b7d0bc57fbe8fea94b45e8.tar.gz
open-keychain-a454bfd7012993fe85b7d0bc57fbe8fea94b45e8.tar.bz2
open-keychain-a454bfd7012993fe85b7d0bc57fbe8fea94b45e8.zip
Use key icons in import, prettify items
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java4
1 files changed, 2 insertions, 2 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 167404b36..84eb29a62 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
@@ -44,8 +44,8 @@ public class SignEncryptResult extends OperationResult {
mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
}
- public void setNfcData(byte[] sessionKey, int nfcAlgo, Date nfcTimestamp) {
- mNfcHash = sessionKey;
+ public void setNfcData(byte[] nfcHash, int nfcAlgo, Date nfcTimestamp) {
+ mNfcHash = nfcHash;
mNfcAlgo = nfcAlgo;
mNfcTimestamp = nfcTimestamp;
}