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

fix: Make tap on pills and matrix.to links work again

Browse source
This commit is contained in:
Sorunome 2021-01-19 17:41:37 +01:00
commit a41236be0e
2 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/utils/url_launcher.dart
View file

@ -71,9 +71,14 @@ class UrlLauncher {
}
}
if (room != null) {
// we have the room, so....just open it!
await AdaptivePageLayout.of(context)
.pushNamedAndRemoveUntilIsFirst('/rooms/${room.id}/$event');
// we have the room, so....just open it
if (event != null) {
await AdaptivePageLayout.of(context)
.pushNamedAndRemoveUntilIsFirst('/rooms/${room.id}/$event');
} else {
await AdaptivePageLayout.of(context)
.pushNamedAndRemoveUntilIsFirst('/rooms/${room.id}');
}
return;
}
if (roomIdOrAlias.sigil == '!') {
@ -95,8 +100,13 @@ class UrlLauncher {
await showFutureLoadingDialog(
context: context,
future: () => Future.delayed(const Duration(seconds: 2)));
await AdaptivePageLayout.of(context).pushNamedAndRemoveUntilIsFirst(
'/rooms/${response.result}/$event');
if (event != null) {
await AdaptivePageLayout.of(context).pushNamedAndRemoveUntilIsFirst(
'/rooms/${response.result}/$event');
} else {
await AdaptivePageLayout.of(context)
.pushNamedAndRemoveUntilIsFirst('/rooms/${response.result}');
}
}
} else {
await AdaptivePageLayout.of(context)