From 15b8c70bb4bfe50494f00c4e985e1d568c35ca89 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 25 Jun 2019 14:47:14 +0200 Subject: Actually remember history of all disclaimer/privacy versions --- .../main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java | 6 ++++-- .../java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java index 07acbca7..2974773b 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java @@ -54,14 +54,16 @@ public class DisclaimerWindow extends GenericNoticeWindow implements UiFeedback @Override public void actionPerformed(ActionEvent e) { // save the agreement to config - Config.setDisclaimerAgreement(DISCLAIMER_NOTICE_MD5); + Config.setDisclaimerAgreement(Config.getDisclaimerAgreement() + .replace(DISCLAIMER_NOTICE_MD5, "") + .concat(DISCLAIMER_NOTICE_MD5)); me.dispose(); } }); } public static boolean shouldBeShown() { - return !Config.getDisclaimerAgreement().equals(DISCLAIMER_NOTICE_MD5); + return !Config.getDisclaimerAgreement().contains(DISCLAIMER_NOTICE_MD5); } public static void open(Frame modalParent) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java index 3b328a00..3743664a 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java @@ -53,14 +53,16 @@ public class PrivacyNoticeWindow extends GenericNoticeWindow implements UiFeedba @Override public void actionPerformed(ActionEvent e) { // save the agreement to config - Config.setPrivacyAgreement(PRIVACY_NOTICE_MD5); + Config.setPrivacyAgreement(Config.getPrivacyAgreement() + .replace(PRIVACY_NOTICE_MD5, "") + .concat(PRIVACY_NOTICE_MD5)); me.dispose(); } }); } public static boolean shouldBeShown() { - return !Config.getPrivacyAgreement().equals(PRIVACY_NOTICE_MD5); + return !Config.getPrivacyAgreement().contains(PRIVACY_NOTICE_MD5); } public static void open(Frame modalParent) { -- cgit v1.2.3-55-g7522