Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-17 04:00:48 +01:00
Code Issues Releases Wiki Activity

fixed status object without user field

Browse Source
This commit is contained in:
Mariotaku Lee 2015-09-03 14:16:38 +08:00
parent 1c4feb98cb
commit 04b02a27e6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Activity.java
View File

@ -35,6 +35,7 @@ public interface Activity extends TwitterResponse, Comparable<Activity> {
int ACTION_QUOTE = 0x0A;
int ACTION_RETWEETED_MENTION = 0x0B;
int ACTION_FAVORITED_MENTION = 0x0C;
int ACTION_JOINED_TWITTER = 0x0D;
Action getAction();
@ -70,7 +71,7 @@ public interface Activity extends TwitterResponse, Comparable<Activity> {
RETWEET(ACTION_RETWEET), LIST_MEMBER_ADDED(ACTION_LIST_MEMBER_ADDED), LIST_CREATED(ACTION_LIST_CREATED),
FAVORITED_RETWEET(ACTION_FAVORITED_RETWEET), RETWEETED_RETWEET(ACTION_RETWEETED_RETWEET),
QUOTE(ACTION_QUOTE), RETWEETED_MENTION(ACTION_RETWEETED_MENTION),
FAVORITED_MENTION(ACTION_FAVORITED_MENTION);
FAVORITED_MENTION(ACTION_FAVORITED_MENTION), JOINED_TWITTER(ACTION_JOINED_TWITTER);
private final int actionId;
@ -91,6 +92,7 @@ public interface Activity extends TwitterResponse, Comparable<Activity> {
if ("quote".equalsIgnoreCase(string)) return QUOTE;
if ("retweeted_mention".equalsIgnoreCase(string)) return RETWEETED_MENTION;
if ("favorited_mention".equalsIgnoreCase(string)) return FAVORITED_MENTION;
if ("joined_twitter".equalsIgnoreCase(string)) return JOINED_TWITTER;
throw new IllegalArgumentException("Unknown action " + string);
}

1
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/impl/ActivityImpl.java
View File

@ -147,6 +147,7 @@ public class ActivityImpl extends TwitterResponseImpl implements Activity {
case RETWEETED_MENTION:
case FAVORITED_MENTION: {
instance.targetObjectUsers = LoganSquare.mapperFor(User.class).parseList(jsonParser).toArray(new User[instance.targetObjectsSize]);
break;
}
}
}

3
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/impl/StatusImpl.java
View File

@ -332,8 +332,7 @@ public class StatusImpl extends TwitterResponseImpl implements Status {
@OnJsonParseComplete
void onJsonParseComplete() throws IOException {
if (id <= 0 || user == null || text == null)
throw new IOException("Malformed Status object");
if (id <= 0 || text == null) throw new IOException("Malformed Status object");
}
@JsonObject