From: Felix Weilbach <felix.weilbach@nextcloud.com>
Date: Fri, 12 Nov 2021 10:55:16 +0000 (+0100)
Subject: Check if the server has user status app enabled
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~18^2~110^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=07a8e8c91d68fb91d8da1d328f9b4eb0cb05ec6c;p=nextcloud-desktop.git

Check if the server has user status app enabled

According to
https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-status-api.html#user-status-retrieve-statuses
we should check the user status capability, not the the end points.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
---

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 36016ead7..c821a8b1a 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -658,7 +658,7 @@ QString User::statusEmoji() const
 
 bool User::serverHasUserStatus() const
 {
-    return _account->account()->capabilities().userStatusNotification();
+    return _account->account()->capabilities().userStatus();
 }
 
 QImage User::avatar() const
diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index d8fa1096a..cfffa403a 100644
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -216,13 +216,6 @@ bool Capabilities::chunkingNg() const
     return _capabilities["dav"].toMap()["chunking"].toByteArray() >= "1.0";
 }
 
-bool Capabilities::userStatusNotification() const
-{
-    return _capabilities.contains("notifications") &&
-        _capabilities["notifications"].toMap().contains("ocs-endpoints") &&
-        _capabilities["notifications"].toMap()["ocs-endpoints"].toStringList().contains("user-status");
-}
-
 bool Capabilities::userStatus() const
 {
     if (!_capabilities.contains("user_status")) {
diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
index fb251e7e3..f91208d90 100644
--- a/src/libsync/capabilities.h
+++ b/src/libsync/capabilities.h
@@ -63,7 +63,6 @@ public:
     bool shareResharing() const;
     int shareDefaultPermissions() const;
     bool chunkingNg() const;
-    bool userStatusNotification() const;
     bool userStatus() const;
     bool userStatusSupportsEmoji() const;