Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

hotfix for unsupported card entity

This commit is contained in:
Mariotaku Lee 2015-04-09 02:00:33 +08:00
parent efa748dea2
commit 3a7bd9da5d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java
View File

@ -96,8 +96,8 @@ public class CardEntityJSONImpl implements CardEntity {
return type;
}
private static BindingValue valueOf(String name, JSONObject json) throws JSONException {
final String type = json.optString("type");
private static BindingValue valueOf(String name, JSONObject json) throws JSONException, TwitterException {
final String type = json.getString("type");
if (TYPE_STRING.equals(type)) {
return new StringValueImpl(name, json);
} else if (TYPE_IMAGE.equals(type)) {
@ -107,15 +107,17 @@ public class CardEntityJSONImpl implements CardEntity {
} else if (TYPE_BOOLEAN.equals(type)) {
return new BooleanValueImpl(name, json);
}
throw new UnsupportedOperationException(String.format("Unsupported type %s", type));
throw new TwitterException(String.format("Unsupported type %s", type));
}
private static HashMap<String, BindingValue> valuesOf(JSONObject json) throws JSONException {
private static HashMap<String, BindingValue> valuesOf(JSONObject json) throws JSONException, TwitterException {
final Iterator<String> keys = json.keys();
final HashMap<String, BindingValue> values = new HashMap<>();
while (keys.hasNext()) {
String key = keys.next();
values.put(key, valueOf(key, json.getJSONObject(key)));
final String key = keys.next();
if (!json.isNull("name")) {
values.put(key, valueOf(key, json.getJSONObject(key)));
}
}
return values;
}