MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename field in ConfiguredProfileBadgeConverter

This commit is contained in:
Ehren Kret 2021-09-15 19:31:24 -05:00
parent fb1f99da87
commit e79ab2521f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java
View File

@ -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,