diff options
Diffstat (limited to 'src/core/function')
| -rw-r--r-- | src/core/function/KeyPackageOperator.cpp | 7 | ||||
| -rw-r--r-- | src/core/function/KeyPackageOperator.h | 4 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgFileOpera.cpp | 16 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp index c5c573ce..ace277b8 100644 --- a/src/core/function/KeyPackageOperator.cpp +++ b/src/core/function/KeyPackageOperator.cpp @@ -51,10 +51,11 @@ auto KeyPackageOperator::GeneratePassphrase(const QString& phrase_path, void KeyPackageOperator::GenerateKeyPackage(const QString& key_package_path, const QString& key_package_name, + int channel, const KeyArgsList& keys, QString& phrase, bool secret, const OperationCallback& cb) { - GpgKeyImportExporter::GetInstance().ExportAllKeys( + GpgKeyImportExporter::GetInstance(channel).ExportAllKeys( keys, secret, true, [=](GpgError err, const DataObjectPtr& data_obj) { if (CheckGpgError(err) != GPG_ERR_NO_ERROR) { LOG_W() << "export keys error, reason: " @@ -86,6 +87,7 @@ void KeyPackageOperator::GenerateKeyPackage(const QString& key_package_path, void KeyPackageOperator::ImportKeyPackage(const QString& key_package_path, const QString& phrase_path, + int channel, const OperationCallback& cb) { RunOperaAsync( [=](const DataObjectPtr& data_object) -> GFError { @@ -120,7 +122,8 @@ void KeyPackageOperator::ImportKeyPackage(const QString& key_package_path, } auto import_info_ptr = - GpgKeyImportExporter::GetInstance().ImportKey(GFBuffer(key_data)); + GpgKeyImportExporter::GetInstance(channel).ImportKey( + GFBuffer(key_data)); if (import_info_ptr == nullptr) return GPG_ERR_NO_DATA; auto import_info = *import_info_ptr; diff --git a/src/core/function/KeyPackageOperator.h b/src/core/function/KeyPackageOperator.h index 33d389ea..82bb65c1 100644 --- a/src/core/function/KeyPackageOperator.h +++ b/src/core/function/KeyPackageOperator.h @@ -69,7 +69,7 @@ class GPGFRONTEND_CORE_EXPORT KeyPackageOperator { * @return false if key package was not generated */ static void GenerateKeyPackage(const QString &key_package_path, - const QString &key_package_name, + const QString &key_package_name, int channel, const KeyArgsList &keys, QString &phrase, bool secret, const OperationCallback &cb); @@ -83,7 +83,7 @@ class GPGFRONTEND_CORE_EXPORT KeyPackageOperator { * @return false if key package was not imported */ static void ImportKeyPackage(const QString &key_package_path, - const QString &phrase_path, + const QString &phrase_path, int channel, const OperationCallback &cb); private: diff --git a/src/core/function/gpg/GpgFileOpera.cpp b/src/core/function/gpg/GpgFileOpera.cpp index d2cdff9b..5d29364b 100644 --- a/src/core/function/gpg/GpgFileOpera.cpp +++ b/src/core/function/gpg/GpgFileOpera.cpp @@ -174,8 +174,7 @@ void GpgFileOpera::DecryptArchive(const QString& in_path, ArchiveFileOperator::ExtractArchiveFromDataExchanger( ex, out_path, [](GFError err, const DataObjectPtr&) { - FLOG_D("extract archive from data exchanger operation, err: %d", - err); + FLOG_D("extract archive from data exchanger operation, err: %d", err); }); RunGpgOperaAsync( @@ -201,7 +200,7 @@ void GpgFileOpera::SignFile(const KeyArgsList& keys, const QString& in_path, GpgError err; // Set Singers of this opera - GpgBasicOperator::GetInstance().SetSigners(keys, ascii); + GpgBasicOperator::GetInstance(GetChannel()).SetSigners(keys, ascii); GpgData data_in(in_path, true); GpgData data_out(out_path, false); @@ -226,7 +225,7 @@ auto GpgFileOpera::SignFileSync(const KeyArgsList& keys, const QString& in_path, GpgError err; // Set Singers of this opera - GpgBasicOperator::GetInstance().SetSigners(keys, ascii); + GpgBasicOperator::GetInstance(GetChannel()).SetSigners(keys, ascii); GpgData data_in(in_path, true); GpgData data_out(out_path, false); @@ -310,7 +309,8 @@ void GpgFileOpera::EncryptSignFile(const KeyArgsList& keys, // Last entry data_in array has to be nullptr recipients.emplace_back(nullptr); - GpgBasicOperator::GetInstance().SetSigners(signer_keys, ascii); + GpgBasicOperator::GetInstance(GetChannel()) + .SetSigners(signer_keys, ascii); GpgData data_in(in_path, true); GpgData data_out(out_path, false); @@ -341,7 +341,8 @@ auto GpgFileOpera::EncryptSignFileSync( // Last entry data_in array has to be nullptr recipients.emplace_back(nullptr); - GpgBasicOperator::GetInstance().SetSigners(signer_keys, ascii); + GpgBasicOperator::GetInstance(GetChannel()) + .SetSigners(signer_keys, ascii); GpgData data_in(in_path, true); GpgData data_out(out_path, false); @@ -376,7 +377,8 @@ void GpgFileOpera::EncryptSignDirectory(const KeyArgsList& keys, // Last entry data_in array has to be nullptr recipients.emplace_back(nullptr); - GpgBasicOperator::GetInstance().SetSigners(signer_keys, ascii); + GpgBasicOperator::GetInstance(GetChannel()) + .SetSigners(signer_keys, ascii); GpgData data_in(ex); GpgData data_out(out_path, false); |