From ed2badfd3525eabb975dd001a766eec0b7d276ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sun, 10 May 2026 00:54:13 +0200
Subject: [PATCH] fixed chat bubble link styling and gesture handling, and
 added android package visibility for common schemes

---
 android/app/src/main/AndroidManifest.xml      | 28 +++++++++++++++----
 lib/view/pages/talk/widgets/chat_bubble.dart  | 14 +++++++++-
 .../talk/widgets/highlighted_linkify.dart     | 18 ++++++++++--
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3b12681..3bfcf55 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -73,16 +73,34 @@
                 android:resource="@xml/timetable_week_widget_info" />
         </receiver>
     </application>
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <!-- Required so url_launcher / can_launch can actually see browsers,
+         mail clients and dialers under Android 11+ package-visibility rules
+         (otherwise UrlLauncher logs "component name for ... is null" and
+         link taps in Talk silently do nothing). The PROCESS_TEXT intent is
+         needed by io.flutter.plugin.text.ProcessTextPlugin (selection
+         menu).
+         See https://developer.android.com/training/package-visibility -->
     <queries>
         <intent>
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="https"/>
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="http"/>
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="mailto"/>
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="tel"/>
+        </intent>
     </queries>
     <uses-permission android:name="android.permission.INTERNET"/>
     <!-- Workmanager periodic widget refresh needs to reschedule after device
diff --git a/lib/view/pages/talk/widgets/chat_bubble.dart b/lib/view/pages/talk/widgets/chat_bubble.dart
index fc184a2..d026b4d 100644
--- a/lib/view/pages/talk/widgets/chat_bubble.dart
+++ b/lib/view/pages/talk/widgets/chat_bubble.dart
@@ -205,6 +205,18 @@ class _ChatBubbleState extends State<ChatBubble>
     onRefetch: widget.refetch,
   );
 
+  /// True only for messages whose body has a meaningful tap action (poll
+  /// dialog or file download/cancel). For plain text messages we leave
+  /// `onTap: null` on the bubble's `GestureDetector` so its
+  /// `TapGestureRecognizer` does not enter the gesture arena — otherwise
+  /// it competes with (and blocks) the per-link `TapGestureRecognizer`s
+  /// that `HighlightedLinkify` attaches to URL spans.
+  bool get _hasTapAction {
+    final obj = message.originalData?['object'];
+    if (obj?.type == RichObjectStringObjectType.talkPoll) return true;
+    return message.file != null;
+  }
+
   void _onTap() {
     final obj = message.originalData?['object'];
     if (obj?.type == RichObjectStringObjectType.talkPoll) {
@@ -302,7 +314,7 @@ class _ChatBubbleState extends State<ChatBubble>
           },
           onLongPress: _showOptionsDialog,
           onDoubleTap: _showOptionsDialog,
-          onTap: _onTap,
+          onTap: _hasTapAction ? _onTap : null,
           child: Transform.translate(
             offset: _position,
             child: Bubble(
diff --git a/lib/view/pages/talk/widgets/highlighted_linkify.dart b/lib/view/pages/talk/widgets/highlighted_linkify.dart
index 95281ac..026b5a4 100644
--- a/lib/view/pages/talk/widgets/highlighted_linkify.dart
+++ b/lib/view/pages/talk/widgets/highlighted_linkify.dart
@@ -98,9 +98,21 @@ class _HighlightedLinkifyState extends State<HighlightedLinkify> {
     final defaultStyle = widget.style ??
         Theme.of(context).textTheme.bodyMedium ??
         DefaultTextStyle.of(context).style;
-    final linkStyle = (widget.linkStyle ??
-            const TextStyle(color: Colors.blue, decoration: TextDecoration.underline))
-        .merge(defaultStyle.copyWith(color: null, decoration: null));
+    // Start from the surrounding text style so links inherit font family,
+    // size, weight, etc., then layer the link-specific color and underline
+    // on top. (Going the other way around — link style as base — used to
+    // work because TextStyle.copyWith treats `null` as "leave unchanged",
+    // so the explicit `color: null, decoration: null` were silently
+    // ignored and the merge pulled defaultStyle's color/decoration over
+    // the blue + underline. Result: links rendered in body-text color
+    // with no underline.)
+    final linkStyle = defaultStyle.merge(
+      widget.linkStyle ??
+          const TextStyle(
+            color: Colors.blue,
+            decoration: TextDecoration.underline,
+          ),
+    );
     const linkHighlight = TextStyle(
       backgroundColor: Color(0xFFFFD54F),
       color: Colors.black,