Merge remote-tracking branch 'Upstream/release' into Upstream_master

chrislacy · Mar 4, 2014 · c0f13c9 · c0f13c9
2 parents ece46d4 + e823db1
commit c0f13c9
Show file tree

Hide file tree

Showing 31 changed files with 544 additions and 179 deletions.
diff --git a/android/client/AndroidManifest.xml b/android/client/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android"
-    android:versionCode="55"
-    android:versionName="1.3.0">
+    android:versionCode="56"
+    android:versionName="1.4.0">
 
     <uses-sdk android:targetSdkVersion="17"
         android:minSdkVersion="14" />

diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
-    android:versionCode="55"
-    android:versionName="1.3.0_b5">
+    android:versionCode="56"
+    android:versionName="1.4.0_b2">
 
     <uses-sdk android:targetSdkVersion="17"
         android:minSdkVersion="14" />

diff --git a/android/libraries/SocialNetLib/src/com/twitter/Autolink.java b/android/libraries/SocialNetLib/src/com/twitter/Autolink.java
@@ -166,11 +166,11 @@ void linkToMentionAndList(Entity entity, String text,
     }
 
     void linkToURL(Entity entity, String text, StringBuilder builder,
-                   URLEntity urlEntity) {
+                   URLEntity urlEntity, boolean showFullUrl) {
         CharSequence url = entity.getValue();
         String linkText = escapeHTML(url).toString();
 
-        if (urlEntity != null && urlEntity.getExpandedURL() != null) {
+        if (urlEntity != null && urlEntity.getExpandedURL() != null && showFullUrl) {
             linkText = urlEntity.getExpandedURL();
         } else if (urlEntity != null && urlEntity.getDisplayURL() != null) {
             linkText = urlEntity.getDisplayURL();
@@ -194,7 +194,7 @@ void linkToURL(Entity entity, String text, StringBuilder builder,
     }
 
     String autoLinkEntities(String text, List<Entity> entities,
-                            MediaEntity[] mediaEntities, URLEntity[] urlEntities) {
+                            MediaEntity[] mediaEntities, URLEntity[] urlEntities, boolean showFullUrl) {
         StringBuilder builder = new StringBuilder(text.length() * 2);
         int beginIndex = 0;
 
@@ -225,7 +225,7 @@ String autoLinkEntities(String text, List<Entity> entities,
                         }
                     }
 
-                    linkToURL(entity, text, builder, urlEntity);
+                    linkToURL(entity, text, builder, urlEntity, showFullUrl);
                     break;
                 case HASHTAG:
                     linkToHashtag(entity, text, builder);
@@ -245,12 +245,12 @@ String autoLinkEntities(String text, List<Entity> entities,
     }
 
     public String autoLinkAll(String text, MediaEntity[] mediaEntities,
-                              URLEntity[] urlEntities) {
+                              URLEntity[] urlEntities, boolean showFullUrl) {
         text = escapeBrackets(text);
 
         // extract entities
         List<Entity> entities = extractor.extractEntitiesWithIndices(text);
         return autoLinkEntities(text, entities,
-                mediaEntities, urlEntities);
+                mediaEntities, urlEntities, showFullUrl);
     }
 }
diff --git a/android/libraries/SocialNetLib/src/org/socialnetlib/android/AppdotnetApi.java b/android/libraries/SocialNetLib/src/org/socialnetlib/android/AppdotnetApi.java
@@ -234,7 +234,7 @@ public AdnPosts getAdnGlobalStream(AdnPaging paging) {
     }
 
     /*
-	 *
+     *
 	 */
     public AdnPosts getAdnMentions(int userId, AdnPaging paging) {
         return getPosts("/stream/0/users/" + userId + "/mentions", null, paging);
@@ -335,25 +335,24 @@ public AdnPost setAdnStatus(AdnPostCompose compose) {
         JSONObject post;
         String fileToken = null;
         try {
-
             post = new JSONObject()
                     .put("text", compose.mText)
                     .put("reply_to", compose.mInReplyTo);
 
-
             if (compose.mMediaFile != null) {
                 AdnFile file = setAdnFile(compose.mMediaFile);
-
-                JSONObject ann = new JSONObject();
-                ann.put("type", "net.app.core.oembed");
-                ann.put("value", new JSONObject()
-                        .put("+net.app.core.file", new JSONObject()
-                                .put("file_id", file.mId)
-                                .put("file_token", file.mFileToken)
-                                .put("format", "oembed")
-                        )
-                );
-                post.put("annotations", new JSONArray().put(ann));
+                if (file != null) {
+                    JSONObject ann = new JSONObject();
+                    ann.put("type", "net.app.core.oembed");
+                    ann.put("value", new JSONObject()
+                            .put("+net.app.core.file", new JSONObject()
+                                    .put("file_id", file.mId)
+                                    .put("file_token", file.mFileToken)
+                                    .put("format", "oembed")
+                            )
+                    );
+                    post.put("annotations", new JSONArray().put(ann));
+                }
             }
 
         } catch (JSONException e) {

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterFetchUsers.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterFetchUsers.java
@@ -771,6 +771,10 @@ protected FetchUsersTaskOutput doInBackground(
                         errorDescription += "\nTry again in " + e.getRateLimitStatus().getSecondsUntilReset()
                                 + " " + "seconds";
                     }
+                } catch (OutOfMemoryError e) {
+                    e.printStackTrace();
+                    errorDescription = e.getMessage();
+                    Log.e("api-call", errorDescription, e);
                 }
 
                 if (users != null && twitterUsers == null) {

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java
@@ -123,7 +123,7 @@ public void setWorkerCallbacks(ModifyStatusesWorkerCallbacks callbacks) {
 	 */
 
     /*
-	 *
+     *
 	 */
     FinishedCallback getModifyStatusesCallback(Integer callbackHandle) {
         return mFinishedCallbackMap.get(callbackHandle);
@@ -258,14 +258,13 @@ protected ModifyStatusesTaskOutput doInBackground(ModifyStatusesTaskInput... inp
                         if (input.mStatuses != null) {
                             for (int i = 0; i < input.mStatuses.getStatusCount(); i++) {
                                 TwitterStatus twitterStatus = input.mStatuses.getStatus(i);
-                                if (twitterStatus.mIsFavorited != favorite) {
-                                    AdnPost post = appdotnetApi.setAdnFavorite(twitterStatus.mId, favorite);
 
-                                    if (post != null) {
-                                        twitterStatus = new TwitterStatus(post);
-                                        twitterStatus.setFavorite(favorite);
-                                        contentFeed.add(twitterStatus);
-                                    }
+                                AdnPost post = appdotnetApi.setAdnFavorite(twitterStatus.mId, favorite);
+
+                                if (post != null) {
+                                    twitterStatus = new TwitterStatus(post);
+                                    twitterStatus.setFavorite(favorite);
+                                    contentFeed.add(twitterStatus);
                                 }
                             }
                         }
@@ -292,27 +291,27 @@ protected ModifyStatusesTaskOutput doInBackground(ModifyStatusesTaskInput... inp
                             if (input.mStatuses != null) {
                                 for (int i = 0; i < input.mStatuses.getStatusCount(); i++) {
                                     TwitterStatus twitterStatus = input.mStatuses.getStatus(i);
-                                    if (twitterStatus.mIsFavorited != favorite) {
-                                        try {
-                                            twitter4j.Status status;
-                                            if (favorite) {
-                                                status = twitter.createFavorite(twitterStatus.mId);
-                                            } else {
-                                                status = twitter.destroyFavorite(twitterStatus.mId);
-                                            }
-
-                                            // Yuck: See the comment for
-                                            // TwitterStatus.setFavorite() for
-                                            // reasons for this
-                                            twitterStatus = new TwitterStatus(status);
-                                            twitterStatus.setFavorite(favorite);
-
-                                            contentFeed.add(twitterStatus);
-                                        } catch (TwitterException e) {
-                                            // we might get errors setting the favorite
-                                            // state to the same
-                                            // value again.
-                                            // Just ignore those ones...
+                                    try {
+                                        twitter4j.Status status;
+                                        if (favorite) {
+                                            status = twitter.createFavorite(twitterStatus.mId);
+                                        } else {
+                                            status = twitter.destroyFavorite(twitterStatus.mId);
+                                        }
+
+                                        // Yuck: See the comment for
+                                        // TwitterStatus.setFavorite() for
+                                        // reasons for this
+                                        twitterStatus = new TwitterStatus(status);
+                                        twitterStatus.setFavorite(favorite);
+
+                                        contentFeed.add(twitterStatus);
+                                    } catch (TwitterException e) {
+                                        e.printStackTrace();
+                                        errorDescription = e.getErrorMessage();
+                                        Log.e("api-call", errorDescription, e);
+                                        if (e.getRateLimitStatus() != null && e.getRateLimitStatus().getRemaining() <= 0) {
+                                            throw e;
                                         }
                                     }
                                 }

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterUtil.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterUtil.java
@@ -35,6 +35,7 @@
 public class TwitterUtil {
 
     private static Autolink mAutoLink;
+    private static boolean showFullUrl = true;
     private static boolean mAllowReInit = true;
 
     private static void initCommon() {
@@ -48,6 +49,11 @@ private static void initCommon() {
         }
     }
 
+    public static void setShowFullUrl(boolean newValue)
+    {
+        showFullUrl = newValue;
+    }
+
     /*
      *
 	 */
@@ -57,15 +63,15 @@ public static String stripMarkup(String text) {
     }
 
     public static String getTextMarkup(String text, URLEntity[] urlEntities) {
-        return getStatusMarkup(text, null, urlEntities);
+        return getStatusMarkup(text, null, urlEntities, showFullUrl);
     }
 
     /*
      * return the markup for a status, which replaces t.co/ links with the
      * visible links
      */
     public static String getStatusMarkup(Status status) {
-        return getStatusMarkup(status.getText(), status.getMediaEntities(), status.getURLEntities());
+        return getStatusMarkup(status.getText(), status.getMediaEntities(), status.getURLEntities(), showFullUrl);
     }
 
     /*
@@ -77,21 +83,27 @@ public static String getStatusMarkup(AdnPost post) {
         mAutoLink.setExtractURLWithoutProtocol(true);
         mAllowReInit = false;
 
-        String statusMarkup = getStatusMarkup(post.mText, null, post.mUrls);
+        String statusMarkup = getStatusMarkup(post.mText, null, post.mUrls, showFullUrl);
         mAllowReInit = true;
 
         return statusMarkup;
     }
 
+    public static String getStatusMarkup(String statusText, MediaEntity[] mediaEntities,
+                                         URLEntity[] urlEntities) {
+
+        return getStatusMarkup(statusText, mediaEntities, urlEntities, showFullUrl);
+    }
+
     /*
 	 * 
 	 */
-    public static String getStatusMarkup(String statusText, MediaEntity[] mediaEntities,
-                                         URLEntity[] urlEntities) {
+    private static String getStatusMarkup(String statusText, MediaEntity[] mediaEntities,
+                                         URLEntity[] urlEntities, boolean showFullUrl) {
 
         initCommon();
 
-        return mAutoLink.autoLinkAll(statusText, mediaEntities, urlEntities);
+        return mAutoLink.autoLinkAll(statusText, mediaEntities, urlEntities, showFullUrl);
     }
 
     /*

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/model/TwitterDirectMessage.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/model/TwitterDirectMessage.java
@@ -81,10 +81,14 @@ public TwitterDirectMessage(String jsonAsString) {
 
             if (object.has(KEY_STATUS_MARKUP)) {
                 mStatusFullMarkup = object.getString(KEY_STATUS_MARKUP);
-            } else {
+            } else if(mText != null) {
                 mStatusFullMarkup = TwitterUtil.getStatusMarkup(mText, new MediaEntity[0], new URLEntity[0]);
             }
-            mTextSpanned = URLSpanNoUnderline.stripUnderlines(Html.fromHtml(mStatusFullMarkup.replace("\n", "<br/>") + " "));
+
+            if(mStatusFullMarkup!= null)
+            {
+                mTextSpanned = URLSpanNoUnderline.stripUnderlines(Html.fromHtml(mStatusFullMarkup.replace("\n", "<br/>") + " "));
+            }
 
             if (object.has(KEY_CREATED_AT)) {
                 long createdAt = object.getLong(KEY_CREATED_AT);

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/model/TwitterStatus.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/model/TwitterStatus.java
@@ -537,6 +537,10 @@ public String getTwitterComStatusUrl() {
         return "https://twitter.com/" + getAuthorScreenName() + "/status/" + mId;
     }
 
+    public String getAdnStatusUrl() {
+        return "https://alpha.app.net/" + getAuthorScreenName() + "/post/" + mId;
+    }
+
     /*
      * (non-Javadoc)
      *

diff --git a/android/libraries/TweetLanesCore/res/layout/tweet_feed_item_received.xml b/android/libraries/TweetLanesCore/res/layout/tweet_feed_item_received.xml
@@ -157,11 +157,40 @@
 
                 </LinearLayout>
 
+                <RelativeLayout
+                        android:id="@+id/preview_image_container_large"
+                        android:layout_below="@id/status"
+                        android:layout_alignParentLeft="true"
+                        android:layout_toLeftOf="@+id/interactColumn"
+                        android:layout_width="fill_parent"
+                        android:layout_height="@dimen/image_preview_height_large"
+                        android:layout_gravity="center"
+                        android:paddingLeft="@dimen/message_item_text_padding_left_right"
+                        android:paddingRight="@dimen/message_item_text_padding_left_right"
+                        xmlns:android="http://schemas.android.com/apk/res/android">
+
+                    <ImageView
+                            android:id="@+id/preview_image_view_large"
+                            android:layout_width="fill_parent"
+                            android:layout_height="fill_parent"
+                            android:scaleType="centerCrop"
+                            />
+
+                    <ImageView
+                            android:id="@+id/preview_image_play_view_large"
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/ic_play_over_video"
+                            />
+
+                </RelativeLayout>
+
                 <TextView
                         android:id="@+id/tweet_details"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/status"
+                        android:layout_below="@id/preview_image_container_large"
                         android:layout_alignParentLeft="true"
                         android:layout_toLeftOf="@+id/interactColumn"
                         android:autoLink="all"

diff --git a/android/libraries/TweetLanesCore/res/layout/tweet_feed_item_spotlight.xml b/android/libraries/TweetLanesCore/res/layout/tweet_feed_item_spotlight.xml
@@ -134,28 +134,28 @@
             android:text="Retweeted by @WayneRooney"/>
 
     <RelativeLayout
-            android:id="@+id/preview_image_container"
+            android:id="@+id/preview_spotlight_image_container"
             android:layout_width="fill_parent"
             android:layout_height="200dp"
             android:layout_gravity="center"
             xmlns:android="http://schemas.android.com/apk/res/android">
 
         <ImageView
-                android:id="@+id/preview_large_image_view"
+                android:id="@+id/preview_spotlight_image_view"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:paddingRight="@dimen/message_item_text_padding_left_right"
 
                 />
-        <!--
+
         <ImageView
-            android:id="@+id/preview_image_play_view"
+            android:id="@+id/preview_spotlight_image_play_view"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_centerInParent="true"
             android:src="@drawable/ic_play_over_video"
              />
-              -->
+
 
     </RelativeLayout>