diff options
author | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-17 15:56:54 +0100 |
commit | fb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (patch) | |
tree | cf0fb5a62aefaf34fd8e134fa20c91fe641c0898 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | 25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff) | |
parent | c4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff) |
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/utils/FileUtils.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-de/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ru/strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index e991c2d2..175df041 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1545,9 +1545,14 @@ public class ConversationActivity extends XmppActivity protected void refreshUiReal() { updateConversationList(); if (conversationList.size() > 0) { + if (!this.mConversationFragment.isAdded()) { + Log.d(Config.LOGTAG,"fragment NOT added to activity. detached="+Boolean.toString(mConversationFragment.isDetached())); + } ConversationActivity.this.mConversationFragment.updateMessages(); updateActionBarTitle(); invalidateOptionsMenu(); + } else { + Log.d(Config.LOGTAG,"not updating conversations fragment because conversations list size was 0"); } } |