feat(addressbook(web)): import vList from versit file

Alinto · May 18, 2022 · 51dc929 · 51dc929
1 parent e020a51
commit 51dc929
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 18 deletions.
diff --git a/UI/Contacts/UIxContactFolderActions.h b/UI/Contacts/UIxContactFolderActions.h
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2006-2021 Inverse inc.
+ Copyright (C) 2006-2022 Inverse inc.
 
  This file is part of SOGo
  
@@ -25,6 +25,7 @@
 #import <SOGoUI/UIxComponent.h>
 
 @class NSDictionary;
+@class NSMutableArray;
 @class NSString;
 
 @protocol SOGoContactObject;
@@ -35,7 +36,8 @@
 - (int) importVcardData: (NSString *) vcardData;
 - (BOOL) importVcard: (NGVCard *) card;
 - (BOOL) importVlist: (NGVList *) list;
-
+- (BOOL) importVcard: (NGVCard *) card
+            andLists: (NSMutableArray *) lists;
 @end
 
 #endif /* __UIxContactFolderActions_H__ */
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
@@ -338,29 +338,39 @@ - (int) importLdifData: (NSString *) ldifData
 
 - (int) importVcardData: (NSString *) vcardData
 {
+  NGVList *vList;
   NSAutoreleasePool *pool;
   NSArray *allCards;
-  int rc, count;
+  NSMutableArray *allLists;
+  int rc, count, i;
 
   rc = 0;
 
   pool = [[NSAutoreleasePool alloc] init];
   allCards = [NGVCard parseFromSource: vcardData];
+  allLists = [NSMutableArray array];
 
   count = [allCards count];
   if (allCards && count)
     {
-      int i;
+      for (i = 0; i < count; i++)
+	{
+          // Postpone importation of lists
+	  if ([self importVcard: [allCards objectAtIndex: i]
+                        andLists: allLists])
+            rc++;
+        }
+    }
 
+  // Import vLists
+  count = [allLists count];
+  if (count)
+    {
       for (i = 0; i < count; i++)
 	{
-	  if (![self importVcard: [allCards objectAtIndex: i]])
-	    {
-	      rc = 0;
-	      break;
-	    }
-	  else
-	    rc++;
+	  vList = [allLists objectAtIndex: i];
+          if ([self importVlist: vList])
+            rc++;
 	}
     }
 
@@ -371,31 +381,49 @@ - (int) importVcardData: (NSString *) vcardData
 
 - (BOOL) importVcard: (NGVCard *) card
 {
+  return [self importVcard: card
+                  andLists: nil];
+}
+
+- (BOOL) importVcard: (NGVCard *) card
+            andLists: (NSMutableArray *) lists
+{
+  BOOL rc;
   SOGoContactGCSFolder *folder;
   SOGoContactGCSEntry *contact;
+  NGVList *list;
   NSAutoreleasePool *pool;
   NSString *uid;
 
-  BOOL rc = NO;
+  rc = NO;
 
   if (card)
     {
       pool = [[NSAutoreleasePool alloc] init];
       folder = [self clientObject];
 
-      // TODO: shall we add .vcf as in [SOGoContactGCSEntry copyToFolder:]
       uid = [card uid];
       if (![uid length])
         {
+          // TODO: shall we add .vcf as in [SOGoContactGCSEntry copyToFolder:]
           uid = [folder globallyUniqueObjectId];
           [card setUid: uid];
         }
-      contact = [SOGoContactGCSEntry objectWithName: uid
+
+      if ([[card tag] isEqualToString: @"VLIST"])
+        {
+          list = [NGVList parseSingleFromSource: [card versitString]];
+          [lists addObject: list];
+        }
+      else
+        {
+          contact = [SOGoContactGCSEntry objectWithName: uid
                                         inContainer: folder];
-      [contact setIsNew: YES];
-      [contact saveComponent: card];
+          [contact setIsNew: YES];
+          [contact saveComponent: card];
+          rc = YES;
+        }
 
-      rc = YES;
       RELEASE(pool);
     }
 
@@ -416,8 +444,13 @@ - (BOOL) importVlist: (NGVList *) list
       pool = [[NSAutoreleasePool alloc] init];
       folder = [self clientObject];
 
-      // TODO: shall we add .vcf as in [SOGoContactGCSEntry copyToFolder:]
       uid = [list uid];
+      if (![uid length])
+        {
+          // TODO: shall we add .vcf as in [SOGoContactGCSEntry copyToFolder:]
+          uid = [folder globallyUniqueObjectId];
+          [list setUid: uid];
+        }
       contact = [SOGoContactGCSList objectWithName: uid
                                        inContainer: folder];
       [contact setIsNew: YES];