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

Change cleanUpUrl name

This commit is contained in:
shilangyu 2021-04-06 10:56:21 +02:00
parent fbb8ff3a33
commit 88e1f8324f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/add_instance.dart
View File

@ -25,7 +25,7 @@ class AddInstancePage extends HookWidget {
final debounce = useDebounce(() async { final debounce = useDebounce(() async {
if (prevInput == instanceController.text) return; if (prevInput == instanceController.text) return;
final inst = cleanUpUrl(instanceController.text); final inst = normalizeInstanceHost(instanceController.text);
if (inst.isEmpty) { if (inst.isEmpty) {
isSite.value = null; isSite.value = null;
return; return;
@ -47,7 +47,7 @@ class AddInstancePage extends HookWidget {
instanceController.removeListener(debounce); instanceController.removeListener(debounce);
}; };
}, []); }, []);
final inst = cleanUpUrl(instanceController.text); final inst = normalizeInstanceHost(instanceController.text);
handleOnAdd() async { handleOnAdd() async {
try { try {
await accountsStore.addInstance(inst, assumeValid: true); await accountsStore.addInstance(inst, assumeValid: true);

10
lib/util/cleanup_url.dart
View File

@ -1,9 +1,9 @@
/// Returns host of a url without a leading 'www.' or protocol if present also /// Returns a normalized host of a (maybe) url without a leading www.
/// removes trailing '/' String normalizeInstanceHost(String maybeUrl) {
String cleanUpUrl(String url) {
try { try {
return urlHost(url.startsWith('https://') ? url : 'https://$url'); return urlHost(
} on FormatException catch (_) { maybeUrl.startsWith('https://') ? maybeUrl : 'https://$maybeUrl');
} on FormatException {
return ''; return '';
} }
} }