Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
chunhtai committed Jan 23, 2025
1 parent 40e3ed9 commit 79cc745
Showing 1 changed file with 76 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,9 @@ class DeepLinksController extends DisposableController
if (selectedProject.value!.androidVariants.isEmpty) {
return;
}
final variant = selectedProject
.value!.androidVariants[selectedAndroidVariantIndex.value];
final variant =
selectedProject.value!.androidVariants[selectedAndroidVariantIndex
.value];
await ga.timeAsync(
gac.deeplink,
gac.AnalyzeFlutterProject.loadAppLinks.name,
Expand All @@ -316,8 +317,8 @@ class DeepLinksController extends DisposableController
ga.impression(
gac.deeplink,
gac.AnalyzeFlutterProject.androidAppLinksSettingsLoaded.name,
screenMetricsProvider: () =>
DeepLinkScreenMetrics(androidAppId: result.applicationId),
screenMetricsProvider:
() => DeepLinkScreenMetrics(androidAppId: result.applicationId),
);
} catch (_) {
ga.select(
Expand Down Expand Up @@ -353,8 +354,9 @@ class DeepLinksController extends DisposableController
ga.impression(
gac.deeplink,
gac.AnalyzeFlutterProject.iosUniversalLinkSettingsLoaded.name,
screenMetricsProvider: () =>
DeepLinkScreenMetrics(iosBundleId: result.bundleIdentifier),
screenMetricsProvider:
() =>
DeepLinkScreenMetrics(iosBundleId: result.bundleIdentifier),
);
} catch (_) {
pagePhase.value = PagePhase.validationErrorPage;
Expand Down Expand Up @@ -507,21 +509,22 @@ class DeepLinksController extends DisposableController
generatedAssetLinksForSelectedLink.value = null;
final domain = selectedLink.value!.domain;
if (domain != null) {
generatedAssetLinksForSelectedLink.value =
await deepLinksService.generateAssetLinks(
domain: domain,
applicationId: applicationId,
localFingerprint: localFingerprint.value,
);
generatedAssetLinksForSelectedLink.value = await deepLinksService
.generateAssetLinks(
domain: domain,
applicationId: applicationId,
localFingerprint: localFingerprint.value,
);
}
}

Future<List<LinkData>> _validateDomain(List<LinkData> rawLinkdatas) async {
final domains = rawLinkdatas
.where((linkdata) => linkdata.domain != null)
.map((linkdata) => linkdata.domain!)
.toSet()
.toList();
final domains =
rawLinkdatas
.where((linkdata) => linkdata.domain != null)
.map((linkdata) => linkdata.domain!)
.toSet()
.toList();

Map<String, List<DomainError>> androidDomainErrors = {};
Map<String, List<DomainError>> iosDomainErrors = {};
Expand All @@ -531,8 +534,10 @@ class DeepLinksController extends DisposableController
ga.impression(
gac.deeplink,
gac.AnalyzeFlutterProject.androidValidateDomain.name,
screenMetricsProvider: () => DeepLinkScreenMetrics(
androidAppId: currentAppLinkSettings!.applicationId),
screenMetricsProvider:
() => DeepLinkScreenMetrics(
androidAppId: currentAppLinkSettings!.applicationId,
),
);
final androidResult = await deepLinksService.validateAndroidDomain(
domains: domains,
Expand All @@ -548,8 +553,10 @@ class DeepLinksController extends DisposableController
ga.impression(
gac.deeplink,
gac.AnalyzeFlutterProject.iosValidateDomain.name,
screenMetricsProvider: () => DeepLinkScreenMetrics(
iosBundleId: currentUniversalLinkSettings!.bundleIdentifier),
screenMetricsProvider:
() => DeepLinkScreenMetrics(
iosBundleId: currentUniversalLinkSettings!.bundleIdentifier,
),
);
final iosResult = await deepLinksService.validateIosDomain(
bundleId: bundleId,
Expand Down Expand Up @@ -579,10 +586,11 @@ class DeepLinksController extends DisposableController
AndroidDomainError.existence,
) ??
false);
final hasIosAasaFile = !(iosDomainErrors[linkdata.domain]?.contains(
IosDomainError.existence,
) ??
false);
final hasIosAasaFile =
!(iosDomainErrors[linkdata.domain]?.contains(
IosDomainError.existence,
) ??
false);

if (linkdata.os.contains(PlatformOS.ios)) {
final iosPaths = iosDomainPaths[linkdata.domain] ?? <Path>[];
Expand Down Expand Up @@ -676,12 +684,14 @@ class DeepLinksController extends DisposableController
byPath: linkDatasByPath(linkdata),
);
displayOptionsNotifier.value = displayOptionsNotifier.value.copyWith(
domainErrorCount: validatedLinkDatas.byDomain
.where((element) => element.domainErrors.isNotEmpty)
.length,
pathErrorCount: validatedLinkDatas.byPath
.where((element) => element.pathErrors.isNotEmpty)
.length,
domainErrorCount:
validatedLinkDatas.byDomain
.where((element) => element.domainErrors.isNotEmpty)
.length,
pathErrorCount:
validatedLinkDatas.byPath
.where((element) => element.pathErrors.isNotEmpty)
.length,
);
applyFilters();

Expand All @@ -700,17 +710,20 @@ class DeepLinksController extends DisposableController
late final LinkData linkdata;
switch (viewType) {
case TableViewType.domainView:
linkdata = linkDatas.byDomain
linkdata =
linkDatas.byDomain
.where((e) => e.domainErrors.isNotEmpty)
.firstOrNull ??
linkDatas.byDomain.first;
case TableViewType.pathView:
linkdata = linkDatas.byPath
linkdata =
linkDatas.byPath
.where((e) => e.pathErrors.isNotEmpty)
.firstOrNull ??
linkDatas.byPath.first;
case TableViewType.singleUrlView:
linkdata = linkDatas.all
linkdata =
linkDatas.all
.where(
(e) => e.domainErrors.isNotEmpty || e.pathErrors.isNotEmpty,
)
Expand Down Expand Up @@ -772,37 +785,38 @@ class DeepLinksController extends DisposableController
@visibleForTesting
List<LinkData> getFilterredLinks(List<LinkData> linkDatas) {
final searchContent = displayOptions.searchContent;
linkDatas = linkDatas.where((linkData) {
if (searchContent.isNotEmpty &&
!linkData.matchesSearchToken(
RegExp(searchContent, caseSensitive: false),
)) {
return false;
}
linkDatas =
linkDatas.where((linkData) {
if (searchContent.isNotEmpty &&
!linkData.matchesSearchToken(
RegExp(searchContent, caseSensitive: false),
)) {
return false;
}

if (!((linkData.os.contains(PlatformOS.android) &&
displayOptions.filters.contains(FilterOption.android)) ||
(linkData.os.contains(PlatformOS.ios) &&
displayOptions.filters.contains(FilterOption.ios)))) {
return false;
}
if (!((linkData.os.contains(PlatformOS.android) &&
displayOptions.filters.contains(FilterOption.android)) ||
(linkData.os.contains(PlatformOS.ios) &&
displayOptions.filters.contains(FilterOption.ios)))) {
return false;
}

if (!((linkData.domainErrors.isNotEmpty &&
displayOptions.filters.contains(
FilterOption.failedDomainCheck,
)) ||
(linkData.pathErrors.isNotEmpty &&
displayOptions.filters.contains(
FilterOption.failedPathCheck,
)) ||
(linkData.domainErrors.isEmpty &&
linkData.pathErrors.isEmpty &&
displayOptions.filters.contains(FilterOption.noIssue)))) {
return false;
}
if (!((linkData.domainErrors.isNotEmpty &&
displayOptions.filters.contains(
FilterOption.failedDomainCheck,
)) ||
(linkData.pathErrors.isNotEmpty &&
displayOptions.filters.contains(
FilterOption.failedPathCheck,
)) ||
(linkData.domainErrors.isEmpty &&
linkData.pathErrors.isEmpty &&
displayOptions.filters.contains(FilterOption.noIssue)))) {
return false;
}

return true;
}).toList();
return true;
}).toList();

return linkDatas;
}
Expand Down

0 comments on commit 79cc745

Please sign in to comment.