aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2020-02-18 19:44:49 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2020-02-18 19:44:49 +0100
commitad9f8fde90b7f08d128e64d6b8d0e27e6c0f4648 (patch)
tree937e5c5a873e87d45a75646d97c409f048f2ab0e /src
parentd941ec1926c2864881bbd21d1a6311a49c3a7bec (diff)
update chat background immediately after opening chat
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java4
-rw-r--r--src/main/res/layout/fragment_conversation.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 9ab0f50fc..7df639222 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2141,12 +2141,16 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
public void onStart() {
super.onStart();
if (this.reInitRequiredOnStart && this.conversation != null) {
+ if (activity != null) {
+ updateChatBG();
+ }
final Bundle extras = pendingExtras.pop();
reInit(this.conversation, extras != null);
if (extras != null) {
processExtras(extras);
}
} else if (conversation == null && activity != null && activity.xmppConnectionService != null) {
+ updateChatBG();
final String uuid = pendingConversationsUuid.pop();
Log.d(Config.LOGTAG, "ConversationFragment.onStart() - activity was bound but no conversation loaded. uuid=" + uuid);
if (uuid != null) {
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d7f177514..9748a6b22 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -6,7 +6,6 @@
android:id="@+id/conversations_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/chatbg"
android:clickable="false">
<ListView