diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java index 8c77b7c51..6242e80a9 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java @@ -58,11 +58,29 @@ public class ConversationsOverviewFragment extends XmppFragment { private XmppActivity activity; public static Conversation getSuggestion(Activity activity) { + final Conversation exception; + Fragment fragment = activity.getFragmentManager().findFragmentById(R.id.main_fragment); + if (fragment != null && fragment instanceof ConversationsOverviewFragment) { + exception = ((ConversationsOverviewFragment) fragment).swipedConversation.peek(); + } else { + exception = null; + } + return getSuggestion(activity, exception); + } + + public static Conversation getSuggestion(Activity activity, Conversation exception) { Fragment fragment = activity.getFragmentManager().findFragmentById(R.id.main_fragment); if (fragment != null && fragment instanceof ConversationsOverviewFragment) { List<Conversation> conversations = ((ConversationsOverviewFragment) fragment).conversations; if (conversations.size() > 0) { - return conversations.get(0); + Conversation suggestion = conversations.get(0); + if (suggestion == exception) { + if (conversations.size() > 1) { + return conversations.get(1); + } + } else { + return suggestion; + } } } return null; @@ -72,7 +90,6 @@ public class ConversationsOverviewFragment extends XmppFragment { @Override public void onAttach(Activity activity) { super.onAttach(activity); - Log.d(Config.LOGTAG, "on attach"); if (activity instanceof XmppActivity) { this.activity = (XmppActivity) activity; } else { |