fix error on missing owner

bttv-android · Nov 3, 2023 · b15f86d · b15f86d
1 parent 3adeac0
commit b15f86d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+# 0.40.3-beta
+- fix issue for 7TV Emotes without owner
+
 # 0.40.2-beta
 - move to 7TV API v3
 - remove support for 7TV badges

diff --git a/bttv.manifest.json b/bttv.manifest.json
@@ -1,4 +1,4 @@
 {
-  "version": "0.40.2-beta",
-  "versionCode": "01208000331"
+  "version": "0.40.3-beta",
+  "versionCode": "01208000332"
 }
diff --git a/mod/app/src/main/java/bttv/emote/Emote.java b/mod/app/src/main/java/bttv/emote/Emote.java
@@ -101,7 +101,11 @@ public static Emote fromJson(JSONObject jsonObject, Emotes.Source source) throws
                 } else {
                     imageType = "png";
                 }
-                owner = data.getJSONObject("owner").getString("display_name");
+                if (data.has("owner")) {
+                    owner = data.getJSONObject("owner").getString("display_name");
+                } else {
+                    owner = null; // we don't get the owner
+                }
                 break;
             default:
                 Log.w("LBTTVEmoteFromJson", "source unknown: " + source);