Upgrade SDK; Upgrade Twitter4J

3 files changed, 30 insertions, 37 deletions

diff --git a/app/app.iml b/app/app.iml
index e43fb25e..9b125e09 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -36,6 +36,7 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
@@ -44,7 +45,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -95,13 +95,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.databinding/adapters/1.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.databinding/library/1.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/25.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.3.6/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.8/jars" />
@@ -132,44 +132,44 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="library-1.0.19" level="project" />
     <orderEntry type="library" exported="" name="juniversalchardet-1.0.3" level="project" />
     <orderEntry type="library" exported="" name="haha-2.0.3" level="project" />
     <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-analyzer-1.4" level="project" />
-    <orderEntry type="library" exported="" name="twitter4j-stream-support_extended_tweets-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="compiler-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="adapters-1.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v13-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="baseLibrary-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="antlr4-runtime-4.5" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-watcher-1.4" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.1.0" level="project" />
+    <orderEntry type="library" exported="" name="twitter4j-stream-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-android-1.4" level="project" />
     <orderEntry type="library" exported="" name="library-1.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.10" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v13-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="guava-19.0" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="twitter4j-media-support-support_extended_tweets-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="rxjava-1.1.9" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-2.5.5" level="project" />
     <orderEntry type="library" exported="" name="orma-annotations-2.6.0" level="project" />
-    <orderEntry type="library" exported="" name="twitter4j-core-support_extended_tweets-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="orma-2.6.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.8" level="project" />
     <orderEntry type="library" exported="" name="beta-1.1.4" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" />
+    <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" />
     <orderEntry type="library" exported="" name="orma-migration-2.6.0" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="kotlin-runtime-1.0.3" level="project" />
     <orderEntry type="library" exported="" name="answers-1.3.6" level="project" />
+    <orderEntry type="library" exported="" name="twitter4j-core-4.0.6" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fd449b62..81914dc5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,13 +5,13 @@ apply plugin: 'io.fabric'
 apply plugin: "com.neenbedankt.android-apt"
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "jp.rhe.smileessence2"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
 
         versionName "git -C ${rootDir} describe --tags --long --dirty --always".execute().text.trim()
         versionCode "git -C ${rootDir} rev-list HEAD --count".execute().text.trim().toInteger()
@@ -62,8 +62,8 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-v4:24.+'
-    compile 'com.android.support:support-v13:24.+'
+    compile 'com.android.support:support-v4:25.+'
+    compile 'com.android.support:support-v13:25.+'
     // volley
     compile 'com.mcxiaoke.volley:library:1.0.19'
     // crouton
@@ -74,13 +74,9 @@ dependencies {
     // pull to refresh
     compile 'com.navercorp.pulltorefresh:library:3.3.0-SNAPSHOT@aar'
     // t4j
-    // FIXME: restore after the pull request is merged
-    // compile 'org.twitter4j:twitter4j-core:4.0.5'
-    // compile 'org.twitter4j:twitter4j-media-support:4.0.5'
-    // compile 'org.twitter4j:twitter4j-stream:4.0.5'
-    compile 'com.github.takke.twitter4j:twitter4j-core:support_extended_tweets-SNAPSHOT'
-    compile 'com.github.takke.twitter4j:twitter4j-media-support:support_extended_tweets-SNAPSHOT'
-    compile 'com.github.takke.twitter4j:twitter4j-stream:support_extended_tweets-SNAPSHOT'
+    compile 'org.twitter4j:twitter4j-core:4.0.6'
+    compile 'org.twitter4j:twitter4j-media-support:4.0.6'
+    compile 'org.twitter4j:twitter4j-stream:4.0.6'
     // twitter-text
     compile 'com.twitter:twitter-text:1.13.0'
     // guava
@@ -109,5 +105,4 @@ kapt {
 
 repositories {
     mavenCentral()
-    maven { url "https://jitpack.io" }
 }
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());
         }