Merge pull request #124 from osociety/external-link-warning

Warn before opening external links
osociety · Mar 17, 2024 · 7f16afb · 7f16afb
2 parents 16b67a7 + dba683d
commit 7f16afb
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 33 deletions.
diff --git a/lib/api/update_checker.dart b/lib/api/update_checker.dart
@@ -52,7 +52,7 @@ Future<void> checkForUpdates(
       action = SnackBarAction(
         label: 'Update',
         onPressed: () {
-          _navigateToStore();
+          _navigateToStore(context);
         },
       );
     } else {
@@ -77,14 +77,15 @@ Future<void> checkForUpdates(
   }
 }
 
-Future<void> _navigateToStore() async {
+Future<void> _navigateToStore(BuildContext context) async {
   String url = 'https://github.com/git-elliot/vernet/releases/latest';
-  final isFdroidInstalled = await LaunchApp.isAppInstalled(
-    androidPackageName: 'org.fdroid.fdroid',
-    iosUrlScheme: 'fdroid://',
-  );
 
   if (Platform.isAndroid) {
+    final isFdroidInstalled = await LaunchApp.isAppInstalled(
+      androidPackageName: 'org.fdroid.fdroid',
+      iosUrlScheme: 'fdroid://',
+    );
+
     if ((await PackageInfo.fromPlatform()).version.contains('store')) {
       //Goto playstore
       url =
@@ -99,5 +100,5 @@ Future<void> _navigateToStore() async {
       return;
     }
   }
-  launchURL(url);
+  launchURLWithWarning(context, url);
 }
diff --git a/lib/helper/utils_helper.dart b/lib/helper/utils_helper.dart
@@ -1,5 +1,16 @@
+import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher_string.dart';
+import 'package:vernet/ui/external_link_dialog.dart';
 
 Future<void> launchURL(String url) async => await canLaunchUrlString(url)
     ? await launchUrlString(url)
     : throw 'Could not launch $url';
+
+Future<void> launchURLWithWarning(BuildContext context, String url) {
+  return showDialog(
+    context: context,
+    builder: (context) => ExternalLinkWarningDialog(
+      link: url,
+    ),
+  );
+}
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -246,7 +246,7 @@ class _WifiDetailState extends State<HomePage> {
                   const SizedBox(height: 10),
                   ElevatedButton.icon(
                     onPressed: () {
-                      launchURL('https://fast.com');
+                      launchURLWithWarning(context, 'https://fast.com');
                     },
                     icon: const Icon(Icons.speed),
                     label: const Text('Speed Test'),

diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart
@@ -162,45 +162,23 @@ class _SettingsPageState extends State<SettingsPage> {
                     ListTile(
                       leading: const Icon(Icons.bug_report),
                       title: const Text('Report Issues'),
-                      // subtitle: Text(_issueUrl),
-                      // trailing: IconButton(
-                      //   icon: Icon(Icons.open_in_new),
-                      //   onPressed: () {
-                      //     _launchURL(_issueUrl);
-                      //   },
-                      // ),
                       onTap: () {
-                        launchURL(_issueUrl);
+                        launchURLWithWarning(context, _issueUrl);
                       },
                     ),
                     ListTile(
                       leading: const Icon(Icons.favorite),
                       title: const Text('Donate'),
-                      // subtitle: Text(_donateUrl),
-                      // trailing: IconButton(
-                      //   icon: Icon(Icons.open_in_new),
-                      //   onPressed: () {
-                      //     _launchURL(_donateUrl);
-                      //   },
-                      // ),
                       onTap: () {
-                        launchURL(_donateUrl);
+                        launchURLWithWarning(context, _donateUrl);
                       },
                     ),
                     ListTile(
                       leading: const Icon(Icons.code),
                       title: const Text('Source Code'),
-                      // subtitle: Text(_srcUrl),
                       onTap: () {
-                        launchURL(_srcUrl);
+                        launchURLWithWarning(context, _srcUrl);
                       },
-
-                      // trailing: IconButton(
-                      //   icon: Icon(Icons.open_in_new),
-                      //   onPressed: () {
-                      //     _launchURL(_srcUrl);
-                      //   },
-                      // ),
                     ),
                     const ListTile(
                       title: Text(

diff --git a/lib/ui/external_link_dialog.dart b/lib/ui/external_link_dialog.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:vernet/helper/utils_helper.dart';
+
+class ExternalLinkWarningDialog extends StatelessWidget {
+  const ExternalLinkWarningDialog({super.key, required this.link});
+
+  final String link;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text("Confirm to open external link"),
+      content: Text(link),
+      actions: [
+        TextButton(
+          onPressed: () {
+            Navigator.pop(context);
+          },
+          child: const Text('Cancel'),
+        ),
+        TextButton.icon(
+          onPressed: () {
+            launchURL(link);
+          },
+          icon: const Icon(Icons.link),
+          label: const Text('Open Link'),
+        ),
+      ],
+    );
+  }
+}