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

fixed crashes on refresh

This commit is contained in:
Mariotaku Lee 2015-11-11 17:49:05 +08:00
parent 0e1ee9d999
commit d854cf180d
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class MediaEntityImpl implements MediaEntity {
@JsonField(name = "id")
long id;
@JsonField(name = "indices")
@JsonField(name = "indices", typeConverter = IndicesConverter.class)
Indices indices;
@JsonField(name = "media_url")

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

@ -29,7 +29,7 @@ import org.mariotaku.twidere.api.twitter.model.UrlEntity;
*/
@JsonObject
public class UrlEntityImpl implements UrlEntity {
@JsonField(name = "indices")
@JsonField(name = "indices", typeConverter = IndicesConverter.class)
Indices indices;
@JsonField(name = "display_url")
String displayUrl;

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

@ -29,7 +29,7 @@ import org.mariotaku.twidere.api.twitter.model.UserMentionEntity;
*/
@JsonObject
public class UserMentionEntityImpl implements UserMentionEntity {
@JsonField(name = "indices")
@JsonField(name = "indices", typeConverter = IndicesConverter.class)
Indices indices;
@JsonField(name = "id")
long id;

2
twidere/src/main/java/edu/tsinghua/hotmobi/HotMobiLogger.java
View File

@ -102,6 +102,8 @@ public class HotMobiLogger {
return "battery";
} else if (event instanceof NotificationEvent) {
return "notification";
} else if (event instanceof ScreenEvent) {
return "screen";
}
throw new UnsupportedOperationException("Unknown event type " + event);
}

18
twidere/src/main/java/edu/tsinghua/hotmobi/model/ScreenEvent.java
View File

@ -34,6 +34,13 @@ public class ScreenEvent extends BaseEvent {
@JsonField(name = "action", typeConverter = Action.ScreenActionConverter.class)
Action action;
public static ScreenEvent create(Context context, Action action) {
final ScreenEvent event = new ScreenEvent();
event.markStart(context);
event.setAction(action);
return event;
}
public Action getAction() {
return action;
}
@ -42,11 +49,11 @@ public class ScreenEvent extends BaseEvent {
this.action = action;
}
public static ScreenEvent create(Context context, Action action) {
final ScreenEvent event = new ScreenEvent();
event.markStart(context);
event.setAction(action);
return event;
@Override
public String toString() {
return "ScreenEvent{" +
"action=" + action +
"} " + super.toString();
}
public enum Action {
@ -81,5 +88,4 @@ public class ScreenEvent extends BaseEvent {
}
}
}
}