fix url validation

zwwuu · Feb 9, 2021 · 4a446f6 · 4a446f6
1 parent 93620f7
commit 4a446f6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/lib/app/modules/item/item_controller.dart b/lib/app/modules/item/item_controller.dart
@@ -3,6 +3,7 @@ import 'package:flutter_modular/flutter_modular.dart';
 import 'package:mobx/mobx.dart';
 
 import '../../shared/models/item.dart';
+import '../../shared/util/extensions.dart';
 import 'repository/item_repository.dart';
 
 part 'item_controller.g.dart';
@@ -27,7 +28,7 @@ abstract class _ItemControllerBase with Store {
   @observable
   bool isLoadingWebContent = false;
 
-  bool get hasWebContent => Uri.parse(itemFuture.value.url).isAbsolute;
+  bool get hasWebContent => !itemFuture.value.domain.isNullOrEmpty();
 
   @action
   void switchView() {

diff --git a/lib/app/service/share_service.dart b/lib/app/service/share_service.dart
@@ -1,15 +1,14 @@
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:share/share.dart';
 
-import '../shared/util/url_util.dart';
+import '../shared/util/extensions.dart';
 
 part 'share_service.g.dart';
 
 @Injectable()
 class ShareService extends Disposable {
   void share({String title, String url}) {
-    var parsedUrl = UrlUtil.parseUrl(url);
-    Share.share('$title\n$parsedUrl');
+    Share.share('$title\n${url.toUrl()}');
   }
 
   //dispose will be called automatically

diff --git a/lib/app/service/url_launch_service.dart b/lib/app/service/url_launch_service.dart
@@ -1,15 +1,14 @@
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../shared/util/url_util.dart';
+import '../shared/util/extensions.dart';
 
 part 'url_launch_service.g.dart';
 
 @Injectable()
 class UrlLaunchService extends Disposable {
   Future<void> launchUrl(String url) async {
-    var parseUrl = UrlUtil.parseUrl(url);
-    await launch(parseUrl);
+    await launch(url.toUrl());
   }
 
   //dispose will be called automatically

diff --git a/lib/app/shared/util/extensions.dart b/lib/app/shared/util/extensions.dart
@@ -16,4 +16,14 @@ extension StringExtension on String {
       return feedType.name == toLowerCase();
     });
   }
+
+  bool isNullOrEmpty() {
+    return this == null || isEmpty;
+  }
+
+  String toUrl() {
+    var urlPattern = r'(https?|http)://([-A-Z0-9.]+)(/[-A-Z0-9+&@#/%=~_|!:,.;]*)?(\?[A-Z0-9+&@#/%=~_|!:‌,.;]*)?';
+    var match = RegExp(urlPattern, caseSensitive: false).firstMatch(this);
+    return match != null ? this : 'https://news.ycombinator.com/$this';
+  }
 }
diff --git a/lib/app/shared/util/url_util.dart b/lib/app/shared/util/url_util.dart