From f7f1a908208bdfa348fa3970bfde7635df18be16 Mon Sep 17 00:00:00 2001 From: samfundev Date: Sat, 20 May 2023 19:29:03 -0400 Subject: [PATCH] Skip broken badges --- app/src/main/java/com/perflyst/twire/chat/ChatManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/perflyst/twire/chat/ChatManager.java b/app/src/main/java/com/perflyst/twire/chat/ChatManager.java index d14fba60..ea213a9d 100644 --- a/app/src/main/java/com/perflyst/twire/chat/ChatManager.java +++ b/app/src/main/java/com/perflyst/twire/chat/ChatManager.java @@ -369,7 +369,11 @@ private void processVodChat() { JSONArray userBadgesArray = message.getJSONArray("userBadges"); for (int j = 0; j < userBadgesArray.length(); j++) { JSONObject userBadge = userBadgesArray.getJSONObject(j); - badges.put(userBadge.getString("setID"), userBadge.getString("version")); + String setID = userBadge.getString("setID"); + String version = userBadge.getString("version"); + if (setID.isEmpty() || version.isEmpty()) continue; + + badges.put(setID, version); } } @@ -677,6 +681,7 @@ private Badge getBadge(String badgeSet, String version) { if (globalSet != null && globalSet.get(version) != null) return globalSet.get(version); + Log.e(LOG_TAG, "Badge failed to load: \"" + badgeSet + "\" \"" + version + "\""); return null; }