From 9cbe3b2abb459f67a06d16baefe34532bad3f4d2 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Sun, 29 Jan 2023 08:31:40 +0400 Subject: [PATCH 1/3] fix: Improve dns checking on recovery No special case for when a user only has one server --- lib/ui/pages/setup/recovering/recovery_confirm_server.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart index 969e3d39..6ac0e127 100644 --- a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart +++ b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart @@ -55,8 +55,7 @@ class _RecoveryConfirmServerState extends State { if (servers != null && servers.isNotEmpty) Column( children: [ - if (servers.length == 1 || - (!_isExtended && _isServerFound(servers))) + if (!_isExtended && _isServerFound(servers)) confirmServer( context, _firstValidServer(servers), From 9929cdd1a3cd3fbefa8733656c8207670621ae85 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Sun, 29 Jan 2023 08:41:59 +0400 Subject: [PATCH 2/3] fix: Remove double protocol on opening a service link --- lib/ui/pages/services/services.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart index fc00922b..606fc9d7 100644 --- a/lib/ui/pages/services/services.dart +++ b/lib/ui/pages/services/services.dart @@ -146,7 +146,7 @@ class _Card extends StatelessWidget { children: [ GestureDetector( onTap: () => _launchURL( - 'https://${service.url}', + service.url, ), child: Text( '${service.url}', From fcd1c2960689a13b124206cd9823c8fb274d8697 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Sun, 29 Jan 2023 08:56:51 +0400 Subject: [PATCH 3/3] fix: Remove breaking underscore from a launchURL call In services.dart --- lib/ui/pages/services/services.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart index 8295df27..c7c01daa 100644 --- a/lib/ui/pages/services/services.dart +++ b/lib/ui/pages/services/services.dart @@ -133,13 +133,8 @@ class _Card extends StatelessWidget { Column( children: [ GestureDetector( -<<<<<<< HEAD onTap: () => launchURL( - 'https://${service.url}', -======= - onTap: () => _launchURL( service.url, ->>>>>>> master ), child: Text( '${service.url}',