Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>2022-10-27 14:13:21 +0300
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>2022-11-07 20:33:13 +0300
commitf8fc720fbb6aadce5e457567621d37eee26ab72b (patch)
tree2c6d426d9b9dc3cd242ec10d416f5f5a26eeb1f4
parent7fe6a3df78875d3fb9a03ae918edc344748bf74d (diff)
improve logs of E2EE API to not pollute logs
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
-rw-r--r--src/libsync/capabilities.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index da713b46c..1f4131e00 100644
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -143,24 +143,27 @@ bool Capabilities::clientSideEncryptionAvailable() const
}
const auto version = properties.value(QStringLiteral("api-version"), "1.0").toByteArray();
- qCInfo(lcServerCapabilities) << "E2EE API version:" << version;
const auto splittedVersion = version.split('.');
bool ok = false;
const auto major = !splittedVersion.isEmpty() ? splittedVersion.at(0).toInt(&ok) : 0;
if (!ok) {
- qCWarning(lcServerCapabilities) << "Didn't understand version scheme (major), E2EE disabled";
+ qCWarning(lcServerCapabilities) << "Didn't understand version scheme (major), E2EE disabled" << version;
return false;
}
ok = false;
const auto minor = splittedVersion.size() > 1 ? splittedVersion.at(1).toInt(&ok) : 0;
if (!ok) {
- qCWarning(lcServerCapabilities) << "Didn't understand version scheme (minor), E2EE disabled";
+ qCWarning(lcServerCapabilities) << "Didn't understand version scheme (minor), E2EE disabled" << version;
return false;
}
- return major == 1 && minor >= 1;
+ const auto capabilityAvailable = (major == 1 && minor >= 1);
+ if (!capabilityAvailable) {
+ qCInfo(lcServerCapabilities) << "Incompatible E2EE API version:" << version;
+ }
+ return capabilityAvailable;
}
bool Capabilities::notificationsAvailable() const