Merge pull request #5131 from nextcloud/feature/implement-internal-li…

…nk-share

Add an internal link share to the share dialog

src/gui/filedetails/ShareDelegate.qml

@@ -53,11 +53,13 @@ GridLayout {
 
     readonly property bool isLinkShare: model.shareType === ShareModel.ShareTypeLink
     readonly property bool isPlaceholderLinkShare: model.shareType === ShareModel.ShareTypePlaceholderLink
+    readonly property bool isInternalLinkShare: model.shareType === ShareModel.ShareTypeInternalLink
 
     readonly property string text: model.display ?? ""
     readonly property string detailText: model.detailText ?? ""
     readonly property string iconUrl: model.iconUrl ?? ""
     readonly property string avatarUrl: model.avatarUrl ?? ""
+    readonly property string link: model.link ?? ""
 
     anchors.left: parent.left
     anchors.right: parent.right
@@ -183,7 +185,7 @@ GridLayout {
             icon.width: 16
             icon.height: 16
 
-            visible: root.isLinkShare
+            visible: root.isLinkShare || root.isInternalLinkShare
             enabled: visible
 
             onClicked: {
@@ -210,7 +212,7 @@ GridLayout {
 
             imageSource: "image://svgimage-custom-color/more.svg/" + Style.ncTextColor
 
-            visible: !root.isPlaceholderLinkShare
+            visible: !root.isPlaceholderLinkShare && !root.isInternalLinkShare
             enabled: visible
 
             onClicked: root.rootStackView.push(shareDetailsPageComponent, {}, StackView.PushTransition)

src/gui/filedetails/ShareDetailsPage.qml

@@ -72,7 +72,6 @@ Page {
     readonly property bool passwordEnforced: shareModelData.passwordEnforced
 
     readonly property bool isLinkShare: shareModelData.shareType === ShareModel.ShareTypeLink
-    readonly property bool isPlaceholderLinkShare: shareModelData.shareType === ShareModel.ShareTypePlaceholderLink
 
     property bool waitingForEditingAllowedChange: false
     property bool waitingForNoteEnabledChange: false

src/gui/filedetails/sharemodel.cpp

@@ -24,7 +24,8 @@
 
 namespace {
 
-static const QString placeholderLinkShareId = QStringLiteral("__placeholderLinkShareId__");
+static const auto placeholderLinkShareId = QStringLiteral("__placeholderLinkShareId__");
+static const auto internalLinkShareId = QStringLiteral("__internalLinkShareId__");
 
 QString createRandomPassword()
 {
@@ -129,6 +130,8 @@ QVariant ShareModel::data(const QModelIndex &index, const int role) const
             return startOfExpireDayUTC.toMSecsSinceEpoch();
         }
         }
+    } else if (share->getShareType() == Share::TypeInternalLink && role == LinkRole) {
+        return _privateLinkUrl;
     }
 
     switch(role) {
@@ -190,6 +193,8 @@ void ShareModel::resetData()
     _sharePath.clear();
     _maxSharingPermissions = {};
     _numericFileId.clear();
+    _privateLinkUrl.clear();
+    _filelockState = {};
     _manager.clear();
     _shares.clear();
     _fetchOngoing = false;
@@ -256,12 +261,19 @@ void ShareModel::updateData()
                                           _sharePath,
                                           Share::TypePlaceholderLink));
 
+    _internalLinkShare.reset(new Share(_accountState->account(),
+                                       internalLinkShareId,
+                                       _accountState->account()->id(),
+                                       _accountState->account()->davDisplayName(),
+                                       _sharePath,
+                                       Share::TypeInternalLink));
+
     auto job = new PropfindJob(_accountState->account(), _sharePath);
     job->setProperties(
         QList<QByteArray>()
-        << "https://open-collaboration-services.org/ns:share-permissions"
-        << "https://owncloud.org/ns:fileid" // numeric file id for fallback private link generation
-        << "https://owncloud.org/ns:privatelink");
+        << "http://open-collaboration-services.org/ns:share-permissions"
+        << "http://owncloud.org/ns:fileid" // numeric file id for fallback private link generation
+        << "http://owncloud.org/ns:privatelink");
     job->setTimeout(10 * 1000);
     connect(job, &PropfindJob::result, this, &ShareModel::slotPropfindReceived);
     connect(job, &PropfindJob::finishedWithError, this, [&](const QNetworkReply *reply) {
@@ -359,6 +371,8 @@ void ShareModel::slotPropfindReceived(const QVariantMap &result)
         qCInfo(lcShareModel) << "Received numeric file id for" << _sharePath << numericFileId;
         _privateLinkUrl = _accountState->account()->deprecatedPrivateLinkUrl(numericFileId).toString(QUrl::FullyEncoded);
     }
+
+    setupInternalLinkShare();
 }
 
 void ShareModel::slotSharesFetched(const QList<SharePtr> &shares)
@@ -384,6 +398,21 @@ void ShareModel::slotSharesFetched(const QList<SharePtr> &shares)
     handlePlaceholderLinkShare();
 }
 
+void ShareModel::setupInternalLinkShare()
+{
+    if (!_accountState ||
+        _accountState->account().isNull() ||
+        _localPath.isEmpty() ||
+        _privateLinkUrl.isEmpty()) {
+        return;
+    }
+
+    beginInsertRows({}, _shares.count(), _shares.count());
+    _shares.append(_internalLinkShare);
+    endInsertRows();
+    Q_EMIT internalLinkReady();
+}
+
 void ShareModel::slotAddShare(const SharePtr &share)
 {
     if (share.isNull()) {
@@ -508,6 +537,8 @@ QString ShareModel::displayStringForShare(const SharePtr &share) const
         return displayString;
     } else if (share->getShareType() == Share::TypePlaceholderLink) {
         return tr("Link share");
+    } else if (share->getShareType() == Share::TypeInternalLink) {
+        return tr("Internal link");
     } else if (share->getShareWith()) {
         return share->getShareWith()->format();
     }
@@ -521,6 +552,8 @@ QString ShareModel::iconUrlForShare(const SharePtr &share) const
     const auto iconsPath = QStringLiteral("image://svgimage-custom-color/");
 
     switch(share->getShareType()) {
+    case Share::TypeInternalLink:
+        return QString(iconsPath + QStringLiteral("external.svg"));
     case Share::TypePlaceholderLink:
     case Share::TypeLink:
         return QString(iconsPath + QStringLiteral("public.svg"));

src/gui/filedetails/sharemodel.h

@@ -74,6 +74,7 @@ class ShareModel : public QAbstractListModel
         ShareTypeCircle = Share::TypeCircle,
         ShareTypeRoom = Share::TypeRoom,
         ShareTypePlaceholderLink = Share::TypePlaceholderLink,
+        ShareTypeInternalLink = Share::TypeInternalLink,
     };
     Q_ENUM(ShareType);
 
@@ -109,6 +110,7 @@ class ShareModel : public QAbstractListModel
     void fetchOngoingChanged();
     void hasInitialShareFetchCompletedChanged();
     void shareesChanged();
+    void internalLinkReady();
 
     void serverError(const int code, const QString &message);
     void passwordSetError(const QString &shareId, const int code, const QString &message);
@@ -157,6 +159,7 @@ private slots:
     void updateData();
     void initShareManager();
     void handlePlaceholderLinkShare();
+    void setupInternalLinkShare();
 
     void slotPropfindReceived(const QVariantMap &result);
     void slotServerError(const int code, const QString &message);
@@ -183,6 +186,7 @@ private slots:
     bool _fetchOngoing = false;
     bool _hasInitialShareFetchCompleted = false;
     SharePtr _placeholderLinkShare;
+    SharePtr _internalLinkShare;
 
     // DO NOT USE QSHAREDPOINTERS HERE.
     // QSharedPointers MUST NOT be used with pointers already assigned to other shared pointers.

src/gui/filedetails/sortedsharemodel.cpp

@@ -73,12 +73,23 @@ bool SortedShareModel::lessThan(const QModelIndex &sourceLeft, const QModelIndex
     const auto leftShareType = leftShare->getShareType();
 
     // Placeholder link shares always go at top
-    if(leftShareType == Share::TypePlaceholderLink) {
+    if (leftShareType == Share::TypePlaceholderLink) {
         return true;
+    } else if (leftShareType == Share::TypeInternalLink) {
+        // Internal links always at bottom
+        return false;
     }
 
     const auto rightShareType = rightShare->getShareType();
 
+    // Placeholder link shares always go at top
+    if (rightShareType == Share::TypePlaceholderLink) {
+        return false;
+    } else if (rightShareType == Share::TypeInternalLink) {
+        // Internal links always at bottom
+        return true;
+    }
+
     // We want to place link shares at the top
     if (leftShareType == Share::TypeLink && rightShareType != Share::TypeLink) {
         return true;

src/gui/sharemanager.h

@@ -52,6 +52,7 @@ class Share : public QObject
      * Need to be in sync with Sharee::Type
      */
     enum ShareType {
+        TypeInternalLink = -2,
         TypePlaceholderLink = -1,
         TypeUser = Sharee::User,
         TypeGroup = Sharee::Group,

test/sharetestutils.cpp

@@ -143,7 +143,9 @@ void ShareTestHelper::setup()
 
     const auto folderMan = FolderMan::instance();
     QCOMPARE(folderMan, &fm);
-    QVERIFY(folderMan->addFolder(accountState.data(), folderDefinition(fakeFolder.localPath())));
+    auto folderDef = folderDefinition(fakeFolder.localPath());
+    folderDef.targetPath = QString();
+    QVERIFY(folderMan->addFolder(accountState.data(), folderDef));
     const auto folder = FolderMan::instance()->folder(fakeFolder.localPath());
     QVERIFY(folder);
     QVERIFY(fakeFolder.syncOnce());