From 7fad3100b2d2e46975244771600d9d78c6c2dc2e Mon Sep 17 00:00:00 2001
From: Juan Gilsanz Polo <juangilsanz@gmail.com>
Date: Mon, 17 Oct 2022 01:16:12 +0200
Subject: [PATCH] Fixed more issues

---
 lib/models/filtering.dart        | 4 ++--
 lib/models/filtering_status.dart | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/models/filtering.dart b/lib/models/filtering.dart
index 3935f17..643dfab 100644
--- a/lib/models/filtering.dart
+++ b/lib/models/filtering.dart
@@ -70,7 +70,7 @@ class Filter {
   factory Filter.fromJson(Map<String, dynamic> json) => Filter(
     url: json["url"],
     name: json["name"],
-    lastUpdated: json["last_updated"] == null ? null : DateTime.parse(json["last_updated"]),
+    lastUpdated: json["last_updated"] != '' ? DateTime.parse(json["last_updated"]) : null,
     id: json["id"],
     rulesCount: json["rules_count"],
     enabled: json["enabled"],
@@ -79,7 +79,7 @@ class Filter {
   Map<String, dynamic> toJson() => {
     "url": url,
     "name": name,
-    "last_updated": lastUpdated == null ? null : lastUpdated!.toIso8601String(),
+    "last_updated": lastUpdated != null ? lastUpdated!.toIso8601String() : null,
     "id": id,
     "rules_count": rulesCount,
     "enabled": enabled,
diff --git a/lib/models/filtering_status.dart b/lib/models/filtering_status.dart
index 0407cdd..355d124 100644
--- a/lib/models/filtering_status.dart
+++ b/lib/models/filtering_status.dart
@@ -21,8 +21,8 @@ class FilteringStatus {
 
   factory FilteringStatus.fromJson(Map<String, dynamic> json) => FilteringStatus(
     filters: List<Filter>.from(json["filters"].map((x) => Filter.fromJson(x))),
-    whitelistFilters: List<Filter>.from(json["whitelist_filters"].map((x) => Filter.fromJson(x))),
-    userRules: List<String>.from(json["user_rules"].map((x) => x)),
+    whitelistFilters: json["whitelist_filters"] != null ? List<Filter>.from(json["whitelist_filters"].map((x) => Filter.fromJson(x))) : [],
+    userRules: json["user_rules"] != null ? List<String>.from(json["user_rules"].map((x) => x)) : [],
     interval: json["interval"],
     enabled: json["enabled"],
   );
@@ -56,7 +56,7 @@ class Filter {
   factory Filter.fromJson(Map<String, dynamic> json) => Filter(
     url: json["url"],
     name: json["name"],
-    lastUpdated: json["last_updated"] == null ? null : DateTime.parse(json["last_updated"]),
+    lastUpdated: json["last_updated"] != '' ? DateTime.parse(json["last_updated"]) : null,
     id: json["id"],
     rulesCount: json["rules_count"],
     enabled: json["enabled"],
@@ -65,7 +65,7 @@ class Filter {
     Map<String, dynamic> toJson() => {
         "url": url,
         "name": name,
-        "last_updated": lastUpdated == null ? null : lastUpdated!.toIso8601String(),
+        "last_updated": lastUpdated != null ? lastUpdated!.toIso8601String() : null,
         "id": id,
         "rules_count": rulesCount,
         "enabled": enabled,