added check in case of future badge api change

twireapp · Jul 13, 2023 · 86904d2 · 86904d2
1 parent 7858dcf
commit 86904d2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/main/java/com/perflyst/twire/model/ChatMessage.java b/app/src/main/java/com/perflyst/twire/model/ChatMessage.java
@@ -32,7 +32,7 @@ public ChatMessage(String message, String name, String color, List<Badge> badges
         for (Badge badge : ChatManager.ffzBadgeMap.get(name.toLowerCase())) {
             if (badge.replaces != null) {
                 for (int i = 0; i < badges.size(); i++) {
-                    if (badges.get(i).name.equals(badge.replaces)) {
+                    if (badges.get(i) != null && badges.get(i).name.equals(badge.replaces)) {
                         badges.set(i, badge);
                         break;
                     }