From e79ab2521f4498caa9c8b05f688b0e24665fa8f1 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Wed, 15 Sep 2021 19:31:24 -0500
Subject: [PATCH] Rename field in ConfiguredProfileBadgeConverter

---
 .../badges/ConfiguredProfileBadgeConverter.java           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java b/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java
index ac602e2ba..35fa65a28 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java
@@ -30,7 +30,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
 
   private final Clock clock;
   private final Map<String, BadgeConfiguration> knownBadges;
-  private final List<String> forcedOnBadges;
+  private final List<String> badgeIdsEnabledForAll;
   private final ResourceBundleFactory resourceBundleFactory;
 
   public ConfiguredProfileBadgeConverter(
@@ -47,7 +47,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
     this.clock = clock;
     this.knownBadges = badgesConfiguration.getBadges().stream()
         .collect(Collectors.toMap(BadgeConfiguration::getId, Function.identity()));
-    this.forcedOnBadges = badgesConfiguration.getBadgeIdsEnabledForAll();
+    this.badgeIdsEnabledForAll = badgesConfiguration.getBadgeIdsEnabledForAll();
     this.resourceBundleFactory = resourceBundleFactory;
   }
 
@@ -55,7 +55,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
   public List<Badge> convert(
       final List<Locale> acceptableLanguages,
       final List<AccountBadge> accountBadges) {
-    if (accountBadges.isEmpty() && forcedOnBadges.isEmpty()) {
+    if (accountBadges.isEmpty() && badgeIdsEnabledForAll.isEmpty()) {
       return List.of();
     }
 
@@ -103,7 +103,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
               resourceBundle.getString(accountBadge.getId() + "_description"));
         })
         .collect(Collectors.toCollection(ArrayList::new));
-    badges.addAll(forcedOnBadges.stream().filter(knownBadges::containsKey).map(id -> {
+    badges.addAll(badgeIdsEnabledForAll.stream().filter(knownBadges::containsKey).map(id -> {
       BadgeConfiguration configuration = knownBadges.get(id);
       return new Badge(
           id,