From 79b906f12f0b8748e339d4f66c98495c234c4c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 18 Jan 2024 13:30:21 -0500
Subject: [PATCH] donation: update end date for donation campaign
Change-Id: Ib694bfb4bc194e7d6b24bf23f52949715e2efa11
---
src/app/appsettingsmanager.h | 2 +-
src/app/constant/JamiQmlUtils.qml | 2 +-
src/app/utilsadapter.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h
index 18cd49f8d..ac2f57974 100644
--- a/src/app/appsettingsmanager.h
+++ b/src/app/appsettingsmanager.h
@@ -75,7 +75,7 @@ extern const QString defaultDownloadPath;
#define KEYS COMMON_KEYS \
X(Donation2023VisibleDate, "2023-11-27 05:00") \
X(IsDonationVisible, true) \
- X(Donation2023EndDate, "2024-01-31 00:00")
+ X(Donation2023EndDate2, "2024-04-01 00:00")
#endif
/*
diff --git a/src/app/constant/JamiQmlUtils.qml b/src/app/constant/JamiQmlUtils.qml
index 9f9811cfb..6aa09d739 100644
--- a/src/app/constant/JamiQmlUtils.qml
+++ b/src/app/constant/JamiQmlUtils.qml
@@ -89,7 +89,7 @@ Item {
// The banner is visible if the current date is after the date set in the settings and before the end date
// And if the donation toggle is checked
const isVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible);
- const endDate = Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023EndDate));
+ const endDate = Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023EndDate2));
const startDate = Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023VisibleDate));
const now = new Date();
return isVisible && now < endDate && now >= startDate;
diff --git a/src/app/utilsadapter.cpp b/src/app/utilsadapter.cpp
index e6bb76ac9..a9689eb72 100644
--- a/src/app/utilsadapter.cpp
+++ b/src/app/utilsadapter.cpp
@@ -98,7 +98,7 @@ UtilsAdapter::setAppValue(const Settings::Key key, const QVariant& value)
// Any donation campaign-related keys can trigger a donation campaign check
else if (key == Settings::Key::IsDonationVisible
|| key == Settings::Key::Donation2023VisibleDate
- || key == Settings::Key::Donation2023EndDate)
+ || key == Settings::Key::Donation2023EndDate2)
Q_EMIT donationCampaignSettingsChanged();
#endif
}
--
GitLab