diff --git a/lib/features/home/presentation/home_controller.dart b/lib/features/home/presentation/home_controller.dart index bf4ecc95e..44ee7d921 100644 --- a/lib/features/home/presentation/home_controller.dart +++ b/lib/features/home/presentation/home_controller.dart @@ -2,6 +2,7 @@ import 'package:core/core.dart'; import 'package:dartz/dartz.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_downloader/flutter_downloader.dart'; +import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/model.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; @@ -97,7 +98,7 @@ class HomeController extends BaseController { _emailReceiveManager.receivingSharingStream.listen((uri) { log('HomeController::onReady(): Received Email: ${uri.toString()}'); if (uri != null) { - if(_emailReceiveManager.mailRegex.hasMatch(uri.path)) { + if(GetUtils.isEmail(uri.path)) { log('HomeController::onReady(): Address: ${uri.path}'); _emailReceiveManager.setPendingEmailAddress(EmailAddress(null, uri.path)); } else { diff --git a/lib/main/utils/email_receive_manager.dart b/lib/main/utils/email_receive_manager.dart index 7f5deef9c..86f32da3e 100644 --- a/lib/main/utils/email_receive_manager.dart +++ b/lib/main/utils/email_receive_manager.dart @@ -5,9 +5,6 @@ import 'package:rxdart/rxdart.dart'; class EmailReceiveManager { - /// Regex check Url is mail or not - final mailRegex = RegExp(r'(([a-zA-Z0-9\-\_\.])+@[a-zA-Z\_]+?(\.[a-zA-Z]{2,6})+)'); - BehaviorSubject _pendingEmailAddressInfo = BehaviorSubject.seeded(null); BehaviorSubject get pendingEmailAddressInfo => _pendingEmailAddressInfo;