Просмотр исходного кода

restrict member list to verified ones during verified group creation

cyberta 5 лет назад
Родитель
Сommit
4d3bc3f0a4

+ 6 - 2
deltachat-ios/Controller/GroupMembersViewController.swift

@@ -2,6 +2,7 @@ import UIKit
 
 class NewGroupAddMembersViewController: GroupMembersViewController {
     weak var coordinator: NewGroupAddMembersCoordinator?
+    let dcContext: DcContext;
 
     var onMembersSelected: ((Set<Int>) -> Void)?
     let isVerifiedGroup: Bool
@@ -16,7 +17,8 @@ class NewGroupAddMembersViewController: GroupMembersViewController {
        return button
    }()
 
-    init(preselected: Set<Int>, isVerified: Bool) {
+    init(dcContext: DcContext, preselected: Set<Int>, isVerified: Bool) {
+        self.dcContext = dcContext
         isVerifiedGroup = isVerified
         super.init()
         selectedContactIds = preselected
@@ -31,7 +33,9 @@ class NewGroupAddMembersViewController: GroupMembersViewController {
         title = String.localized("group_add_members")
         navigationItem.rightBarButtonItem = doneButton
         navigationItem.leftBarButtonItem = cancelButton
-        contactIds = Utils.getContactIds()
+        contactIds = isVerifiedGroup ?
+            dcContext.getContacts(flags: DC_GCL_VERIFIED_ONLY) :
+            dcContext.getContacts(flags: 0)
     }
 
     override func viewWillAppear(_ animated: Bool) {

+ 3 - 1
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -518,7 +518,9 @@ class NewGroupCoordinator: Coordinator {
     }
 
     func showAddMembers(preselectedMembers: Set<Int>, isVerified: Bool) {
-        let newGroupController = NewGroupAddMembersViewController(preselected: preselectedMembers, isVerified: isVerified)
+        let newGroupController = NewGroupAddMembersViewController(dcContext: dcContext,
+                                                                  preselected: preselectedMembers,
+                                                                  isVerified: isVerified)
         let coordinator = NewGroupAddMembersCoordinator(dcContext: dcContext, navigationController: navigationController)
         childCoordinators.append(coordinator)
         newGroupController.coordinator = coordinator