diff --git a/android/libraries/TweetLanesCore/res/xml/changelog.xml b/android/libraries/TweetLanesCore/res/xml/changelog.xml
index b6440d1b..c0105afb 100644
--- a/android/libraries/TweetLanesCore/res/xml/changelog.xml
+++ b/android/libraries/TweetLanesCore/res/xml/changelog.xml
@@ -4,11 +4,12 @@
Feature - Large media previews & option to turn off media previews
Feature - Added option to use display urls rather than full URLs
Feature - Added auto complete mid status rather than needing to be the last word in compose box
- Feature - Added configuration for tweet cache size
+ Feature - Added configuration for statuses cache size
Fix - Set VolScroll to be defaulted off
Fix - Update remaining characters as soon as media attached
Fix - Rotate flip on landscape refresh
Fix - Prevent infinite refresh loop
+ Fix - Correct issue with conversations appearing under the wrong statuses
Fix - Various errors reported by fatal crashes
diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedItemView.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedItemView.java
index 3bf8bfa3..bd5a8642 100644
--- a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedItemView.java
+++ b/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;
- }
}
}