From c23dac6f99c240d9df5f04380a2d67f1a291b867 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Mon, 25 Nov 2024 00:57:45 +0100
Subject: [PATCH 1/2] add "show in chat" to webxdc menu

---
 .../org/thoughtcrime/securesms/WebxdcActivity.java     | 10 ++++++++++
 src/main/res/menu/webxdc.xml                           |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
index b6f62cbea..3f057b8c4 100644
--- a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
@@ -258,6 +258,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       case R.id.source_code:
         openUrlInBrowser(this, sourceCodeUrl);
         return true;
+      case R.id.show_in_chat:
+        showInChat();
+        return true;
     }
     return false;
   }
@@ -404,6 +407,13 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       }
   }
 
+  private void showInChat() {
+    Intent intent = new Intent(this, ConversationActivity.class);
+    intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, dcAppMsg.getChatId());
+    intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, DcMsg.getMessagePosition(dcAppMsg, dcContext));
+    startActivity(intent);
+  }
+
   public static void addToHomeScreen(Activity activity, int msgId) {
     Context context = activity.getApplicationContext();
     try {
diff --git a/src/main/res/menu/webxdc.xml b/src/main/res/menu/webxdc.xml
index 20bd61f0c..45898bd35 100644
--- a/src/main/res/menu/webxdc.xml
+++ b/src/main/res/menu/webxdc.xml
@@ -6,5 +6,7 @@
         android:id="@+id/menu_add_to_home_screen" />
     <item android:title="@string/source_code"
         android:id="@+id/source_code" />
+    <item android:id="@+id/show_in_chat"
+        android:title="@string/show_in_chat" />
 
 </menu>

From 494cb728c38bff12df63a1ed0d2b79b81e3ac50a Mon Sep 17 00:00:00 2001
From: adb <adb@merlinux.eu>
Date: Mon, 25 Nov 2024 19:59:51 +0100
Subject: [PATCH 2/2] Update src/main/res/menu/webxdc.xml

Co-authored-by: bjoern <r10s@b44t.com>
---
 src/main/res/menu/webxdc.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/menu/webxdc.xml b/src/main/res/menu/webxdc.xml
index 45898bd35..f9a2aa064 100644
--- a/src/main/res/menu/webxdc.xml
+++ b/src/main/res/menu/webxdc.xml
@@ -4,9 +4,9 @@
 
     <item android:title="@string/add_to_home_screen"
         android:id="@+id/menu_add_to_home_screen" />
-    <item android:title="@string/source_code"
-        android:id="@+id/source_code" />
     <item android:id="@+id/show_in_chat"
         android:title="@string/show_in_chat" />
+    <item android:title="@string/source_code"
+        android:id="@+id/source_code" />
 
 </menu>