Преглед на файлове

Merge pull request #357 from deltachat/tweak_member_list_screens

Tweak member list screens
björn petersen преди 5 години
родител
ревизия
4ab62c86e7
променени са 2 файла, в които са добавени 4 реда и са изтрити 6 реда
  1. 3 4
      deltachat-ios/Controller/GroupMembersViewController.swift
  2. 1 2
      deltachat-ios/Controller/GroupNameController.swift

+ 3 - 4
deltachat-ios/Controller/GroupMembersViewController.swift

@@ -147,10 +147,9 @@ class AddGroupMembersViewController: GroupMembersViewController {
     }
 
     func loadMemberCandidates() -> [Int] {
-        var contactIds = Set(Utils.getContactIds()) // turn into set to speed up search
-        for member in chatMemberIds {
-            contactIds.remove(member)
-        }
+        var contactIds = Utils.getContactIds()
+        let memberSet = Set(chatMemberIds)
+        contactIds.removeAll(where: { memberSet.contains($0)})
         return Array(contactIds)
     }
 

+ 1 - 2
deltachat-ios/Controller/GroupNameController.swift

@@ -38,8 +38,7 @@ class GroupNameController: UITableViewController {
             if success == 1 {
                 logger.info("successfully added \(contactId) to group \(groupName)")
             } else {
-                // FIXME:
-                fatalError("failed to add \(contactId) to group \(groupName)")
+                logger.error("failed to add \(contactId) to group \(groupName)")
             }
         }