Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement several pieces of UI polish for badges.

Browse Source
This commit is contained in:
Alex Hart
2021-10-28 13:59:05 -03:00
committed by Greyson Parrelli
parent 186bd9db48
commit 755ec672c0
33 changed files with 364 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@@ -23,6 +23,7 @@ import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.profiles.ProfileKey;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.thoughtcrime.securesms.badges.Badges;
import org.thoughtcrime.securesms.badges.models.Badge;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
@@ -1370,16 +1371,7 @@ public class RecipientDatabase extends Database {
List<BadgeList.Badge> protoBadges = badgeList.getBadgesList();
badges = new ArrayList<>(protoBadges.size());
for (BadgeList.Badge protoBadge : protoBadges) {
badges.add(new Badge(
protoBadge.getId(),
Badge.Category.Companion.fromCode(protoBadge.getCategory()),
protoBadge.getName(),
protoBadge.getDescription(),
Uri.parse(protoBadge.getImageUrl()),
protoBadge.getImageDensity(),
protoBadge.getExpiration(),
protoBadge.getVisible()
));
badges.add(Badges.fromDatabaseBadge(protoBadge));
}
} else {
badges = Collections.emptyList();
@@ -1712,15 +1704,7 @@ public class RecipientDatabase extends Database {
BadgeList.Builder badgeListBuilder = BadgeList.newBuilder();
for (final Badge badge : badges) {
badgeListBuilder.addBadges(BadgeList.Badge.newBuilder()
.setId(badge.getId())
.setCategory(badge.getCategory().getCode())
.setDescription(badge.getDescription())
.setExpiration(badge.getExpirationTimestamp())
.setVisible(badge.getVisible())
.setName(badge.getName())
.setImageUrl(badge.getImageUrl().toString())
.setImageDensity(badge.getImageDensity()));
badgeListBuilder.addBadges(Badges.toDatabaseBadge(badge));
}
ContentValues values = new ContentValues(1);