Lemmy
/
lemmur-app-android
mirror of https://github.com/krawieck/lemmur/
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix opening instance, and handling unfortunate urls

This commit is contained in:
krawieck 2020-09-12 10:23:39 +02:00
parent 3740341327
commit bc3d67bb4e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/url_launcher.dart
View File

@ -4,6 +4,7 @@ import 'package:url_launcher/url_launcher.dart' as ul;
import 'pages/community.dart';
import 'pages/full_post.dart';
import 'pages/instance.dart';
import 'pages/user.dart';
import 'stores/accounts_store.dart';
@ -34,13 +35,16 @@ Future<void> urlLauncher({
// CHECK IF REDIRECTS TO A PAGE ON ONE OF ADDED INSTANCES
final instanceRegex = RegExp(r'^(?:https?:\/\/)?([\w\.-]+)(.+)$');
final instanceRegex = RegExp(r'^(?:https?:\/\/)?([\w\.-]+)(.*)$');
final match = instanceRegex.firstMatch(url);
final matchedInstance = match.group(1);
final rest = match.group(2);
final matchedInstance = match?.group(1);
final rest = match?.group(2);
if (instances.any((e) => e == match.group(1))) {
if (matchedInstance != null && instances.any((e) => e == match.group(1))) {
if (rest.isEmpty || rest == '/') {
return push((_) => InstancePage(instanceUrl: matchedInstance));
}
final split = rest.split('/');
switch (split[1]) {
case 'c':
@ -90,9 +94,9 @@ Future<void> urlLauncher({
case 'sponsors':
case 'instances':
case 'docs':
openInBrowser(url);
return;
break;
default:
break;
}
}