From 44d15e15685d3ac183ad51ef48e2a19da80cc8b9 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 26 Sep 2022 12:16:31 -0500 Subject: [PATCH] Show desc on OOB --- src/cheogram/res/layout/command_webview.xml | 12 ++++++++++++ .../siacs/conversations/entities/Conversation.java | 1 + 2 files changed, 13 insertions(+) diff --git a/src/cheogram/res/layout/command_webview.xml b/src/cheogram/res/layout/command_webview.xml index d16f470ca14d7dfe7580cb58e8f274b70ad2b65c..cfc460f6bc3cbdd9dce2c130b38384e41ce38a7f 100644 --- a/src/cheogram/res/layout/command_webview.xml +++ b/src/cheogram/res/layout/command_webview.xml @@ -6,8 +6,20 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> + + diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index edb729f28c32a592e91bdae5a491ccd992cae4b8..e99e223688689a027e0499ceb7fc6abac574b317 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -1774,6 +1774,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl @Override public void bind(Item oob) { + setTextOrHide(binding.desc, Optional.fromNullable(oob.el.findChildContent("desc", "jabber:x:oob"))); binding.webview.getSettings().setJavaScriptEnabled(true); binding.webview.getSettings().setUserAgentString("Mozilla/5.0 (Linux; Android 11) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36"); binding.webview.getSettings().setDatabaseEnabled(true);