From 8874bc1f6ed49910ba624772ad10e68f5001e2eb Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 24 Apr 2023 10:14:50 -0500
Subject: [PATCH] Use MUC nick for MUC webxdc

---
 src/cheogram/java/com/cheogram/android/WebxdcPage.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cheogram/java/com/cheogram/android/WebxdcPage.java b/src/cheogram/java/com/cheogram/android/WebxdcPage.java
index 1ec8bc4690cea9a28f3cc885bc4bd0ca659d2cae..bc8f71b9e109f487637d52692a57b2735dd6c9d2 100644
--- a/src/cheogram/java/com/cheogram/android/WebxdcPage.java
+++ b/src/cheogram/java/com/cheogram/android/WebxdcPage.java
@@ -244,7 +244,7 @@ public class WebxdcPage implements ConversationPage {
 	}
 
 	protected Jid selfJid() {
-		Conversation conversation = (Conversation) source.getConversation();
+		final Conversation conversation = (Conversation) source.getConversation();
 		if (conversation.getMode() == Conversation.MODE_MULTI && !conversation.getMucOptions().nonanonymous()) {
 			return conversation.getMucOptions().getSelf().getFullJid();
 		} else {
@@ -260,7 +260,12 @@ public class WebxdcPage implements ConversationPage {
 
 		@JavascriptInterface
 		public String selfName() {
-			return source.getConversation().getAccount().getDisplayName();
+			final Conversation conversation = (Conversation) source.getConversation();
+			if (conversation.getMode() == Conversation.MODE_MULTI) {
+				return conversation.getMucOptions().getActualNick();
+			} else {
+				return conversation.getAccount().getDisplayName();
+			}
 		}
 
 		@JavascriptInterface