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

fix: use vrouter.toSegments

Browse source
This commit is contained in:
Sorunome 2021-08-15 13:26:16 +02:00
commit 02e57474fe
22 changed files with 47 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/utils/background_push.dart
View file

@ -283,7 +283,7 @@ class BackgroundPush {
if (router == null) {
return;
}
router.currentState.to('/rooms/$roomId');
router.currentState.toSegments(['rooms', roomId]);
} catch (e, s) {
Logs().e('[Push] Failed to open room', e, s);
}

15
lib/utils/url_launcher.dart
View file

@ -110,10 +110,10 @@ class UrlLauncher {
if (room != null) {
// we have the room, so....just open it
if (event != null) {
VRouter.of(context)
.to('/rooms/${room.id}', queryParameters: {'event': event});
VRouter.of(context).toSegments(['rooms', room.id],
queryParameters: {'event': event});
} else {
VRouter.of(context).to('/rooms/${room.id}');
VRouter.of(context).toSegments(['rooms', room.id]);
}
return;
}
@ -138,9 +138,10 @@ class UrlLauncher {
context: context,
future: () => Future.delayed(const Duration(seconds: 2)));
if (event != null) {
VRouter.of(context).to('/rooms/${response.result}/$event');
VRouter.of(context).toSegments(['rooms', response.result],
queryParameters: {'event': event});
} else {
VRouter.of(context).to('/rooms/${response.result}');
VRouter.of(context).toSegments(['rooms', response.result]);
}
}
} else {
@ -155,7 +156,7 @@ class UrlLauncher {
);
var roomId = matrix.client.getDirectChatFromUserId(user.id);
if (roomId != null) {
VRouter.of(context).to('/rooms/$roomId');
VRouter.of(context).toSegments(['rooms', roomId]);
return;
}
@ -173,7 +174,7 @@ class UrlLauncher {
.result;
if (roomId != null) {
VRouter.of(context).to('/rooms/$roomId');
VRouter.of(context).toSegments(['rooms', roomId]);
}
}
}