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

refactor: Use getCryptoIdentityState to check backup state

Browse source
This commit is contained in:
krille-chan 2026-02-19 17:48:19 +01:00
commit 66566e6901
No known key found for this signature in database
4 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/pages/settings/settings.dart
View file

@ -6,6 +6,7 @@ import 'package:collection/collection.dart';
import 'package:file_picker/file_picker.dart';
import 'package:go_router/go_router.dart';
import 'package:image_picker/image_picker.dart';
import 'package:matrix/encryption.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
@ -61,13 +62,12 @@ class SettingsController extends State<Settings> {
}
void logoutAction() async {
final noBackup = showChatBackupBanner == true;
if (await showOkCancelAlertDialog(
useRootNavigator: false,
context: context,
title: L10n.of(context).areYouSureYouWantToLogout,
message: L10n.of(context).noBackupWarning,
isDestructive: noBackup,
isDestructive: cryptoIdentityConnected == false,
okLabel: L10n.of(context).logout,
cancelLabel: L10n.of(context).cancel,
) ==
@ -167,23 +167,17 @@ class SettingsController extends State<Settings> {
if (client.prevBatch == null) {
await client.onSync.stream.first;
}
final crossSigning =
await client.encryption?.crossSigning.isCached() ?? false;
final needsBootstrap =
await client.encryption?.keyManager.isCached() == false ||
client.encryption?.crossSigning.enabled == false ||
!crossSigning;
final isUnknownSession = client.isUnknownSession;
final state = await client.getCryptoIdentityState();
setState(() {
showChatBackupBanner = needsBootstrap || isUnknownSession;
cryptoIdentityConnected = state.initialized && state.connected;
});
}
bool? crossSigningCached;
bool? showChatBackupBanner;
bool? cryptoIdentityConnected;
void firstRunBootstrapAction([_]) async {
if (showChatBackupBanner != true) {
if (cryptoIdentityConnected == true) {
showOkAlertDialog(
context: context,
title: L10n.of(context).chatBackup,

22
lib/pages/settings/settings_view.dart
View file

@ -22,7 +22,6 @@ class SettingsView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final showChatBackupBanner = controller.showChatBackupBanner;
final activeRoute = GoRouter.of(
context,
).routeInformationProvider.value.uri.path;
@ -142,20 +141,13 @@ class SettingsView extends StatelessWidget {
},
),
Divider(color: theme.dividerColor),
if (showChatBackupBanner == null)
ListTile(
leading: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
trailing: const CircularProgressIndicator.adaptive(),
)
else
SwitchListTile.adaptive(
controlAffinity: ListTileControlAffinity.trailing,
value: controller.showChatBackupBanner == false,
secondary: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
onChanged: controller.firstRunBootstrapAction,
),
SwitchListTile.adaptive(
controlAffinity: ListTileControlAffinity.trailing,
value: controller.cryptoIdentityConnected == true,
secondary: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
onChanged: controller.firstRunBootstrapAction,
),
Divider(color: theme.dividerColor),
ListTile(
leading: const Icon(Icons.format_paint_outlined),