From: Olivier Goffart <ogoffart@woboq.com>
Date: Wed, 24 Oct 2018 10:47:41 +0000 (+0200)
Subject: Sharing: add the `shareWithAdditionalInfo` string in autocompletion results
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~450
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ec8c02dad084f0303685afd05f23a306b2804f28;p=nextcloud-desktop.git

Sharing: add the `shareWithAdditionalInfo` string in autocompletion results

Issue #6749
---

diff --git a/src/gui/sharee.cpp b/src/gui/sharee.cpp
index c2903f897..ed447e2a8 100644
--- a/src/gui/sharee.cpp
+++ b/src/gui/sharee.cpp
@@ -125,9 +125,13 @@ void ShareeModel::shareesFetched(const QJsonDocument &reply)
 
 QSharedPointer<Sharee> ShareeModel::parseSharee(const QJsonObject &data)
 {
-    const QString displayName = data.value("label").toString();
+    QString displayName = data.value("label").toString();
     const QString shareWith = data.value("value").toObject().value("shareWith").toString();
     Sharee::Type type = (Sharee::Type)data.value("value").toObject().value("shareType").toInt();
+    const QString additionalInfo = data.value("value").toObject().value("shareWithAdditionalInfo").toString();
+    if (!additionalInfo.isEmpty()) {
+        displayName = tr("%1 (%2)", "sharee (shareWithAdditionalInfo)").arg(displayName, additionalInfo);
+    }
 
     return QSharedPointer<Sharee>(new Sharee(shareWith, displayName, type));
 }