GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-16 17:09:31 +01:00
Code Issues Projects Releases Wiki Activity

fix: tapping on aliases not always working

Browse Source
This commit is contained in:
Sorunome 2020-09-28 15:14:16 +02:00
parent 7fc416ec37
commit c0390caa64
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/utils/url_launcher.dart
View File

@ -39,7 +39,7 @@ class UrlLauncher {
// we make the servers a set and later on convert to a list, so that we can easily // we make the servers a set and later on convert to a list, so that we can easily
// deduplicate servers added via alias lookup and query parameter // deduplicate servers added via alias lookup and query parameter
var servers = <String>{}; var servers = <String>{};
if (room == null && roomIdOrAlias == '#') { if (room == null && roomIdOrAlias.startsWith('#')) {
// we were unable to find the room locally...so resolve it // we were unable to find the room locally...so resolve it
final response = final response =
await SimpleDialogs(context).tryRequestWithLoadingDialog( await SimpleDialogs(context).tryRequestWithLoadingDialog(
@ -79,24 +79,23 @@ class UrlLauncher {
if (roomIdOrAlias[0] == '!') { if (roomIdOrAlias[0] == '!') {
roomId = roomIdOrAlias; roomId = roomIdOrAlias;
} }
if (roomId == null) {
// we haven't found this room....so let's ignore it
return;
}
if (await SimpleDialogs(context) if (await SimpleDialogs(context)
.askConfirmation(titleText: 'Join room $roomIdOrAlias')) { .askConfirmation(titleText: 'Join room $roomIdOrAlias')) {
final response = final response =
await SimpleDialogs(context).tryRequestWithLoadingDialog( await SimpleDialogs(context).tryRequestWithLoadingDialog(
matrix.client.joinRoomOrAlias( matrix.client.joinRoomOrAlias(
Uri.encodeComponent(roomIdOrAlias), roomIdOrAlias,
servers: servers.toList(), servers: servers.isNotEmpty ? servers.toList() : null,
), ),
); );
if (response == false) return; if (response == false) return;
// wait for two seconds so that it probably came down /sync
await SimpleDialogs(context).tryRequestWithLoadingDialog(
Future.delayed(const Duration(seconds: 2)));
await Navigator.pushAndRemoveUntil( await Navigator.pushAndRemoveUntil(
context, context,
AppRoute.defaultRoute( AppRoute.defaultRoute(
context, ChatView(response['room_id'], scrollToEventId: event)), context, ChatView(response, scrollToEventId: event)),
(r) => r.isFirst, (r) => r.isFirst,
); );
} }