fix(imap): sometimes the folder name does not have the delimiter

Alinto · Dec 20, 2023 · 1160846 · 1160846
1 parent cf99999
commit 1160846
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/sope-mime/NGImap4/NGImap4Client.m b/sope-mime/NGImap4/NGImap4Client.m
@@ -285,6 +285,10 @@ - (BOOL)isEqualToClient:(NGImap4Client *)_obj {
 }
 
 - (NSString *)delimiter {
+  if (self->delimiter == nil) {
+    [self list:@"" pattern:@""];
+  }
+
   return self->delimiter;
 }
 

diff --git a/sope-mime/NGImap4/NGImap4Connection.m b/sope-mime/NGImap4/NGImap4Connection.m
@@ -364,10 +364,17 @@ - (NSString *)imap4FolderNameForURL:(NSURL *)_url removeFileName:(BOOL)_delfn {
   if (_delfn) folderName = [folderName stringByDeletingLastPathComponent];
 
   if ([[[self client] delimiter] isEqualToString:@"/"])
+    if (debugKeys) {
+      [self logWithFormat: @"imap4FolderNameForURL: %@ became %@", _url, folderName];
+    }
     return folderName;
 
   names = [folderName componentsSeparatedByString: @"/"];
-  return [names componentsJoinedByString: [[self client] delimiter]];
+  folderName = [names componentsJoinedByString: [[self client] delimiter]];
+  if (debugKeys) {
+      [self logWithFormat: @"imap4FolderNameForURL: %@ became %@", _url, folderName];
+  }
+  return folderName;
 }
 - (NSString *)imap4FolderNameForURL:(NSURL *)_url {
   return [self imap4FolderNameForURL:_url removeFileName:NO];

diff --git a/sope-mime/NGImap4/NGImap4Context.m b/sope-mime/NGImap4/NGImap4Context.m
@@ -589,10 +589,8 @@ - (NSString *)draftsFolderName {
 }
 
 - (void)initializeSentFolder {
-  if ((self->sentFolder = [self _getFolderWithName:
-                                [self sentFolderName]]) == nil)
-    self->sentFolder = [self _getFolderWithName:
-                             [self sentFolderName]];
+  if ((self->sentFolder = [self _getFolderWithName: [self sentFolderName]]) == nil)
+    self->sentFolder = [self _getFolderWithName: [self sentFolderName]];
   if (self->sentFolder == nil)
     NSLog(@"WARNING[%s]: Couldn't find/create sentFolder", __PRETTY_FUNCTION__);
 }