diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-11-24 16:43:59 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-11-24 16:43:59 +0100 |
commit | a7aa889ae94cbec36f8c3ad1b39a57958258b847 (patch) | |
tree | c1c41febe92e57cca37cd1fb47d7635f857f3593 /framework/src | |
parent | 0efcbe38c419bc409cb8aa7925a4d4e738875ef5 (diff) | |
download | kube-a7aa889ae94cbec36f8c3ad1b39a57958258b847.tar.gz kube-a7aa889ae94cbec36f8c3ad1b39a57958258b847.zip |
Log some info about the keys we find
Diffstat (limited to 'framework/src')
-rw-r--r-- | framework/src/domain/composercontroller.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp index 375d2086..b558daa3 100644 --- a/framework/src/domain/composercontroller.cpp +++ b/framework/src/domain/composercontroller.cpp | |||
@@ -112,11 +112,18 @@ public: | |||
112 | 112 | ||
113 | void findKey(const QString &addressee, QStandardItem *item) | 113 | void findKey(const QString &addressee, QStandardItem *item) |
114 | { | 114 | { |
115 | SinkLog() << "Searching key for: " << addressee; | ||
115 | auto keys = MailCrypto::findKeys(QStringList{} << addressee, false, MailCrypto::OPENPGP); | 116 | auto keys = MailCrypto::findKeys(QStringList{} << addressee, false, MailCrypto::OPENPGP); |
116 | if (item) { | 117 | if (item) { |
117 | if (!keys.empty()) { | 118 | if (!keys.empty()) { |
119 | if (keys.size() > 1 ) { | ||
120 | SinkWarning() << "Found more than one key, picking first one."; | ||
121 | } | ||
122 | SinkLog() << "Found key: " << keys.front().primaryFingerprint(); | ||
118 | item->setData(true, ComposerController::KeyFoundRole); | 123 | item->setData(true, ComposerController::KeyFoundRole); |
119 | item->setData(QVariant::fromValue(keys.front()), ComposerController::KeyRole); | 124 | item->setData(QVariant::fromValue(keys.front()), ComposerController::KeyRole); |
125 | } else { | ||
126 | SinkWarning() << "Failed to find key for recipient."; | ||
120 | } | 127 | } |
121 | } | 128 | } |
122 | } | 129 | } |
@@ -218,6 +225,15 @@ void ComposerController::findPersonalKey() | |||
218 | auto identity = getIdentity(); | 225 | auto identity = getIdentity(); |
219 | SinkLog() << "Looking for personal key for: " << identity.address(); | 226 | SinkLog() << "Looking for personal key for: " << identity.address(); |
220 | mPersonalKeys = MailCrypto::findKeys(QStringList{} << identity.address(), true); | 227 | mPersonalKeys = MailCrypto::findKeys(QStringList{} << identity.address(), true); |
228 | if (mPersonalKeys.empty()) { | ||
229 | SinkWarning() << "Failed to find a personal key."; | ||
230 | } | ||
231 | if (mPersonalKeys.size() > 1) { | ||
232 | SinkWarning() << "Found multiple keys, using first one:"; | ||
233 | SinkWarning() << " " << mPersonalKeys.front().primaryFingerprint(); | ||
234 | } else { | ||
235 | SinkLog() << "Found personal key: " << mPersonalKeys.front().primaryFingerprint(); | ||
236 | } | ||
221 | updateSendAction(); | 237 | updateSendAction(); |
222 | } | 238 | } |
223 | 239 | ||