From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 27 Oct 2022 11:13:21 +0000 (+0200)
Subject: improve logs of E2EE API to not pollute logs
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~155^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f8fc720fbb6aadce5e457567621d37eee26ab72b;p=nextcloud-desktop.git

improve logs of E2EE API to not pollute logs

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

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