From 3172b571c60778b86b69161138cb229232516195 Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Mon, 20 Sep 2021 16:33:57 -0500 Subject: [PATCH] Move "testing" string into BadgeConfiguration --- .../textsecuregcm/configuration/BadgeConfiguration.java | 6 ++++++ .../textsecuregcm/controllers/ProfileController.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java index 7a6235d98..54b8067b5 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java @@ -14,6 +14,8 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; public class BadgeConfiguration { + public static final String CATEGORY_TESTING = "testing"; + private final String id; private final URL imageUrl; private final String category; @@ -43,4 +45,8 @@ public class BadgeConfiguration { public String getCategory() { return category; } + + public boolean isTestBadge() { + return CATEGORY_TESTING.equals(category); + } } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java index bfc5e774a..3aa14af37 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java @@ -477,7 +477,7 @@ public class ProfileController { // This is for testing badges and allows them to be added to an account at any time with an expiration of 1 day // in the future. BadgeConfiguration badgeConfiguration = badgeConfigurationMap.get(badgeId); - if (badgeConfiguration != null && "testing".equals(badgeConfiguration.getCategory())) { + if (badgeConfiguration != null && badgeConfiguration.isTestBadge()) { result.put(badgeId, new AccountBadge(badgeId, clock.instant().plus(Duration.ofDays(1)), true)); continue; }