diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-15 21:14:53 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-15 21:14:53 +0200 |
| commit | e4b113701cfd12b89a18365491b50f6508184bc2 (patch) | |
| tree | 19672479027e592e23cba851f07a9fe79e3a33f7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java | |
| parent | 4cef97be5f4cd75fac252c8d3c739990604000df (diff) | |
| parent | 1dafd1b629102180d7e6cb7bb31d1959f1ff6665 (diff) | |
| download | open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.tar.gz open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.tar.bz2 open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java index ca7079078..5f5090bee 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java @@ -96,8 +96,9 @@ public class ImportKeyResult extends InputPendingResult { mImportedMasterKeyIds = importedMasterKeyIds; } - public ImportKeyResult(OperationLog log, RequiredInputParcel requiredInputParcel) { - super(log, requiredInputParcel); + public ImportKeyResult(OperationLog log, RequiredInputParcel requiredInputParcel, + CryptoInputParcel cryptoInputParcel) { + super(log, requiredInputParcel, cryptoInputParcel); // just assign default values, we won't use them anyway mNewKeys = 0; mUpdatedKeys = 0; |