mirror of
https://git.selfprivacy.org/kherel/selfprivacy.org.app.git
synced 2025-01-25 18:26:36 +00:00
chore: Merge master into digital-ocean-dns
This commit is contained in:
commit
10593229b2
|
@ -133,8 +133,13 @@ class _Card extends StatelessWidget {
|
||||||
Column(
|
Column(
|
||||||
children: [
|
children: [
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
|
<<<<<<< HEAD
|
||||||
onTap: () => launchURL(
|
onTap: () => launchURL(
|
||||||
'https://${service.url}',
|
'https://${service.url}',
|
||||||
|
=======
|
||||||
|
onTap: () => _launchURL(
|
||||||
|
service.url,
|
||||||
|
>>>>>>> master
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
'${service.url}',
|
'${service.url}',
|
||||||
|
|
|
@ -55,8 +55,7 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
|
||||||
if (servers != null && servers.isNotEmpty)
|
if (servers != null && servers.isNotEmpty)
|
||||||
Column(
|
Column(
|
||||||
children: [
|
children: [
|
||||||
if (servers.length == 1 ||
|
if (!_isExtended && _isServerFound(servers))
|
||||||
(!_isExtended && _isServerFound(servers)))
|
|
||||||
confirmServer(
|
confirmServer(
|
||||||
context,
|
context,
|
||||||
_firstValidServer(servers),
|
_firstValidServer(servers),
|
||||||
|
|
Loading…
Reference in a new issue