Browser preference

Signed-off-by: Zixuan James Li <zixuan@zulip.com>
PIG208 · Dec 26, 2024 · bcf97a4 · bcf97a4
1 parent 8e0efd5
commit bcf97a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/widgets/content.dart b/lib/widgets/content.dart
@@ -15,6 +15,7 @@ import '../model/avatar_url.dart';
 import '../model/binding.dart';
 import '../model/content.dart';
 import '../model/internal_link.dart';
+import '../model/settings.dart';
 import 'code_block.dart';
 import 'dialog.dart';
 import 'icons.dart';
@@ -1342,17 +1343,20 @@ void _launchUrl(BuildContext context, String urlString) async {
     return;
   }
 
+  final globalSettings = GlobalStoreWidget.of(context).globalSettings;
   bool launched = false;
   String? errorMessage;
   try {
     launched = await ZulipBinding.instance.launchUrl(url,
-      mode: switch (defaultTargetPlatform) {
+      mode: switch ((globalSettings.browserPreference, defaultTargetPlatform)) {
+        (BrowserPreference.embedded, _) => UrlLaunchMode.inAppBrowserView,
+        (BrowserPreference.external, _) => UrlLaunchMode.externalApplication,
         // On iOS we prefer LaunchMode.externalApplication because (for
         // HTTP URLs) LaunchMode.platformDefault uses SFSafariViewController,
         // which gives an awkward UX as described here:
         //  https://chat.zulip.org/#narrow/stream/48-mobile/topic/in-app.20browser/near/1169118
-        TargetPlatform.iOS => UrlLaunchMode.externalApplication,
-        _ => UrlLaunchMode.platformDefault,
+        (BrowserPreference.unset, TargetPlatform.iOS) => UrlLaunchMode.externalApplication,
+        (BrowserPreference.unset, _) => UrlLaunchMode.platformDefault,
       });
   } on PlatformException catch (e) {
     errorMessage = e.message;

diff --git a/test/example_data.dart b/test/example_data.dart
@@ -809,6 +809,7 @@ ChannelUpdateEvent channelUpdateEvent(
 
 const defaultGlobalSettings = GlobalSettingsData(
   themeSetting: ThemeSetting.unset,
+  browserPreference: BrowserPreference.unset,
 );
 
 TestGlobalStore globalStore({