Fix review comments.

Signed-off-by: alex-z <[email protected]>

src/gui/accountstate.cpp

@@ -59,8 +59,8 @@ AccountState::AccountState(AccountPtr account)
         this, &AccountState::slotCredentialsAsked);
     connect(account.data(), &Account::pushNotificationsReady,
             this, &AccountState::slotPushNotificationsReady);
-    connect(account.data(), &Account::userOnlineStatusChanged, this,
-        &AccountState::slotUserOnlineStatusChanged);
+    connect(account.data(), &Account::userStatusChanged, this,
+        &AccountState::slotServerUserStatusChanged);
 
     connect(this, &AccountState::isConnectedChanged, [=]{
         // Get the Apps available on the server if we're now connected.
@@ -561,7 +561,7 @@ void AccountState::slotPushNotificationsReady()
     }
 }
 
-void AccountState::slotUserOnlineStatusChanged()
+void AccountState::slotServerUserStatusChanged()
 {
     setDesktopNotificationsAllowed(_account->userStatusConnector()->userStatus().state() != UserStatus::OnlineStatus::DoNotDisturb);
 }

src/gui/accountstate.h

@@ -217,7 +217,7 @@ private Q_SLOTS:
 
     void slotCheckConnection();
     void slotPushNotificationsReady();
-    void slotUserOnlineStatusChanged();
+    void slotServerUserStatusChanged();
 
 private:
     AccountPtr _account;

src/libsync/account.cpp

@@ -635,7 +635,7 @@ void Account::setupUserStatusConnector()
     connect(_userStatusConnector.get(), &UserStatusConnector::userStatusFetched, this, [this](const UserStatus &) {
         emit userStatusChanged();
     });
-    connect(_userStatusConnector.get(), &UserStatusConnector::userOnlineStatusChanged, this, &Account::userOnlineStatusChanged);
+    connect(_userStatusConnector.get(), &UserStatusConnector::userStatusChanged, this, &Account::userStatusChanged);
     connect(_userStatusConnector.get(), &UserStatusConnector::messageCleared, this, [this] {
         emit userStatusChanged();
     });

src/libsync/account.h

@@ -322,7 +322,7 @@ public slots:
 
     void userStatusChanged();
 
-    void userOnlineStatusChanged();
+    void userStatusChanged();
 
     void capabilitiesChanged();
 

src/libsync/ocsuserstatusconnector.cpp

@@ -262,7 +262,7 @@ void OcsUserStatusConnector::onUserStatusFetched(const QJsonDocument &json, int
     emit userStatusFetched(_userStatus);
 
     if (oldOnlineState != _userStatus.state()) {
-        emit userOnlineStatusChanged();
+        emit userStatusChanged();
     }
 }
 
@@ -423,7 +423,7 @@ void OcsUserStatusConnector::onUserStatusOnlineStatusSet(const QJsonDocument &js
     emit userStatusSet();
 
     if (oldOnlineState != _userStatus.state()) {
-        emit userOnlineStatusChanged();
+        emit userStatusChanged();
     }
 }
 

src/libsync/userstatusconnector.h

@@ -129,7 +129,7 @@ class OWNCLOUDSYNC_EXPORT UserStatusConnector : public QObject
     void userStatusFetched(const UserStatus &userStatus);
     void predefinedStatusesFetched(const std::vector<UserStatus> &statuses);
     void userStatusSet();
-    void userOnlineStatusChanged();
+    void userStatusChanged();
     void messageCleared();
     void error(Error error);
 };