Browse Source

Merge pull request #1172 from deltachat/search_verified_contacts

search only verified contacts when adding new members to verified groups
cyBerta 4 years ago
parent
commit
07ceed4be7

+ 6 - 0
deltachat-ios/Controller/AddGroupMembersViewController.swift

@@ -157,4 +157,10 @@ class AddGroupMembersViewController: GroupMembersViewController {
         }
         navigationController?.pushViewController(newContactController, animated: true)
     }
+    
+    // MARK: - search
+    override open func filterContactIds(flags: Int32, queryString: String) -> [Int] {
+        let flags = self.isVerifiedGroup ? DC_GCL_VERIFIED_ONLY : DC_GCL_ADD_SELF
+        return dcContext.getContacts(flags: flags, queryString: queryString)
+    }
 }

+ 5 - 1
deltachat-ios/Controller/GroupMembersViewController.swift

@@ -49,6 +49,10 @@ class GroupMembersViewController: UITableViewController {
     open var searchText: String? {
         return searchController.searchBar.text
     }
+    
+    open func filterContactIds(flags: Int32, queryString: String) -> [Int] {
+        return dcContext.getContacts(flags: DC_GCL_ADD_SELF, queryString: searchText)
+    }
 
     // MARK: - subview configuration
     private lazy var searchController: UISearchController = {
@@ -161,7 +165,7 @@ extension GroupMembersViewController: UISearchResultsUpdating {
     }
 
     private func filterContentForSearchText(_ searchText: String, scope _: String = String.localized("pref_show_emails_all")) {
-        filteredContactIds = dcContext.getContacts(flags: DC_GCL_ADD_SELF, queryString: searchText)
+        filteredContactIds = filterContactIds(flags: DC_GCL_ADD_SELF, queryString: searchText)
         tableView.reloadData()
         tableView.scrollToTop()