From bf8cb8305e0f6502bd80e5ec65599ff696c2e623 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 3 Feb 2023 13:12:28 +0100 Subject: [PATCH] Create common validCapabilities used by several ShareModel methods checking account capabilities Signed-off-by: Claudio Cambra --- src/gui/filedetails/sharemodel.cpp | 13 ++++++++----- src/gui/filedetails/sharemodel.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp index f6564887c4..aa406cdd05 100644 --- a/src/gui/filedetails/sharemodel.cpp +++ b/src/gui/filedetails/sharemodel.cpp @@ -1014,20 +1014,23 @@ bool ShareModel::accountConnected() const return _accountState && _accountState->isConnected(); } -bool ShareModel::sharingEnabled() const +bool ShareModel::validCapabilities() const { return _accountState && _accountState->account() && - _accountState->account()->capabilities().isValid() && + _accountState->account()->capabilities().isValid(); +} + +bool ShareModel::sharingEnabled() const +{ + return validCapabilities() && _accountState->account()->capabilities().shareAPI(); } bool ShareModel::publicLinkSharesEnabled() const { return Theme::instance()->linkSharing() && - _accountState && - _accountState->account() && - _accountState->account()->capabilities().isValid() && + validCapabilities() && _accountState->account()->capabilities().sharePublicLink(); } diff --git a/src/gui/filedetails/sharemodel.h b/src/gui/filedetails/sharemodel.h index 4e11985347..ffd0d318db 100644 --- a/src/gui/filedetails/sharemodel.h +++ b/src/gui/filedetails/sharemodel.h @@ -182,6 +182,7 @@ private: [[nodiscard]] QString avatarUrlForShare(const SharePtr &share) const; [[nodiscard]] long long enforcedMaxExpireDateForShare(const SharePtr &share) const; [[nodiscard]] bool expireDateEnforcedForShare(const SharePtr &share) const; + [[nodiscard]] bool validCapabilities() const; bool _fetchOngoing = false; bool _hasInitialShareFetchCompleted = false;