Skip to content

Commit 2e35dd5

Browse files
committed
Fix: "Delete Account" button with official saber server
1 parent a17eecb commit 2e35dd5

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

lib/components/nextcloud/done_login_step.dart

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:math';
22

33
import 'package:flutter/material.dart';
44
import 'package:flutter_svg/flutter_svg.dart';
5+
import 'package:logging/logging.dart';
56
import 'package:saber/components/misc/faq.dart';
67
import 'package:saber/data/extensions/string_extensions.dart';
78
import 'package:saber/data/nextcloud/nextcloud_client_extension.dart';
@@ -22,6 +23,8 @@ class DoneLoginStep extends StatefulWidget {
2223
class _DoneLoginStepState extends State<DoneLoginStep> {
2324
static const width = 400.0;
2425

26+
late final log = Logger('DoneLoginStep');
27+
2528
void _logout() {
2629
Prefs.url.value = '';
2730
Prefs.username.value = '';
@@ -41,8 +44,11 @@ class _DoneLoginStepState extends State<DoneLoginStep> {
4144
final screenWidth = MediaQuery.sizeOf(context).width;
4245
final screenHeight = MediaQuery.sizeOf(context).height;
4346
final quota = Prefs.lastStorageQuota.value;
44-
final server =
47+
final serverName =
4548
Prefs.url.value.ifNotEmpty ?? t.login.ncLoginStep.saberNcServer;
49+
late final serverUri = Prefs.url.value.isEmpty
50+
? NextcloudClientExtension.defaultNextcloudUri
51+
: Uri.parse(Prefs.url.value);
4652
return ListView(
4753
padding: EdgeInsets.symmetric(
4854
horizontal: screenWidth > width ? (screenWidth - width) / 2 : 16,
@@ -86,7 +92,7 @@ class _DoneLoginStepState extends State<DoneLoginStep> {
8692
const SizedBox(height: 2),
8793
LinearProgressIndicator(
8894
// At least 4% so the rounded corners render properly
89-
value: max((quota?.relative ?? 0) / 100, 0.04),
95+
value: (quota?.relative ?? 0).clamp(4, 100) / 100,
9096
minHeight: 32,
9197
borderRadius: BorderRadius.circular(6),
9298
),
@@ -97,27 +103,29 @@ class _DoneLoginStepState extends State<DoneLoginStep> {
97103
),
98104
const SizedBox(height: 32),
99105
Text(t.profile.connectedTo, style: const TextStyle(height: 0.8)),
100-
Text(server, style: textTheme.headlineSmall),
106+
Text(serverName, style: textTheme.headlineSmall),
101107
const SizedBox(height: 4),
102108
Row(
103109
children: [
104110
Flexible(
105111
fit: FlexFit.tight,
106112
child: ElevatedButton(
107-
onPressed: () => launchUrl(
108-
Prefs.url.value.isEmpty
109-
? NextcloudClientExtension.defaultNextcloudUri
110-
: Uri.parse(Prefs.url.value),
111-
),
113+
onPressed: () {
114+
log.info('Opening URL: $serverUri');
115+
launchUrl(serverUri);
116+
},
112117
child: Text(t.profile.quickLinks.serverHomepage),
113118
),
114119
),
115120
const SizedBox(width: 8),
116121
Flexible(
117122
fit: FlexFit.tight,
118123
child: ElevatedButton(
119-
onPressed: () => launchUrl(
120-
Uri.parse('$server/index.php/settings/user/drop_account')),
124+
onPressed: () {
125+
final url = '$serverUri/index.php/settings/user/drop_account';
126+
log.info('Opening URL: $url');
127+
launchUrl(Uri.parse(url));
128+
},
121129
child: Text(t.profile.quickLinks.deleteAccount),
122130
),
123131
),

0 commit comments

Comments
 (0)