From 8f5f1a22ee1563c32a117d8b45491d198e35f80c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:28:42 +0530
Subject: [PATCH] [auth] Fix Aegis import without group

---
 auth/lib/ui/settings/data/import/aegis_import.dart | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/auth/lib/ui/settings/data/import/aegis_import.dart b/auth/lib/ui/settings/data/import/aegis_import.dart
index 2360adb723..cf2567ebe4 100644
--- a/auth/lib/ui/settings/data/import/aegis_import.dart
+++ b/auth/lib/ui/settings/data/import/aegis_import.dart
@@ -129,8 +129,10 @@ Future<int?> _processAegisExportFile(
   }
   final Map<String, String> groupIDToName = {};
   try {
-    for (var item in aegisDB?['groups']) {
-      groupIDToName[item['uuid']] = item['name'];
+    if (aegisDB?['groups'] != null) {
+      for (var item in aegisDB?['groups']) {
+        groupIDToName[item['uuid']] = item['name'];
+      }
     }
   } catch (e) {
     Logger("AegisImport").warning("Failed to parse groups", e);
@@ -149,9 +151,11 @@ Future<int?> _processAegisExportFile(
     var digits = item['info']['digits'];
 
     var counter = item['info']['counter'];
-    for (var group in item['groups']) {
-      if (groupIDToName.containsKey(group)) {
-        tags.add(groupIDToName[group]!);
+    if (item['groups'] != null) {
+      for (var group in item['groups']) {
+        if (groupIDToName.containsKey(group)) {
+          tags.add(groupIDToName[group]!);
+        }
       }
     }
     // Build the OTP URL