Move share path setting in sharemodel into separate private method

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
nextcloud · Jul 14, 2023 · 7f1216e · 7f1216e
1 parent 48f1dfa
commit 7f1216e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp
@@ -253,9 +253,7 @@ void ShareModel::updateData()
     qCDebug(lcShareModel) << "Updating share model data now.";
 
     const auto relPath = _localPath.mid(_folder->cleanPath().length() + 1);
-    const auto sharePath = _folder->remotePathTrailingSlash() + relPath;
-    const auto percentEncoded = QUrl::toPercentEncoding(sharePath);
-    _sharePath = QString::fromUtf8(percentEncoded);
+    updateRelativeSharePath(relPath);
 
     SyncJournalFileRecord fileRecord;
     auto resharingAllowed = true; // lets assume the good
@@ -323,6 +321,13 @@ void ShareModel::updateData()
     initShareManager();
 }
 
+void ShareModel::updateRelativeSharePath(const QString &relativePath)
+{
+    const auto unsanitisedSharePath = _folder->remotePathTrailingSlash() + relativePath;
+    const auto sanitisedSharePath = QUrl::toPercentEncoding(unsanitisedSharePath);
+    _sharePath = QString::fromUtf8(sanitisedSharePath);
+}
+
 void ShareModel::initShareManager()
 {
     if (!_accountState || _accountState->account().isNull()) {

diff --git a/src/gui/filedetails/sharemodel.h b/src/gui/filedetails/sharemodel.h
@@ -187,6 +187,7 @@ private slots:
     void handleSecureFileDropLinkShare();
     void handleLinkShare();
     void setupInternalLinkShare();
+    void updateRelativeSharePath(const QString &relativePath);
     void setSharePermissionChangeInProgress(const QString &shareId, const bool isInProgress);
     void setHideDownloadEnabledChangeInProgress(const QString &shareId, const bool isInProgress);