Browse Source

to avoid cyclic references, make callbacks given to child objects getting an unowned reference

B. Petersen 5 years ago
parent
commit
95895e7f94

+ 2 - 2
deltachat-ios/Controller/NewGroupController.swift

@@ -356,7 +356,7 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
 
     private func showQrCodeInvite(chatId: Int) {
         let qrInviteCodeController = QrInviteViewController(dcContext: dcContext, chatId: chatId)
-        qrInviteCodeController.onDismissed = {
+        qrInviteCodeController.onDismissed = { [unowned self] in
             self.updateGroupContactIdsOnQRCodeInvite()
         }
         navigationController?.pushViewController(qrInviteCodeController, animated: true)
@@ -365,7 +365,7 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
     private func showAddMembers(preselectedMembers: Set<Int>, isVerified: Bool) {
         let newGroupController = NewGroupAddMembersViewController(preselected: preselectedMembers,
                                                                   isVerified: isVerified)
-        newGroupController.onMembersSelected = {(memberIds: Set<Int>) -> Void in
+        newGroupController.onMembersSelected = { [unowned self] (memberIds: Set<Int>) -> Void in
             self.updateGroupContactIdsOnListSelection(memberIds)
             self.navigationController?.popViewController(animated: true)
         }

+ 1 - 1
deltachat-ios/Controller/WelcomeViewController.swift

@@ -41,7 +41,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
         self.dcContext = dcContext
         super.init(nibName: nil, bundle: nil)
         self.navigationItem.title = String.localized("welcome_desktop")
-        onProgressSuccess = {
+        onProgressSuccess = { [unowned self] in
             let profileInfoController = ProfileInfoViewController(context: dcContext)
             profileInfoController.onClose = {
                 if let appDelegate = UIApplication.shared.delegate as? AppDelegate {