GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-11-03 22:07:23 +01:00
Code Issues Projects Releases Wiki Activity

fix: Allow fallback to previous url if there is no homeserver on the mxid domain

Browse Source
This commit is contained in:
Sorunome 2021-08-08 08:46:19 +02:00
parent 7f66fc733f
commit eabb548215
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/l10n/intl_en.arb
View File

@ -1351,6 +1351,14 @@
"type": "text",
"placeholders": {}
},
"noMatrixServer": "{server1} is no matrix server, use {server2} instead?",
"@noMatrixServer": {
"type": "text",
"placeholders": {
"server1": {},
"server2": {}
}
},
"noMegolmBootstrap": "Please turn on online key backup from within Element instead.",
"@noMegolmBootstrap": {
"type": "text",

25
lib/pages/login.dart
View File

@ -117,10 +117,33 @@ class LoginController extends State<Login> {
.setItem(SettingKeys.jitsiInstance, jitsi);
AppConfig.jitsiInstance = jitsi;
}
final oldHomeserver = Matrix.of(context).client.homeserver;
await showFutureLoadingDialog(
context: context,
future: () => Matrix.of(context).client.checkHomeserver(newDomain),
// do nothing if we error, we'll handle it below
future: () => Matrix.of(context)
.client
.checkHomeserver(newDomain)
.catchError((e) => null),
);
if (Matrix.of(context).client.homeserver == null) {
Matrix.of(context).client.homeserver = oldHomeserver;
// okay, the server we checked does not appear to be a matrix server
Logs().v(
'$newDomain is not running a homeserver, asking to use $oldHomeserver');
final dialogResult = await showOkCancelAlertDialog(
context: context,
useRootNavigator: false,
message: L10n.of(context).noMatrixServer(newDomain, oldHomeserver),
okLabel: L10n.of(context).ok,
cancelLabel: L10n.of(context).cancel,
);
if (dialogResult == OkCancelResult.ok) {
setState(() => usernameError = null);
} else {
Navigator.of(context, rootNavigator: false).pop();
}
}
setState(() => usernameError = null);
}
} catch (e) {