From 4c69c192075fe38a8de2052d1d73f96dae94b844 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 1 Apr 2026 13:15:16 +0200 Subject: [PATCH 1/3] chore(capabilities): remove unused capability methods Signed-off-by: Jyrki Gadinger --- src/libsync/capabilities.cpp | 20 -------------------- src/libsync/capabilities.h | 4 ---- 2 files changed, 24 deletions(-) diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 73b796fa2b212..e150e50da2709 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -33,11 +33,6 @@ bool Capabilities::shareAPI() const } } -bool Capabilities::shareEmailPasswordEnabled() const -{ - return _capabilities["files_sharing"].toMap()["sharebymail"].toMap()["password"].toMap()["enabled"].toBool(); -} - bool Capabilities::shareEmailPasswordEnforced() const { return _capabilities["files_sharing"].toMap()["sharebymail"].toMap()["password"].toMap()["enforced"].toBool(); @@ -53,16 +48,6 @@ bool Capabilities::sharePublicLink() const } } -bool Capabilities::sharePublicLinkAllowUpload() const -{ - return _capabilities["files_sharing"].toMap()["public"].toMap()["upload"].toBool(); -} - -bool Capabilities::sharePublicLinkSupportsUploadOnly() const -{ - return _capabilities["files_sharing"].toMap()["public"].toMap()["supports_upload_only"].toBool(); -} - bool Capabilities::sharePublicLinkAskOptionalPassword() const { return _capabilities["files_sharing"].toMap()["public"].toMap()["password"].toMap()["askForOptionalPassword"].toBool(); @@ -103,11 +88,6 @@ int Capabilities::shareRemoteExpireDateDays() const return _capabilities["files_sharing"].toMap()["public"].toMap()["expire_date_remote"].toMap()["days"].toInt(); } -bool Capabilities::sharePublicLinkMultiple() const -{ - return _capabilities["files_sharing"].toMap()["public"].toMap()["multiple"].toBool(); -} - bool Capabilities::shareResharing() const { return _capabilities["files_sharing"].toMap()["resharing"].toBool(); diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index a06d4a1036761..81edb2f154dbf 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -38,11 +38,8 @@ class OWNCLOUDSYNC_EXPORT Capabilities Capabilities(const QVariantMap &capabilities); [[nodiscard]] bool shareAPI() const; - [[nodiscard]] bool shareEmailPasswordEnabled() const; [[nodiscard]] bool shareEmailPasswordEnforced() const; [[nodiscard]] bool sharePublicLink() const; - [[nodiscard]] bool sharePublicLinkAllowUpload() const; - [[nodiscard]] bool sharePublicLinkSupportsUploadOnly() const; [[nodiscard]] bool sharePublicLinkAskOptionalPassword() const; [[nodiscard]] bool sharePublicLinkEnforcePassword() const; [[nodiscard]] bool sharePublicLinkEnforceExpireDate() const; @@ -51,7 +48,6 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] int shareInternalExpireDateDays() const; [[nodiscard]] bool shareRemoteEnforceExpireDate() const; [[nodiscard]] int shareRemoteExpireDateDays() const; - [[nodiscard]] bool sharePublicLinkMultiple() const; [[nodiscard]] bool shareResharing() const; [[nodiscard]] int shareDefaultPermissions() const; [[nodiscard]] bool chunkingNg() const; From 596dfd7db33fa95dcc6f2376fc619217f0f76a10 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 1 Apr 2026 13:16:54 +0200 Subject: [PATCH 2/3] chore(ocssharejob): remove unused setPublicUpload method Signed-off-by: Jyrki Gadinger --- src/gui/ocssharejob.cpp | 12 ------------ src/gui/ocssharejob.h | 7 ------- 2 files changed, 19 deletions(-) diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp index 6997e368776f2..8aae02bf3a75e 100644 --- a/src/gui/ocssharejob.cpp +++ b/src/gui/ocssharejob.cpp @@ -81,18 +81,6 @@ void OcsShareJob::setNote(const QString &shareId, const QString ¬e) start(); } -void OcsShareJob::setPublicUpload(const QString &shareId, bool publicUpload) -{ - appendPath(shareId); - setVerb("PUT"); - - const QString value = QString::fromLatin1(publicUpload ? "true" : "false"); - addParam(QString::fromLatin1("publicUpload"), value); - _value = publicUpload; - - start(); -} - void OcsShareJob::setName(const QString &shareId, const QString &name) { appendPath(shareId); diff --git a/src/gui/ocssharejob.h b/src/gui/ocssharejob.h index 4f83dcbb75305..447487b09fa73 100644 --- a/src/gui/ocssharejob.h +++ b/src/gui/ocssharejob.h @@ -69,13 +69,6 @@ class OcsShareJob : public OcsJob */ void setPassword(const QString &shareId, const QString &password); - /** - * Set the share to be public upload - * - * @param publicUpload Set or remove public upload - */ - void setPublicUpload(const QString &shareId, bool publicUpload); - /** * Change the name of a share */ From b7817bed64c6c9350ace94d88fe62db53cbae720 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 1 Apr 2026 13:39:57 +0200 Subject: [PATCH 3/3] chore(sharing): remove unused methods related to `name` attributes We use `label` for that Signed-off-by: Jyrki Gadinger --- src/gui/filedetails/sharemodel.cpp | 15 --------------- src/gui/filedetails/sharemodel.h | 1 - src/gui/ocssharejob.cpp | 10 ---------- src/gui/ocssharejob.h | 5 ----- src/gui/sharemanager.cpp | 19 ------------------- src/gui/sharemanager.h | 17 ----------------- src/gui/socketapi/socketapi.cpp | 2 +- 7 files changed, 1 insertion(+), 68 deletions(-) diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp index f02c63594ccd7..08d9ccc7627ee 100644 --- a/src/gui/filedetails/sharemodel.cpp +++ b/src/gui/filedetails/sharemodel.cpp @@ -93,8 +93,6 @@ QVariant ShareModel::data(const QModelIndex &index, const int role) const switch (role) { case LinkRole: return linkShare->getLink(); - case LinkShareNameRole: - return linkShare->getName(); case LinkShareLabelRole: return linkShare->getLabel(); case NoteEnabledRole: @@ -184,7 +182,6 @@ QVariant ShareModel::data(const QModelIndex &index, const int role) const case HideDownloadEnabledRole: return false; case LinkRole: - case LinkShareNameRole: case LinkShareLabelRole: case NoteRole: case ExpireDateRole: @@ -666,7 +663,6 @@ void ShareModel::slotAddShare(const SharePtr &share) if (const auto linkShare = share.objectCast()) { connect(linkShare.data(), &LinkShare::noteSet, this, [this, shareId]{ slotShareNoteSet(shareId); }); - connect(linkShare.data(), &LinkShare::nameSet, this, [this, shareId]{ slotShareNameSet(shareId); }); connect(linkShare.data(), &LinkShare::labelSet, this, [this, shareId]{ slotShareLabelSet(shareId); }); connect(linkShare.data(), &LinkShare::expireDateSet, this, [this, shareId]{ slotShareExpireDateSet(shareId); }); connect(linkShare.data(), &LinkShare::hideDownloadSet, this, [this, shareId] { slotHideDownloadSet(shareId); }); @@ -908,17 +904,6 @@ void ShareModel::slotShareNoteSet(const QString &shareId) Q_EMIT dataChanged(shareModelIndex, shareModelIndex, { NoteEnabledRole, NoteRole }); } -void ShareModel::slotShareNameSet(const QString &shareId) -{ - if (shareId.isEmpty() || !_shareIdIndexHash.contains(shareId)) { - return; - } - - const auto sharePersistentModelIndex = _shareIdIndexHash.value(shareId); - const auto shareModelIndex = index(sharePersistentModelIndex.row()); - Q_EMIT dataChanged(shareModelIndex, shareModelIndex, { LinkShareNameRole }); -} - void ShareModel::slotShareLabelSet(const QString &shareId) { if (shareId.isEmpty() || !_shareIdIndexHash.contains(shareId)) { diff --git a/src/gui/filedetails/sharemodel.h b/src/gui/filedetails/sharemodel.h index a10088257c8bd..d681b0c682853 100644 --- a/src/gui/filedetails/sharemodel.h +++ b/src/gui/filedetails/sharemodel.h @@ -216,7 +216,6 @@ private slots: void slotSharePasswordSet(const QString &shareId); void slotShareNoteSet(const QString &shareId); void slotHideDownloadSet(const QString &shareId); - void slotShareNameSet(const QString &shareId); void slotShareLabelSet(const QString &shareId); void slotShareExpireDateSet(const QString &shareId); void slotDeleteE2EeShare(const OCC::SharePtr &share) const; diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp index 8aae02bf3a75e..24d0c48472157 100644 --- a/src/gui/ocssharejob.cpp +++ b/src/gui/ocssharejob.cpp @@ -81,16 +81,6 @@ void OcsShareJob::setNote(const QString &shareId, const QString ¬e) start(); } -void OcsShareJob::setName(const QString &shareId, const QString &name) -{ - appendPath(shareId); - setVerb("PUT"); - addParam(QString::fromLatin1("name"), name); - _value = name; - - start(); -} - void OcsShareJob::setPermissions(const QString &shareId, const Share::Permissions permissions) { diff --git a/src/gui/ocssharejob.h b/src/gui/ocssharejob.h index 447487b09fa73..695c797170b50 100644 --- a/src/gui/ocssharejob.h +++ b/src/gui/ocssharejob.h @@ -69,11 +69,6 @@ class OcsShareJob : public OcsJob */ void setPassword(const QString &shareId, const QString &password); - /** - * Change the name of a share - */ - void setName(const QString &shareId, const QString &name); - /** * Set the permissions * diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp index 42b61a5d846b5..42a151dba2eab 100644 --- a/src/gui/sharemanager.cpp +++ b/src/gui/sharemanager.cpp @@ -200,7 +200,6 @@ LinkShare::LinkShare(AccountPtr account, const QString &uidFileOwner, const QString &ownerDisplayName, const QString &path, - const QString &name, const QString &token, Permissions permissions, bool isPasswordSet, @@ -210,7 +209,6 @@ LinkShare::LinkShare(AccountPtr account, const QString &label, const bool hideDownload) : Share(account, id, uidOwner, uidFileOwner, ownerDisplayName, path, Share::TypeLink, isPasswordSet, permissions) - , _name(name) , _token(token) , _note(note) , _expireDate(expireDate) @@ -230,11 +228,6 @@ bool LinkShare::getShowFileListing() const return _permissions & SharePermissionRead; } -QString LinkShare::getName() const -{ - return _name; -} - QString LinkShare::getNote() const { return _note; @@ -250,11 +243,6 @@ bool LinkShare::getHideDownload() const return _hideDownload; } -void LinkShare::setName(const QString &name) -{ - createShareJob(&LinkShare::slotNameSet)->setName(getId(), name); -} - void LinkShare::setNote(const QString ¬e) { createShareJob(&LinkShare::slotNoteSet)->setNote(getId(), note); @@ -310,12 +298,6 @@ void LinkShare::slotExpireDateSet(const QJsonDocument &reply, const QVariant &va emit expireDateSet(); } -void LinkShare::slotNameSet(const QJsonDocument &, const QVariant &value) -{ - _name = value.toString(); - emit nameSet(); -} - void LinkShare::slotLabelSet(const QJsonDocument &, const QVariant &label) { if (_label != label.toString()) { @@ -663,7 +645,6 @@ QSharedPointer ShareManager::parseLinkShare(const QJsonObject &data) data.value("uid_file_owner"_L1).toString(), data.value("displayname_owner"_L1).toString(), data.value("path"_L1).toString(), - data.value("name"_L1).toString(), data.value("token"_L1).toString(), (Share::Permissions)data.value("permissions"_L1).toInt(), data.value("share_with"_L1).isString(), // has password? diff --git a/src/gui/sharemanager.h b/src/gui/sharemanager.h index c94a8496b6156..45f1ac0d94210 100644 --- a/src/gui/sharemanager.h +++ b/src/gui/sharemanager.h @@ -196,7 +196,6 @@ class LinkShare : public Share Q_PROPERTY(QUrl directDownloadLink READ getDirectDownloadLink CONSTANT) Q_PROPERTY(bool publicCanUpload READ getPublicUpload CONSTANT) Q_PROPERTY(bool publicCanReadDirectory READ getShowFileListing CONSTANT) - Q_PROPERTY(QString name READ getName WRITE setName NOTIFY nameSet) Q_PROPERTY(QString note READ getNote WRITE setNote NOTIFY noteSet) Q_PROPERTY(QString label READ getLabel WRITE setLabel NOTIFY labelSet) Q_PROPERTY(bool hideDownload READ getHideDownload WRITE setHideDownload NOTIFY hideDownloadSet) @@ -210,7 +209,6 @@ class LinkShare : public Share const QString &uidFileOwner, const QString &ownerDisplayName, const QString &path, - const QString &name, const QString &token, const Permissions permissions, bool isPasswordSet, @@ -240,11 +238,6 @@ class LinkShare : public Share */ [[nodiscard]] bool getShowFileListing() const; - /* - * Returns the name of the link share. Can be empty. - */ - [[nodiscard]] QString getName() const; - /* * Returns the note of the link share. */ @@ -277,13 +270,6 @@ class LinkShare : public Share OcsShareJob *createShareJob(const LinkShareSlot slotFunction); public slots: - /* - * Set the name of the link share. - * - * Emits either nameSet() or serverError(). - */ - void setName(const QString &name); - /* * Set the note of the link share. */ @@ -310,18 +296,15 @@ public slots: signals: void expireDateSet(); void noteSet(); - void nameSet(); void labelSet(); private slots: void slotNoteSet(const QJsonDocument &, const QVariant &value); void slotExpireDateSet(const QJsonDocument &reply, const QVariant &value); - void slotNameSet(const QJsonDocument &, const QVariant &value); void slotLabelSet(const QJsonDocument &, const QVariant &value); void slotHideDownloadSet(const QJsonDocument &jsonDoc, const QVariant &hideDownload); private: - QString _name; QString _token; QString _note; QDate _expireDate; diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 324a5d5eb6c73..59df0bede9be5 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -816,7 +816,7 @@ private slots: if (!linkShare) continue; - if (linkShare->getName() == shareName) { + if (linkShare->getLabel() == shareName) { qCDebug(lcPublicLink) << "Found existing share, reusing"; return success(linkShare->getLink().toString()); }