Update to the latest twitter4j fork

klinker24 · Jun 7, 2017 · dcf1304 · dcf1304
1 parent b6aa142
commit dcf1304
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/lib/twitter4j-klinker24-fork.jar b/app/lib/twitter4j-klinker24-fork.jar
diff --git a/app/src/main/java/com/klinker/android/twitter/utils/TweetLinkUtils.java b/app/src/main/java/com/klinker/android/twitter/utils/TweetLinkUtils.java
@@ -226,7 +226,7 @@ public static String[] getLinksInStatus(Status status) {
                 }
                 imageUrl = status.getMediaEntities()[0].getMediaURL();
 
-                for (MediaEntity m : status.getExtendedMediaEntities()) {
+                for (MediaEntity m : status.getMediaEntities()) {
                     if (m.getType().equals("photo")) {
                         if (!imageUrl.contains(m.getMediaURL())) {
                             imageUrl += " " + m.getMediaURL();
@@ -544,14 +544,14 @@ public static String removeColorHtml(String text, AppSettings settings) {
     public static String getGIFUrl(Status s, String otherUrls) {
 
         // this will be used after twitter begins to support them
-        for (ExtendedMediaEntity e : s.getExtendedMediaEntities()) {
+        for (MediaEntity e : s.getMediaEntities()) {
 
             if (e.getType().equals("animated_gif")) {
                 return e.getMediaURL().replace("tweet_video_thumb", "tweet_video").replace(".png", ".mp4").replace(".jpg",".mp4").replace(".jpeg", ".mp4");
             } else if (e.getType().equals("video")) {
                 if (e.getVideoVariants().length > 0) {
                     String url = "";
-                    for (ExtendedMediaEntity.Variant v : e.getVideoVariants()) {
+                    for (MediaEntity.Variant v : e.getVideoVariants()) {
                         if (v.getUrl().contains(".mp4")) {
                             url = v.getUrl();
                         }

diff --git a/gradle.properties b/gradle.properties
@@ -24,6 +24,6 @@ BUILD_TOOLS_VERSION=25.0.1
 ANDROID_GRADLE_VERSION=2.3.1
 
 ANDROID_SUPPORT_VERSION=25.1.0
-GOOGLE_PLAY_SERVICES_VERSION=10.0.0
+GOOGLE_PLAY_SERVICES_VERSION=10.2.6
 
 org.gradle.jvmargs=-Xmx1536M
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip