Try to fix UIKit inconsistency exception in insertOrMoveContact

The error is: attempt to insert row 0 into section 1, but there are only 0
rows in section 1 after the update

Author: tmolitor-stud-tu

Monal/Classes/ActiveChatsViewController.m

@@ -335,16 +335,6 @@ -(void) handleDeviceRotation
 
 -(void) refreshDisplay
 {
-    size_t unpinnedConCntBefore = self.unpinnedContacts.count;
-    size_t pinnedConCntBefore = self.pinnedContacts.count;
-    NSMutableArray<MLContact*>* newUnpinnedContacts = [[DataLayer sharedInstance] activeContactsWithPinned:NO];
-    NSMutableArray<MLContact*>* newPinnedContacts = [[DataLayer sharedInstance] activeContactsWithPinned:YES];
-    if(!newUnpinnedContacts || ! newPinnedContacts)
-        return;
-
-    int unpinnedCntDiff = (int)unpinnedConCntBefore - (int)newUnpinnedContacts.count;
-    int pinnedCntDiff = (int)pinnedConCntBefore - (int)newPinnedContacts.count;
-
     void (^resizeSections)(UITableView*, size_t, int) = ^void(UITableView* table, size_t section, int diff){
         if(diff > 0)
         {
@@ -367,6 +357,16 @@ -(void) refreshDisplay
     };
 
     dispatch_async(dispatch_get_main_queue(), ^{
+        size_t unpinnedConCntBefore = self.unpinnedContacts.count;
+        size_t pinnedConCntBefore = self.pinnedContacts.count;
+        NSMutableArray<MLContact*>* newUnpinnedContacts = [[DataLayer sharedInstance] activeContactsWithPinned:NO];
+        NSMutableArray<MLContact*>* newPinnedContacts = [[DataLayer sharedInstance] activeContactsWithPinned:YES];
+        if(!newUnpinnedContacts || !newPinnedContacts)
+            return;
+
+        int unpinnedCntDiff = (int)unpinnedConCntBefore - (int)newUnpinnedContacts.count;
+        int pinnedCntDiff = (int)pinnedConCntBefore - (int)newPinnedContacts.count;
+        
         //make sure we don't display a chat view for a disabled account
         if([MLNotificationManager sharedInstance].currentContact != nil)
         {
@@ -508,7 +508,15 @@ -(void) handleNewMessage:(NSNotification*) notification
 -(void) insertOrMoveContact:(MLContact*) contact completion:(void (^ _Nullable)(BOOL finished)) completion
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self.chatListTable performBatchUpdates:^{
+        if(self.chatListTable.hasUncommittedUpdates)
+        {
+            if(completion) completion(NO);
+            return;
+        }
+        [CATransaction begin];
+        [UIView performWithoutAnimation:^{
+            [self.chatListTable beginUpdates];
+            
             __block NSIndexPath* indexPath = nil;
             for(size_t section = pinnedChats; section < activeChatsViewControllerSectionCnt && !indexPath; section++) {
                 NSMutableArray* curContactArray = [self getChatArrayForSection:section];
@@ -554,11 +562,16 @@ -(void) insertOrMoveContact:(MLContact*) contact completion:(void (^ _Nullable)(
                 [self.chatListTable insertRowsAtIndexPaths:@[insertAtPath] withRowAnimation:UITableViewRowAnimationRight];
                 //make sure to fully refresh to remove the empty dataset (yes this will trigger on first chat pinning, too, but that does no harm)
                 if(oldCount == 0)
-                    [self refreshDisplay];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [self refreshDisplay];
+                    });
             }
-        } completion:^(BOOL finished) {
-            if(completion) completion(finished);
+            
+            [self.chatListTable endUpdates];
         }];
+        [CATransaction commit];
+        [self.chatListTable reloadEmptyDataSet];
+        if(completion) completion(YES);
     });
 }