[deep link] Distinguish IosDomainError and AndroidDomainError. (#7892)

* 1 * lint * word * resolve comments * Update validation_details_view.dart
flutter · Jun 6, 2024 · cef4bd7 · cef4bd7
1 parent 8824098
commit cef4bd7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 24 deletions.
diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart
@@ -21,15 +21,15 @@ import 'deep_links_services.dart';
 typedef _DomainAndPath = ({String? domain, String? path});
 
 const domainAssetLinksJsonFileErrors = {
-  DomainError.existence,
-  DomainError.appIdentifier,
-  DomainError.fingerprints,
+  AndroidDomainError.existence,
+  AndroidDomainError.appIdentifier,
+  AndroidDomainError.fingerprints,
 };
-const domainHostingErrors = {
-  DomainError.contentType,
-  DomainError.httpsAccessibility,
-  DomainError.nonRedirect,
-  DomainError.hostForm,
+const domainAndroidHostingErrors = {
+  AndroidDomainError.contentType,
+  AndroidDomainError.httpsAccessibility,
+  AndroidDomainError.nonRedirect,
+  AndroidDomainError.hostForm,
 };
 
 /// The phase of the deep link page.

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart
@@ -39,6 +39,10 @@ class CommonError {
 
 class DomainError extends CommonError {
   const DomainError(super.title, super.explanation, super.fixDetails);
+}
+
+class AndroidDomainError extends DomainError {
+  const AndroidDomainError(super.title, super.explanation, super.fixDetails);
 
   /// Existence of an asset link file.
   static const existence = DomainError(
@@ -117,6 +121,18 @@ class DomainError extends CommonError {
   static const other = DomainError('Check failed', '', '');
 }
 
+class IosDomainError extends DomainError {
+  const IosDomainError(super.title, super.explanation, super.fixDetails);
+  // TODO: Add  domain errors for iOS.
+
+  /// Existence of an Apple-App-Site-Association file.
+  static const existence = DomainError(
+    'Apple-App-Site-Association file does not exist',
+    '',
+    '',
+  );
+}
+
 /// There are currently two types of path errors, errors from intent filters and path format errors.
 class PathError extends CommonError {
   const PathError(super.title, super.explanation, super.fixDetails);

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_services.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_services.dart
@@ -31,14 +31,14 @@ const String _generatedContentKey = 'generatedContent';
 const int _domainBatchSize = 500;
 
 const Map<String, DomainError> checkNameToDomainError = {
-  'EXISTENCE': DomainError.existence,
-  'APP_IDENTIFIER': DomainError.appIdentifier,
-  'FINGERPRINT': DomainError.fingerprints,
-  'CONTENT_TYPE': DomainError.contentType,
-  'HTTPS_ACCESSIBILITY': DomainError.httpsAccessibility,
-  'NON_REDIRECT': DomainError.nonRedirect,
-  'HOST_FORMED_PROPERLY': DomainError.hostForm,
-  'OTHER_CHECKS': DomainError.other,
+  'EXISTENCE': AndroidDomainError.existence,
+  'APP_IDENTIFIER': AndroidDomainError.appIdentifier,
+  'FINGERPRINT': AndroidDomainError.fingerprints,
+  'CONTENT_TYPE': AndroidDomainError.contentType,
+  'HTTPS_ACCESSIBILITY': AndroidDomainError.httpsAccessibility,
+  'NON_REDIRECT': AndroidDomainError.nonRedirect,
+  'HOST_FORMED_PROPERLY': AndroidDomainError.hostForm,
+  'OTHER_CHECKS': AndroidDomainError.other,
 };
 
 class GenerateAssetLinksResult {

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart
@@ -155,8 +155,10 @@ class _DomainCheckTable extends StatelessWidget {
             _CheckExpansionTile(
               initiallyExpanded: !fingerprintExists,
               checkName: 'Digital assets link file',
-              status:
-                  _CheckStatusText(hasError: linkData.domainErrors.isNotEmpty),
+              status: _CheckStatusText(
+                hasError:
+                    linkData.domainErrors.any((e) => e is AndroidDomainError),
+              ),
               children: <Widget>[
                 _Fingerprint(controller: controller),
                 // The following checks are only displayed if a fingerprint exists.
@@ -226,7 +228,7 @@ class _HostingIssues extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final errors = controller.selectedLink.value!.domainErrors
-        .where((error) => domainHostingErrors.contains(error))
+        .where((error) => domainAndroidHostingErrors.contains(error))
         .toList();
     return ExpansionTile(
       controlAffinity: ListTileControlAffinity.leading,
@@ -562,7 +564,7 @@ class _CrossCheckTable extends StatelessWidget {
     // TODO (hangyujin): Update this bool to actually check if aasa file exists.
     const hasIosAasaFile = true;
     final hasAndroidAssetLinksFile =
-        !linkData.domainErrors.contains(DomainError.existence);
+        !linkData.domainErrors.contains(AndroidDomainError.existence);
 
     final missingIos = hasIosAasaFile && !linkData.os.contains(PlatformOS.ios);
     final missingAndroid =

diff --git a/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart b/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
@@ -48,7 +48,7 @@ final domainErrorlinkData = LinkData(
   domain: 'www.google.com',
   path: '/',
   os: {PlatformOS.android, PlatformOS.ios},
-  domainErrors: [DomainError.existence],
+  domainErrors: [AndroidDomainError.existence],
 );
 
 final pathErrorlinkData = LinkData(
@@ -427,7 +427,7 @@ void main() {
             domain: 'www.domain1.com',
             path: '/',
             os: {PlatformOS.android},
-            domainErrors: [DomainError.existence],
+            domainErrors: [AndroidDomainError.existence],
           ),
           LinkData(
             domain: 'www.domain2.com',
@@ -499,7 +499,7 @@ void main() {
             domain: 'www.domain2.com',
             path: '/path',
             os: {PlatformOS.ios},
-            domainErrors: [DomainError.existence],
+            domainErrors: [AndroidDomainError.existence],
           ),
           LinkData(
             domain: 'www.google.com',
@@ -631,7 +631,7 @@ void main() {
             domain: 'www.domain1.com',
             path: '/path1',
             os: {PlatformOS.android},
-            domainErrors: [DomainError.existence],
+            domainErrors: [AndroidDomainError.existence],
           ),
           LinkData(
             domain: 'www.domain2.com',