Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorCamila <hello@camila.codes>2021-09-14 21:57:28 +0300
committerallexzander (Rebase PR Action) <allexzander@users.noreply.github.com>2021-09-17 09:57:08 +0300
commite4e74ff38fe5d6d89ffdaeac49185f40badc6647 (patch)
tree815a13799003594e57676ea0d22bfd9ad418a4b1 /src/gui
parent4581279d23e4c23e40ecee5b5e22cf879d822f89 (diff)
Display share note when there is one associated with a share link.
Signed-off-by: Camila <hello@camila.codes>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/sharemanager.cpp12
-rw-r--r--src/gui/sharemanager.h5
2 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index dbeab8625..4b40213e3 100644
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -195,10 +195,12 @@ LinkShare::LinkShare(AccountPtr account,
Permissions permissions,
bool isPasswordSet,
const QUrl &url,
- const QDate &expireDate)
+ const QDate &expireDate,
+ const QString &note)
: Share(account, id, uidowner, ownerDisplayName, path, Share::TypeLink, isPasswordSet, permissions)
, _name(name)
, _token(token)
+ , _note(note)
, _expireDate(expireDate)
, _url(url)
{
@@ -529,6 +531,11 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data)
if (data.value("expiration").isString()) {
expireDate = QDate::fromString(data.value("expiration").toString(), "yyyy-MM-dd 00:00:00");
}
+
+ QString note;
+ if (data.value("note").isString()) {
+ note = data.value("note").toString();
+ }
return QSharedPointer<LinkShare>(new LinkShare(_account,
data.value("id").toVariant().toString(), // "id" used to be an integer, support both
@@ -540,7 +547,8 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data)
(Share::Permissions)data.value("permissions").toInt(),
data.value("share_with").isString(), // has password?
url,
- expireDate));
+ expireDate,
+ note));
}
QSharedPointer<Share> ShareManager::parseShare(const QJsonObject &data)
diff --git a/src/gui/sharemanager.h b/src/gui/sharemanager.h
index a764163f6..64a3a22da 100644
--- a/src/gui/sharemanager.h
+++ b/src/gui/sharemanager.h
@@ -175,7 +175,8 @@ public:
const Permissions permissions,
bool isPasswordSet,
const QUrl &url,
- const QDate &expireDate);
+ const QDate &expireDate,
+ const QString &note);
/*
* Get the share link
@@ -205,7 +206,6 @@ public:
/*
* Returns the note of the link share.
*/
-
QString getNote() const;
/*
@@ -215,7 +215,6 @@ public:
*/
void setName(const QString &name);
-
/*
* Set the note of the link share.
*/