2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Update to Dart 3.10 with . shorthands

Browse source
This commit is contained in:
Christian Kußowski 2025-11-30 12:54:06 +01:00
commit 1ea649f01e
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
167 changed files with 3351 additions and 3912 deletions
Download patch file Download diff file Expand all files Collapse all files

104
lib/pages/bootstrap/bootstrap_dialog.dart
View file

@ -23,10 +23,7 @@ import '../key_verification/key_verification_dialog.dart';
class BootstrapDialog extends StatefulWidget {
final bool wipe;
const BootstrapDialog({
super.key,
this.wipe = false,
});
const BootstrapDialog({super.key, this.wipe = false});
@override
BootstrapDialogState createState() => BootstrapDialogState();
@ -148,7 +145,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
builder: (context, snapshot) {
final status = snapshot.data;
return Column(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: .center,
children: [
CircularProgressIndicator.adaptive(value: status?.progress),
if (status != null) Text(status.calcLocalizedString(context)),
@ -177,8 +174,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
),
body: Center(
child: ConstrainedBox(
constraints:
const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 1.5),
constraints: const BoxConstraints(
maxWidth: FluffyThemes.columnWidth * 1.5,
),
child: ListView(
padding: const EdgeInsets.all(16.0),
children: [
@ -193,10 +191,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
),
subtitle: Text(L10n.of(context).chatBackupDescription),
),
const Divider(
height: 32,
thickness: 1,
),
const Divider(height: 32, thickness: 1),
TextField(
minLines: 2,
maxLines: 4,
@ -220,8 +215,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
});
},
title: Text(_getSecureStorageLocalizedName()),
subtitle:
Text(L10n.of(context).storeInSecureStorageDescription),
subtitle: Text(
L10n.of(context).storeInSecureStorageDescription,
),
),
const SizedBox(height: 16),
CheckboxListTile.adaptive(
@ -241,16 +237,16 @@ class BootstrapDialogState extends State<BootstrapDialog> {
label: Text(L10n.of(context).next),
onPressed:
(_recoveryKeyCopied || _storeInSecureStorage == true)
? () {
if (_storeInSecureStorage == true) {
const FlutterSecureStorage().write(
key: _secureStorageKey,
value: key,
);
}
setState(() => _recoveryKeyStored = true);
}
: null,
? () {
if (_storeInSecureStorage == true) {
const FlutterSecureStorage().write(
key: _secureStorageKey,
value: key,
);
}
setState(() => _recoveryKeyStored = true);
}
: null,
),
],
),
@ -303,8 +299,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
padding: const EdgeInsets.all(16.0),
children: [
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 8.0),
contentPadding: const EdgeInsets.symmetric(
horizontal: 8.0,
),
trailing: Icon(
Icons.info_outlined,
color: theme.colorScheme.primary,
@ -370,7 +367,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
);
try {
await bootstrap
.client.encryption!.crossSigning
.client
.encryption!
.crossSigning
.selfSign(recoveryKey: key);
Logs().d('Successful selfsigned');
} catch (e, s) {
@ -383,13 +382,14 @@ class BootstrapDialogState extends State<BootstrapDialog> {
}
} on InvalidPassphraseException catch (e) {
setState(
() => _recoveryKeyInputError =
e.toLocalizedString(context),
() => _recoveryKeyInputError = e
.toLocalizedString(context),
);
} on FormatException catch (_) {
setState(
() => _recoveryKeyInputError =
L10n.of(context).wrongRecoveryKey,
() => _recoveryKeyInputError = L10n.of(
context,
).wrongRecoveryKey,
);
} catch (e, s) {
ErrorReporter(
@ -397,8 +397,8 @@ class BootstrapDialogState extends State<BootstrapDialog> {
'Unable to open SSSS with recovery key',
).onErrorCallback(e, s);
setState(
() => _recoveryKeyInputError =
e.toLocalizedString(context),
() => _recoveryKeyInputError = e
.toLocalizedString(context),
);
} finally {
setState(
@ -428,8 +428,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
final consent = await showOkCancelAlertDialog(
context: context,
title: L10n.of(context).verifyOtherDevice,
message: L10n.of(context)
.verifyOtherDeviceDescription,
message: L10n.of(
context,
).verifyOtherDeviceDescription,
okLabel: L10n.of(context).ok,
cancelLabel: L10n.of(context).cancel,
);
@ -452,17 +453,18 @@ class BootstrapDialogState extends State<BootstrapDialog> {
final waitForSecret = Completer();
final secretsSub = client
.encryption!.ssss.onSecretStored.stream
.listen((
event,
) async {
if (await client.encryption!.keyManager
.isCached() &&
await client.encryption!.crossSigning
.isCached()) {
waitForSecret.complete();
}
});
.encryption!
.ssss
.onSecretStored
.stream
.listen((event) async {
if (await client.encryption!.keyManager
.isCached() &&
await client.encryption!.crossSigning
.isCached()) {
waitForSecret.complete();
}
});
final result = await showFutureLoadingDialog(
context: context,
@ -542,7 +544,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
case BootstrapState.done:
titleText = L10n.of(context).everythingReady;
body = Column(
mainAxisSize: MainAxisSize.min,
mainAxisSize: .min,
children: [
const Icon(
Icons.check_circle_rounded,
@ -576,13 +578,9 @@ class BootstrapDialogState extends State<BootstrapDialog> {
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
body,
const SizedBox(height: 8),
...buttons,
],
mainAxisSize: .min,
crossAxisAlignment: .stretch,
children: [body, const SizedBox(height: 8), ...buttons],
),
),
),