Skip to content

[stable-4.0] fix(sharing): parse received timestamp from expiration date #9888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilsding merged 1 commit into from
Apr 22, 2026
Merged

[stable-4.0] fix(sharing): parse received timestamp from expiration date #9888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/gui/sharemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ void LinkShare::slotExpireDateSet(const QJsonDocument &reply, const QVariant &va
* they use this date.
*/
if (data.value("expiration"_L1).isString()) {
_expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
_expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
} else {
_expireDate = value.toDate();
}
Expand Down Expand Up @@ -400,7 +400,7 @@ void UserGroupShare::slotExpireDateSet(const QJsonDocument &reply, const QVarian
* they use this date.
*/
if (data.value("expiration"_L1).isString()) {
_expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
_expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
} else {
_expireDate = value.toDate();
}
Expand Down Expand Up @@ -608,7 +608,7 @@ QSharedPointer<UserGroupShare> ShareManager::parseUserGroupShare(const QJsonObje

QDate expireDate;
if (data.value("expiration"_L1).isString()) {
expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
}

QString note;
Expand Down Expand Up @@ -649,7 +649,7 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data)

QDate expireDate;
if (data.value("expiration"_L1).isString()) {
expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
}

QString note;
Expand Down
4 changes: 2 additions & 2 deletions test/sharetestutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,10 @@ QNetworkReply *ShareTestHelper::handleSharePutOperation(const QNetworkAccessMana
auto requestKey = requestSplit.first();
auto requestValue = requestSplit.last();

// We send expireDate without time but the server returns with time at 00:00:00
// We send expireDate without time but the server returns with time at 23:59:59
if (requestKey == "expireDate") {
requestKey = "expiration";
requestValue.append(" 00:00:00");
requestValue.append(" 23:59:59");
}

shareObject.insert(QString(requestKey), QString(requestValue));
Expand Down
2 changes: 1 addition & 1 deletion test/sharetestutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include <QObject>

Check failure on line 8 in test/sharetestutils.h

View workflow job for this annotation

GitHub Actions / build

test/sharetestutils.h:8:10 [clang-diagnostic-error] 

'QObject' file not found
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
Expand Down Expand Up @@ -92,7 +92,7 @@

static constexpr auto testFileName = "file.md";
static constexpr auto searchResultsReplyDelay = 100;
static constexpr auto expectedDtFormat = "yyyy-MM-dd 00:00:00";
static constexpr auto expectedDtFormat = "yyyy-MM-dd 23:59:59";

const QByteArray createNewShare(const Share::ShareType shareType, const QString &shareWith, const QString &password);
[[nodiscard]] int shareCount() const;
Expand Down
Loading