Merge pull request #701 from deltachat/no-unowned

replace potentially harmful 'unowned' by 'weak'

DcCore/DcCore/DC/Wrapper.swift

@@ -675,7 +675,7 @@ public class DcChat {
         return DcUtils.copyAndFreeArray(inputArray: dc_get_chat_contacts(DcContext.shared.contextPointer, UInt32(id)))
     }
 
-    public lazy var profileImage: UIImage? = { [unowned self] in
+    public lazy var profileImage: UIImage? = { [weak self] in
         guard let cString = dc_chat_get_profile_image(chatPointer) else { return nil }
         let filename = String(cString: cString)
         dc_str_unref(cString)
@@ -830,7 +830,7 @@ public class DcMsg {
         return nil
     }
 
-    public lazy var image: UIImage? = { [unowned self] in
+    public lazy var image: UIImage? = { [weak self] in
         let filetype = dc_msg_get_viewtype(messagePointer)
         if let path = fileURL, filetype == DC_MSG_IMAGE {
             if path.isFileURL {
@@ -1019,7 +1019,7 @@ public class DcContact {
         return dc_contact_is_blocked(contactPointer) == 1
     }
 
-    public lazy var profileImage: UIImage? = { [unowned self] in
+    public lazy var profileImage: UIImage? = { [weak self] in
         guard let cString = dc_contact_get_profile_image(contactPointer) else { return nil }
         let filename = String(cString: cString)
         dc_str_unref(cString)

Pods/ReachabilitySwift/Sources/Reachability.swift

@@ -223,7 +223,8 @@ public extension Reachability {
 fileprivate extension Reachability {
 
     func setReachabilityFlags() throws {
-        try reachabilitySerialQueue.sync { [unowned self] in
+        try reachabilitySerialQueue.sync { [weak self] in
+            guard let self = self else { return }
             var flags = SCNetworkReachabilityFlags()
             if !SCNetworkReachabilityGetFlags(self.reachabilityRef, &flags) {
                 self.stopNotifier()

deltachat-ios/Controller/AccountSetupController.swift

@@ -97,8 +97,8 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
     private lazy var providerInfoCell: ProviderInfoCell = {
         let cell = ProviderInfoCell()
         cell.onInfoButtonPressed = {
-            [unowned self] in
-            self.handleProviderInfoButton()
+            [weak self] in
+            self?.handleProviderInfoButton()
         }
         return cell
     }()
@@ -612,7 +612,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
              let oAuthAlertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
              let confirm = UIAlertAction(title: "Confirm", style: .default, handler: {
-                 [unowned self] _ in
+                 [weak self] _ in // TODO: refactor usages of `self` to `self?` when this code is used again
                  let nc = NotificationCenter.default
                  self.oauth2Observer = nc.addObserver(self, selector: #selector(self.oauthLoginApproved), name: NSNotification.Name("oauthLoginApproved"), object: nil)
                  self.launchOAuthBrowserWindow(url: url)

deltachat-ios/Controller/ChatListController.swift

@@ -232,20 +232,20 @@ class ChatListController: UITableViewController {
         }
         let archiveActionTitle: String = String.localized(viewModel.isArchive ? "unarchive" : "archive")
 
-        let archiveAction = UITableViewRowAction(style: .destructive, title: archiveActionTitle) { [unowned self] _, _ in
-            self.viewModel.archiveChatToggle(chatId: chatId)
+        let archiveAction = UITableViewRowAction(style: .destructive, title: archiveActionTitle) { [weak self] _, _ in
+            self?.viewModel.archiveChatToggle(chatId: chatId)
         }
         archiveAction.backgroundColor = UIColor.lightGray
 
         let chat = dcContext.getChat(chatId: chatId)
         let pinned = chat.visibility==DC_CHAT_VISIBILITY_PINNED
-        let pinAction = UITableViewRowAction(style: .destructive, title: String.localized(pinned ? "unpin" : "pin")) { [unowned self] _, _ in
-            self.viewModel.pinChatToggle(chatId: chat.id)
+        let pinAction = UITableViewRowAction(style: .destructive, title: String.localized(pinned ? "unpin" : "pin")) { [weak self] _, _ in
+            self?.viewModel.pinChatToggle(chatId: chat.id)
         }
         pinAction.backgroundColor = UIColor.systemGreen
 
-        let deleteAction = UITableViewRowAction(style: .normal, title: String.localized("delete")) { [unowned self] _, _ in
-            self.showDeleteChatConfirmationAlert(chatId: chatId)
+        let deleteAction = UITableViewRowAction(style: .normal, title: String.localized("delete")) { [weak self] _, _ in
+            self?.showDeleteChatConfirmationAlert(chatId: chatId)
         }
         deleteAction.backgroundColor = UIColor.systemRed
 

deltachat-ios/Controller/EditSettingsController.swift

@@ -62,8 +62,8 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         title = String.localized("pref_profile_info_headline")
-        avatarSelectionCell.onAvatarTapped = { [unowned self] in
-            self.onAvatarTapped()
+        avatarSelectionCell.onAvatarTapped = { [weak self] in
+            self?.onAvatarTapped()
         }
     }
 

deltachat-ios/Controller/GroupChatDetailViewController.swift

@@ -401,8 +401,8 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
             !isMemberManagementRow(row: row) &&
             getGroupMemberIdFor(row) != currentUser.id {
             // action set for members except for current user
-            let delete = UITableViewRowAction(style: .destructive, title: String.localized("remove_desktop")) { [unowned self] _, indexPath in
-
+            let delete = UITableViewRowAction(style: .destructive, title: String.localized("remove_desktop")) { [weak self] _, indexPath in
+                guard let self = self else { return }
                 let contact = self.getGroupMember(at: row)
                 let title = String.localizedStringWithFormat(String.localized("ask_remove_members"), contact.nameNAddr)
                 let alert = UIAlertController(title: title, message: nil, preferredStyle: .safeActionSheet)
@@ -414,8 +414,7 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
                 }))
                 alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
                 self.present(alert, animated: true, completion: nil)
-
- }
+            }
             delete.backgroundColor = UIColor.red
             return [delete]
         }

deltachat-ios/Controller/HelpViewController.swift

@@ -40,10 +40,10 @@ class HelpViewController: UIViewController, WKNavigationDelegate {
     }
 
     override func viewWillAppear(_ animated: Bool) {
-        loadHtmlContent { [unowned self] url in
+        loadHtmlContent { [weak self] url in
             // return to main thread
             DispatchQueue.main.async {
-                self.webView.loadFileURL(url, allowingReadAccessTo: url)
+                self?.webView.loadFileURL(url, allowingReadAccessTo: url)
             }
         }
     }

deltachat-ios/Controller/NewChatViewController.swift

@@ -228,7 +228,8 @@ class NewChatViewController: UITableViewController {
         if indexPath.section == sectionContacts {
             let contactId = contactIdByRow(indexPath.row)
 
-            let edit = UITableViewRowAction(style: .normal, title: String.localized("info")) { [unowned self] _, _ in
+            let edit = UITableViewRowAction(style: .normal, title: String.localized("info")) { [weak self] _, _ in
+                guard let self = self else { return }
                 if self.searchController.isActive {
                     self.searchController.dismiss(animated: false) {
                         self.showContactDetail(contactId: contactId)
@@ -238,7 +239,8 @@ class NewChatViewController: UITableViewController {
                 }
             }
 
-            let delete = UITableViewRowAction(style: .destructive, title: String.localized("delete")) { [unowned self] _, _ in
+            let delete = UITableViewRowAction(style: .destructive, title: String.localized("delete")) { [weak self] _, _ in
+                guard let self = self else { return }
                 let contactId = self.contactIdByRow(indexPath.row)
                 self.askToDeleteContact(contactId: contactId, context: self.dcContext)
             }

deltachat-ios/Controller/NewGroupController.swift

@@ -254,8 +254,10 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
 
         //swipe by delete
         if section == sectionGroupMembers, groupContactIds[row] != DC_CONTACT_ID_SELF {
-            let delete = UITableViewRowAction(style: .destructive, title: String.localized("remove_desktop")) { [unowned self] _, indexPath in
-                if self.groupChatId != 0, self.dcContext.getChat(chatId: self.groupChatId).contactIds.contains(self.groupContactIds[row]) {
+            let delete = UITableViewRowAction(style: .destructive, title: String.localized("remove_desktop")) { [weak self] _, indexPath in
+                guard let self = self else { return }
+                if self.groupChatId != 0,
+                    self.dcContext.getChat(chatId: self.groupChatId).contactIds.contains(self.groupContactIds[row]) {
                     let success = self.dcContext.removeContactFromChat(chatId: self.groupChatId, contactId: self.groupContactIds[row])
                     if success {
                         self.removeGroupContactFromList(at: indexPath)
@@ -356,8 +358,8 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
 
     private func showQrCodeInvite(chatId: Int) {
         let qrInviteCodeController = QrInviteViewController(dcContext: dcContext, chatId: chatId)
-        qrInviteCodeController.onDismissed = { [unowned self] in
-            self.updateGroupContactIdsOnQRCodeInvite()
+        qrInviteCodeController.onDismissed = { [weak self] in
+            self?.updateGroupContactIdsOnQRCodeInvite()
         }
         navigationController?.pushViewController(qrInviteCodeController, animated: true)
     }
@@ -365,7 +367,8 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
     private func showAddMembers(preselectedMembers: Set<Int>, isVerified: Bool) {
         let newGroupController = NewGroupAddMembersViewController(preselected: preselectedMembers,
                                                                   isVerified: isVerified)
-        newGroupController.onMembersSelected = { [unowned self] (memberIds: Set<Int>) -> Void in
+        newGroupController.onMembersSelected = { [weak self] (memberIds: Set<Int>) -> Void in
+            guard let self = self else { return }
             self.updateGroupContactIdsOnListSelection(memberIds)
             self.navigationController?.popViewController(animated: true)
         }

deltachat-ios/Controller/ProfileInfoViewController.swift

@@ -35,8 +35,8 @@ class ProfileInfoViewController: UITableViewController {
         let cell =  TextFieldCell.makeNameCell()
         cell.placeholder = String.localized("pref_your_name")
         cell.setText(text: dcContext.displayname)
-        cell.onTextFieldChange = {[unowned self] textField in
-            self.displayName = textField.text
+        cell.onTextFieldChange = {[weak self] textField in
+            self?.displayName = textField.text
         }
         return cell
     }()

deltachat-ios/Controller/SettingsController.swift

@@ -410,8 +410,8 @@ internal final class SettingsViewController: UITableViewController {
             UserDefaults.standard.set(!locationStreaming, forKey: "location_streaming")
         }))
 
-        let logAction = UIAlertAction(title: String.localized("pref_view_log"), style: .default, handler: { [unowned self] _ in
-            self.showDebugToolkit()
+        let logAction = UIAlertAction(title: String.localized("pref_view_log"), style: .default, handler: { [weak self] _ in
+            self?.showDebugToolkit()
         })
         alert.addAction(logAction)
         alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))

deltachat-ios/Controller/WelcomeViewController.swift

@@ -14,17 +14,19 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
     private lazy var welcomeView: WelcomeContentView = {
         let view = WelcomeContentView()
-        view.onLogin = { [unowned self] in
+        view.onLogin = { [weak self] in
+            guard let self = self else { return }
             let accountSetupController = AccountSetupController(dcContext: self.dcContext, editView: false)
             accountSetupController.onLoginSuccess = {
-                [unowned self] in
+                [weak self] in
                 if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
                     appDelegate.appCoordinator.presentTabBarController()
                 }
             }
             self.navigationController?.pushViewController(accountSetupController, animated: true)
         }
-        view.onScanQRCode  = { [unowned self] in
+        view.onScanQRCode  = { [weak self] in
+            guard let self = self else { return }
             let qrReader = QrCodeReaderController()
             qrReader.delegate = self
             self.qrCodeReader = qrReader
@@ -41,14 +43,14 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
         self.dcContext = dcContext
         super.init(nibName: nil, bundle: nil)
         self.navigationItem.title = String.localized("welcome_desktop")
-        onProgressSuccess = { [unowned self] in
+        onProgressSuccess = { [weak self] in
             let profileInfoController = ProfileInfoViewController(context: dcContext)
             profileInfoController.onClose = {
                 if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
                     appDelegate.appCoordinator.presentTabBarController()
                 }
             }
-            self.navigationController?.setViewControllers([profileInfoController], animated: true)
+            self?.navigationController?.setViewControllers([profileInfoController], animated: true)
         }
     }
 
@@ -147,7 +149,8 @@ extension WelcomeViewController: QrCodeReaderDelegate {
         let okAction = UIAlertAction(
             title: String.localized("ok"),
             style: .default,
-            handler: { [unowned self] _ in
+            handler: { [weak self] _ in
+                guard let self = self else { return }
                 self.dismissQRReader()
                 self.createAccountFromQRCode(qrCode: qrCode)
             }
@@ -156,8 +159,8 @@ extension WelcomeViewController: QrCodeReaderDelegate {
         let qrCancelAction = UIAlertAction(
             title: String.localized("cancel"),
             style: .cancel,
-            handler: { [unowned self] _ in
-                self.dismissQRReader()
+            handler: { [weak self] _ in
+                self?.dismissQRReader()
             }
         )
 
@@ -172,8 +175,8 @@ extension WelcomeViewController: QrCodeReaderDelegate {
         let okAction = UIAlertAction(
             title: String.localized("ok"),
             style: .default,
-            handler: { [unowned self] _ in
-                self.qrCodeReader?.startSession()
+            handler: { [weak self] _ in
+                self?.qrCodeReader?.startSession()
             }
         )
         alert.addAction(okAction)

deltachat-ios/Handler/DeviceContactsHandler.swift

@@ -85,7 +85,8 @@ class DeviceContactsHandler {
         case .denied:
             contactListDelegate?.accessDenied()
         case .restricted, .notDetermined:
-            store.requestAccess(for: .contacts) { [unowned self] granted, _ in
+            store.requestAccess(for: .contacts) { [weak self] granted, _ in
+                guard let self = self else { return }
                 if granted {
                     DispatchQueue.main.async {
                         self.addContactsToCore()

deltachat-ios/Handler/HudHandler.swift

@@ -3,7 +3,7 @@ import UIKit
 
 class HudHandler {
     var backupHud: JGProgressHUD?
-    unowned var view: UIView
+    weak var view: UIView?
 
     init(parentView: UIView) {
         view = parentView
@@ -23,7 +23,9 @@ class HudHandler {
             hud.indicatorView = JGProgressHUDPieIndicatorView()
             hud.detailTextLabel.text = "0%"
             hud.textLabel.text = text
-            hud.show(in: self.view)
+            if let view = self.view {
+                hud.show(in: view)
+            }
             self.backupHud = hud
         }
     }