From 1f8dc1292924672489a4a1c76f557a9f0bc65662 Mon Sep 17 00:00:00 2001
From: Hivert Quentin <quentin.hivert.fr@gmail.com>
Date: Mon, 31 Mar 2025 18:01:10 +0200
Subject: [PATCH] fix(folder): fix folders sorting for special folders

---
 UI/MailerUI/UIxMailAccountActions.m | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 000a9dd52..c470d99e7 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -62,7 +62,7 @@
 @implementation UIxMailAccountActions
 
 - (NSArray *)sortChildrenRecursively: (NSArray *)children {
-    NSInteger i, j;
+    NSInteger i, j, nbSpecial;
     NSMutableArray *sortedArray;
     NSArray *unsortedChildren, *sortedChildren;
     NSDictionary *child;
@@ -75,15 +75,18 @@
 
     sortedArray = [NSMutableArray array];
 
+    nbSpecial = 0;
     for (child in children) {
         unsortedChildren = [child objectForKey:@"children"];
         sortedChildren = [self sortChildrenRecursively:unsortedChildren];
         mutableChild = [child mutableCopy];
         [mutableChild setObject:sortedChildren forKey:@"children"];
         [sortedArray addObject:mutableChild];
+        if(![[mutableChild objectForKey:@"type"] isEqualToString: @"folder"])
+          nbSpecial++;
     }
 
-    for (i = 0; i < [sortedArray count] - 1; i++) {
+    for (i = nbSpecial; i < [sortedArray count] - 1; i++) {
         for (j = i + 1; j < [sortedArray count]; j++) {
             name1 = [[sortedArray objectAtIndex:i] objectForKey:@"name"];
             name2 = [[sortedArray objectAtIndex:j] objectForKey:@"name"];