Merge remote-tracking branch 'Upstream/develop' into Upstream_release

Author: BlythMeister

android/libraries/TweetLanesCore/res/xml/changelog.xml

@@ -4,11 +4,12 @@
         <change>Feature - Large media previews &amp; option to turn off media previews</change>
         <change>Feature - Added option to use display urls rather than full URLs</change>
         <change>Feature - Added auto complete mid status rather than needing to be the last word in compose box</change>
-        <change>Feature - Added configuration for tweet cache size</change>
+        <change>Feature - Added configuration for statuses cache size</change>
         <change>Fix - Set VolScroll to be defaulted off</change>
         <change>Fix - Update remaining characters as soon as media attached</change>
         <change>Fix - Rotate flip on landscape refresh</change>
         <change>Fix - Prevent infinite refresh loop</change>
+        <change>Fix - Correct issue with conversations appearing under the wrong statuses</change>
         <change>Fix - Various errors reported by fatal crashes</change>
     </release>
     <release version="1.3.0" versioncode="55">

android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedItemView.java

@@ -203,7 +203,17 @@ public void configure(TwitterStatus twitterStatus, int position, Callbacks callb
 
         mConversationExpanded = showConversationView;
         mConversationToggle = mHolder.conversationToggle;
+
         if (mConversationToggle != null) {
+            mConversationToggle.setVisibility(GONE);
+            if (mConversationView != null) {
+                removeView(mConversationView);
+                mConversationView = null;
+            }
+            int drawable = AppSettings.get().getCurrentTheme() == AppSettings.Theme.Holo_Dark ? R.drawable.ic_action_expand_dark
+                    : R.drawable.ic_action_expand_light;
+            mConversationToggle.setImageDrawable(getResources().getDrawable(
+                    drawable));
 
             if (twitterStatus.mInReplyToStatusId != null) {
                 mConversationToggle.setVisibility(VISIBLE);
@@ -221,12 +231,6 @@ public void onClick(View v) {
                     mConversationView.setVisibility(GONE);
                     configureConversationView(socialNetType, currentAccountKey);
                 }
-            } else {
-                mConversationToggle.setVisibility(GONE);
-                if (mConversationView != null) {
-                    removeView(mConversationView);
-                    mConversationView = null;
-                }
             }
         }