From 136ddd7681873631b1cf4b2e09d502aae64fdb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Mon, 20 Oct 2025 07:10:53 +0200
Subject: [PATCH] chore: Make privacy url not configurable

---
 lib/config/app_config.dart                         | 6 ++++++
 lib/config/setting_keys.dart                       | 4 ----
 lib/pages/homeserver_picker/homeserver_picker.dart | 4 ++--
 lib/pages/settings/settings_view.dart              | 5 +++--
 lib/widgets/layouts/login_scaffold.dart            | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index e6a4b6c0c..4eb8aea34 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -50,4 +50,10 @@ abstract class AppConfig {
     host: 'servers.joinmatrix.org',
     path: 'servers.json',
   );
+
+  static final Uri privacyUrl = Uri(
+    scheme: 'https',
+    host: 'github.com',
+    path: '/krille-chan/fluffychat/blob/main/PRIVACY.md',
+  );
 }
diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index 0f51ea79b..1056929bc 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -52,10 +52,6 @@ enum AppSettings<T> {
   // AppConfig-mirrored settings
   applicationName<String>('chat.fluffy.application_name', 'FluffyChat'),
   defaultHomeserver<String>('chat.fluffy.default_homeserver', 'matrix.org'),
-  privacyUrl<String>(
-    'chat.fluffy.privacy_url',
-    'https://github.com/krille-chan/fluffychat/blob/main/PRIVACY.md',
-  ),
   // colorSchemeSeed stored as ARGB int
   colorSchemeSeedInt<int>(
     'chat.fluffy.color_scheme_seed',
diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index 4e96a7154..9a1768d20 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -8,7 +8,7 @@ import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 import 'package:universal_html/html.dart' as html;
-import 'package:url_launcher/url_launcher_string.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
@@ -212,7 +212,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
       case MoreLoginActions.importBackup:
         restoreBackup();
       case MoreLoginActions.privacy:
-        launchUrlString(AppSettings.privacyUrl.value);
+        launchUrl(AppConfig.privacyUrl);
       case MoreLoginActions.about:
         PlatformInfos.showDialog(context);
     }
diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart
index aa9c3d50b..a92ee6a84 100644
--- a/lib/pages/settings/settings_view.dart
+++ b/lib/pages/settings/settings_view.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
 
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
-import 'package:fluffychat/config/setting_keys.dart';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
@@ -244,7 +245,7 @@ class SettingsView extends StatelessWidget {
                   ListTile(
                     leading: const Icon(Icons.privacy_tip_outlined),
                     title: Text(L10n.of(context).privacy),
-                    onTap: () => launchUrlString(AppSettings.privacyUrl.value),
+                    onTap: () => launchUrl(AppConfig.privacyUrl),
                   ),
                   ListTile(
                     leading: const Icon(Icons.info_outline_rounded),
diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart
index e0cc24577..6559fad8f 100644
--- a/lib/widgets/layouts/login_scaffold.dart
+++ b/lib/widgets/layouts/login_scaffold.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
+import 'package:url_launcher/url_launcher.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -108,7 +108,7 @@ class _PrivacyButtons extends StatelessWidget {
               ),
             ),
             TextButton(
-              onPressed: () => launchUrlString(AppSettings.privacyUrl.value),
+              onPressed: () => launchUrl(AppConfig.privacyUrl),
               child: Text(
                 L10n.of(context).privacy,
                 style: shadowTextStyle,