aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-01-28 19:12:07 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-01-28 22:16:59 +0900
commit7461aa7513f57c80c06bce0828c450deceb30785 (patch)
treea83a42c92c753feb04b50472b5ada1224b9a21b0 /app/src/main
parent729ed288527d5362a20e372c1458c91296eb18af (diff)
downloadSmileEssence-7461aa7513f57c80c06bce0828c450deceb30785.tar.gz
Upgrade SDK; Upgrade Twitter4J
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/entity/EntitySupport.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/EntitySupport.java b/app/src/main/java/net/lacolaco/smileessence/entity/EntitySupport.java
index 8b3d2895..9629bea2 100644
--- a/app/src/main/java/net/lacolaco/smileessence/entity/EntitySupport.java
+++ b/app/src/main/java/net/lacolaco/smileessence/entity/EntitySupport.java
@@ -15,7 +15,7 @@ public abstract class EntitySupport extends UIObservable {
protected void updateEntities(twitter4j.EntitySupport status) {
mentions = extractMentions(status.getUserMentionEntities());
hashtags = extractHashtags(status.getHashtagEntities());
- mediaUrls = extractMediaUrls(status.getExtendedMediaEntities().length > 0 ? status.getExtendedMediaEntities() : status.getMediaEntities());
+ mediaUrls = extractMediaUrls(status.getMediaEntities());
urlsExpanded = extractExpandedUrls(status.getURLEntities());
symbols = extractSymbols(status.getSymbolEntities());
}
@@ -107,9 +107,7 @@ public abstract class EntitySupport extends UIObservable {
if (status.getURLEntities() != null) {
Collections.addAll(set, status.getURLEntities());
}
- if (status.getExtendedMediaEntities() != null) {
- Collections.addAll(set, status.getExtendedMediaEntities());
- } else if (status.getMediaEntities() != null) {
+ if (status.getMediaEntities() != null) {
Collections.addAll(set, status.getMediaEntities());
}