Skip to content

Commit b15f86d

Browse files
committed
fix error on missing owner
1 parent 3adeac0 commit b15f86d

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
# 0.40.3-beta
4+
- fix issue for 7TV Emotes without owner
5+
36
# 0.40.2-beta
47
- move to 7TV API v3
58
- remove support for 7TV badges

bttv.manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "0.40.2-beta",
3-
"versionCode": "01208000331"
2+
"version": "0.40.3-beta",
3+
"versionCode": "01208000332"
44
}

mod/app/src/main/java/bttv/emote/Emote.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ public static Emote fromJson(JSONObject jsonObject, Emotes.Source source) throws
101101
} else {
102102
imageType = "png";
103103
}
104-
owner = data.getJSONObject("owner").getString("display_name");
104+
if (data.has("owner")) {
105+
owner = data.getJSONObject("owner").getString("display_name");
106+
} else {
107+
owner = null; // we don't get the owner
108+
}
105109
break;
106110
default:
107111
Log.w("LBTTVEmoteFromJson", "source unknown: " + source);

0 commit comments

Comments
 (0)