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

fix: Load urls directly

Browse source
This commit is contained in:
Christian Pauly 2021-06-10 10:20:00 +02:00
commit 8dff85626e
4 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/widgets/matrix.dart
View file

@ -266,8 +266,8 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
utf8.decode((await http.get(Uri.parse('config.json'))).bodyBytes);
final configJson = json.decode(configJsonString);
AppConfig.loadFromJson(configJson);
} catch (e, s) {
Logs().v('[ConfigLoader] Failed to load config.json', e, s);
} catch (e, _) {
Logs().v('[ConfigLoader] config.json not found', e);
}
}
@ -326,8 +326,13 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
onLoginStateChanged ??= client.onLoginStateChanged.stream.listen((state) {
if (loginState != state) {
loginState = state;
widget.router.currentState
.push(loginState == LoginState.logged ? '/rooms' : '/home');
final isInLoginRoutes = {'/home', '/login', '/signup'}
.contains(widget.router.currentState.url);
if (widget.router.currentState.url == '/' ||
(state == LoginState.logged) == isInLoginRoutes) {
widget.router.currentState
.push(loginState == LoginState.logged ? '/rooms' : '/home');
}
}
});