diff options
| author | Forkk <forkk@forkk.net> | 2014-01-07 18:47:06 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-07 18:47:06 -0600 |
| commit | 8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf (patch) | |
| tree | df2a719ebb12f129165c487ab730a6328c9750e7 /logic/updater/NotificationChecker.cpp | |
| parent | fb83299e592ef7627d5914e0fbce70c570981124 (diff) | |
| parent | 3629f9b9995e375dad181268f5a70dc6cb7697a2 (diff) | |
| download | MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.gz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.lz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.xz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.zip | |
Merge branch 'new-version-system' into develop
Diffstat (limited to 'logic/updater/NotificationChecker.cpp')
| -rw-r--r-- | logic/updater/NotificationChecker.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp index 40367eac..b2d67632 100644 --- a/logic/updater/NotificationChecker.cpp +++ b/logic/updater/NotificationChecker.cpp @@ -5,8 +5,8 @@ #include <QJsonArray> #include "MultiMC.h" +#include "MultiMCVersion.h" #include "logic/net/CacheDownload.h" -#include "config.h" NotificationChecker::NotificationChecker(QObject *parent) : QObject(parent), m_notificationsUrl(QUrl(NOTIFICATION_URL)) @@ -66,7 +66,7 @@ void NotificationChecker::downloadSucceeded(int) entry.id = obj.value("id").toDouble(); entry.message = obj.value("message").toString(); entry.channel = obj.value("channel").toString(); - entry.buildtype = obj.value("buildtype").toString(); + entry.platform = obj.value("platform").toString(); entry.from = obj.value("from").toString(); entry.to = obj.value("to").toString(); const QString type = obj.value("type").toString("critical"); @@ -93,13 +93,14 @@ void NotificationChecker::downloadSucceeded(int) bool NotificationChecker::NotificationEntry::applies() const { - bool channelApplies = channel.isEmpty() || channel == VERSION_CHANNEL; - bool buildtypeApplies = buildtype.isEmpty() || buildtype == VERSION_BUILD_TYPE; + MultiMCVersion version = MMC->version(); + bool channelApplies = channel.isEmpty() || channel == version.channel; + bool platformApplies = platform.isEmpty() || platform == version.platform; bool fromApplies = from.isEmpty() || from == FULL_VERSION_STR || !versionLessThan(FULL_VERSION_STR, from); bool toApplies = to.isEmpty() || to == FULL_VERSION_STR || !versionLessThan(to, FULL_VERSION_STR); - return channelApplies && buildtypeApplies && fromApplies && toApplies; + return channelApplies && platformApplies && fromApplies && toApplies; } bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1, |