From 88e1f8324f183d4aaf87fc0536e0fc5ffaee56cc Mon Sep 17 00:00:00 2001 From: shilangyu Date: Tue, 6 Apr 2021 10:56:21 +0200 Subject: [PATCH] Change cleanUpUrl name --- lib/pages/add_instance.dart | 4 ++-- lib/util/cleanup_url.dart | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/pages/add_instance.dart b/lib/pages/add_instance.dart index 6cebf78..5aafa13 100644 --- a/lib/pages/add_instance.dart +++ b/lib/pages/add_instance.dart @@ -25,7 +25,7 @@ class AddInstancePage extends HookWidget { final debounce = useDebounce(() async { if (prevInput == instanceController.text) return; - final inst = cleanUpUrl(instanceController.text); + final inst = normalizeInstanceHost(instanceController.text); if (inst.isEmpty) { isSite.value = null; return; @@ -47,7 +47,7 @@ class AddInstancePage extends HookWidget { instanceController.removeListener(debounce); }; }, []); - final inst = cleanUpUrl(instanceController.text); + final inst = normalizeInstanceHost(instanceController.text); handleOnAdd() async { try { await accountsStore.addInstance(inst, assumeValid: true); diff --git a/lib/util/cleanup_url.dart b/lib/util/cleanup_url.dart index f8182fd..98ef12b 100644 --- a/lib/util/cleanup_url.dart +++ b/lib/util/cleanup_url.dart @@ -1,9 +1,9 @@ -/// Returns host of a url without a leading 'www.' or protocol if present also -/// removes trailing '/' -String cleanUpUrl(String url) { +/// Returns a normalized host of a (maybe) url without a leading www. +String normalizeInstanceHost(String maybeUrl) { try { - return urlHost(url.startsWith('https://') ? url : 'https://$url'); - } on FormatException catch (_) { + return urlHost( + maybeUrl.startsWith('https://') ? maybeUrl : 'https://$maybeUrl'); + } on FormatException { return ''; } }