From 3c3cb376e216e2ffbb9d9665b96f75118f244849 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Thu, 9 Jun 2022 19:15:53 +0300
Subject: [PATCH] Fix null check on DNS check

---
 .../cubit/server_installation/server_installation_cubit.dart  | 2 +-
 .../server_installation/server_installation_repository.dart   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart
index 3f156e4b..622abaf7 100644
--- a/lib/logic/cubit/server_installation/server_installation_cubit.dart
+++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart
@@ -159,7 +159,7 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
     final Map<String, bool> matches = await repository.isDnsAddressesMatch(
       domainName,
       ip4,
-      dataState.dnsMatches,
+      dataState.dnsMatches ?? {},
     );
 
     if (matches.values.every((final bool value) => value)) {
diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart
index 891c55bb..5d4db8fe 100644
--- a/lib/logic/cubit/server_installation/server_installation_repository.dart
+++ b/lib/logic/cubit/server_installation/server_installation_repository.dart
@@ -153,7 +153,7 @@ class ServerInstallationRepository {
   Future<Map<String, bool>> isDnsAddressesMatch(
     final String? domainName,
     final String? ip4,
-    final Map<String, bool>? skippedMatches,
+    final Map<String, bool> skippedMatches,
   ) async {
     final List<String> addresses = <String>[
       '$domainName',
@@ -166,7 +166,7 @@ class ServerInstallationRepository {
     final Map<String, bool> matches = <String, bool>{};
 
     for (final String address in addresses) {
-      if (skippedMatches![address] ?? false) {
+      if (skippedMatches[address] ?? false) {
         matches[address] = true;
         continue;
       }