Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-09 23:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Bootstrap on first try fails sometimes

Browse source
This commit is contained in:
krille-chan 2023-08-13 10:45:47 +02:00
parent dd34f3c232
commit 1d934c5353
No known key found for this signature in database
4 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/config/routes.dart
View file

@ -412,17 +412,19 @@ abstract class AppRoutes {
),
];
static Page defaultPageBuilder(BuildContext context, Widget child) =>
CustomTransitionPage(
child: child,
transitionsBuilder: (context, animation, secondaryAnimation, child) =>
FluffyThemes.isColumnMode(context)
? FadeTransition(opacity: animation, child: child)
: CupertinoPageTransition(
primaryRouteAnimation: animation,
secondaryRouteAnimation: secondaryAnimation,
linearTransition: false,
child: child,
),
);
static Page defaultPageBuilder(BuildContext context, Widget child) {
Matrix.of(context).navigatorContext = context;
return CustomTransitionPage(
child: child,
transitionsBuilder: (context, animation, secondaryAnimation, child) =>
FluffyThemes.isColumnMode(context)
? FadeTransition(opacity: animation, child: child)
: CupertinoPageTransition(
primaryRouteAnimation: animation,
secondaryRouteAnimation: secondaryAnimation,
linearTransition: false,
child: child,
),
);
}
}

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

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:adaptive_dialog/adaptive_dialog.dart';
@ -8,9 +7,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:matrix/encryption.dart';
import 'package:matrix/encryption/utils/bootstrap.dart';
import 'package:matrix/matrix.dart';
import 'package:share_plus/share_plus.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/utils/fluffy_share.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/adaptive_flat_button.dart';
import '../../utils/adaptive_bottom_sheet.dart';
@ -91,9 +90,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
Widget build(BuildContext context) {
_wipe ??= widget.wipe;
final buttons = <AdaptiveFlatButton>[];
Widget body = PlatformInfos.isCupertinoStyle
? const CupertinoActivityIndicator()
: const LinearProgressIndicator();
Widget body = const CircularProgressIndicator.adaptive();
titleText = L10n.of(context)!.loadingPleaseWait;
if (bootstrap.newSsssKey?.recoveryKey != null &&
@ -163,12 +160,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
value: _recoveryKeyCopied,
activeColor: Theme.of(context).colorScheme.primary,
onChanged: (b) {
final box = context.findRenderObject() as RenderBox;
Share.share(
key!,
sharePositionOrigin:
box.localToGlobal(Offset.zero) & box.size,
);
FluffyShare.share(key!, context);
setState(() => _recoveryKeyCopied = true);
},
title: Text(L10n.of(context)!.copyToClipboard),
@ -295,18 +287,31 @@ class BootstrapDialogState extends State<BootstrapDialog> {
_recoveryKeyInputLoading = true;
});
try {
final key =
_recoveryKeyTextEditingController.text;
final key = _recoveryKeyTextEditingController
.text
.trim();
await bootstrap.newSsssKey!.unlock(
keyOrPassphrase: key,
);
Logs().d('SSSS unlocked');
await bootstrap.client.encryption!.crossSigning
.selfSign(
keyOrPassphrase: key,
);
Logs().d('Successful elfsigned');
await bootstrap.openExistingSsss();
Logs().d('SSSS unlocked');
if (bootstrap.encryption.crossSigning.enabled) {
Logs().v(
'Cross signing is already enabled. Try to self-sign',
);
try {
await bootstrap
.client.encryption!.crossSigning
.selfSign(recoveryKey: key);
Logs().d('Successful selfsigned');
} catch (e, s) {
Logs().e(
'Unable to self sign with recovery key after successfully open existing SSSS',
e,
s,
);
}
}
} catch (e, s) {
Logs().w('Unable to unlock SSSS', e, s);
setState(
@ -435,18 +440,12 @@ class BootstrapDialogState extends State<BootstrapDialog> {
}
}
final title = Text(titleText!);
if (PlatformInfos.isCupertinoStyle) {
return CupertinoAlertDialog(
title: title,
content: body,
actions: buttons,
);
}
return AlertDialog(
title: title,
content: body,
actions: buttons,
return Scaffold(
appBar: AppBar(
title: Text(titleText ?? L10n.of(context)!.loadingPleaseWait),
),
body: Center(child: body),
bottomNavigationBar: Row(children: buttons),
);
}
}

4
lib/pages/homeserver_picker/homeserver_picker_view.dart
View file

@ -182,6 +182,10 @@ class _LoginButton extends StatelessWidget {
width: 256,
child: OutlinedButton(
style: OutlinedButton.styleFrom(
side: BorderSide(
width: 1,
color: Theme.of(context).colorScheme.onBackground,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(90),
),

2
linux/my_application.cc
View file

@ -60,7 +60,7 @@ static void my_application_activate(GApplication* application) {
gtk_window_set_title(window, "fluffychat");
}
gtk_window_set_default_size(window, 864, 600);
gtk_window_set_default_size(window, 864, 680);
g_autoptr(FlDartProject) project = fl_dart_project_new();
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);