Prevent memory leaks on ReaderStreamViewController dismiss (#21015)

wordpress-mobile · Jul 7, 2023 · 2379ae1 · 2379ae1
2 parents 4477598 + 19c7682
commit 2379ae1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderListStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/ReaderListStreamHeader.swift
@@ -7,7 +7,7 @@ import WordPressShared.WPStyleGuide
     @IBOutlet fileprivate weak var detailLabel: UILabel!
 
     // Required by ReaderStreamHeader protocol.
-    open var delegate: ReaderStreamHeaderDelegate?
+    open weak var delegate: ReaderStreamHeaderDelegate?
 
 
     // MARK: - Lifecycle Methods

diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderRecommendedSiteCardCell.swift b/WordPress/Classes/ViewRelated/Reader/ReaderRecommendedSiteCardCell.swift
@@ -9,7 +9,7 @@ class ReaderRecommendedSiteCardCell: UITableViewCell {
     @IBOutlet weak var descriptionLabel: UILabel!
     @IBOutlet weak var infoTrailingConstraint: NSLayoutConstraint!
 
-    var delegate: ReaderRecommendedSitesCardCellDelegate?
+    weak var delegate: ReaderRecommendedSitesCardCellDelegate?
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -110,6 +110,6 @@ class ReaderRecommendedSiteCardCell: UITableViewCell {
     }
 }
 
-protocol ReaderRecommendedSitesCardCellDelegate {
+protocol ReaderRecommendedSitesCardCellDelegate: AnyObject {
     func handleFollowActionForCell(_ cell: ReaderRecommendedSiteCardCell)
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderSearchSuggestionsViewController.swift b/WordPress/Classes/ViewRelated/Reader/ReaderSearchSuggestionsViewController.swift
@@ -5,7 +5,7 @@ import WordPressShared
 /// Defines methods that a delegate should implement for clearing suggestions
 /// and for responding to a selected suggestion.
 ///
-protocol ReaderSearchSuggestionsDelegate {
+protocol ReaderSearchSuggestionsDelegate: AnyObject {
     func searchSuggestionsController(_ controller: ReaderSearchSuggestionsViewController, selectedItem: String)
 }
 
@@ -28,7 +28,7 @@ class ReaderSearchSuggestionsViewController: UIViewController {
     }
 
     @objc var tableViewHandler: WPTableViewHandler!
-    var delegate: ReaderSearchSuggestionsDelegate?
+    weak var delegate: ReaderSearchSuggestionsDelegate?
     @objc let cellIdentifier = "CellIdentifier"
     @objc let rowAndButtonHeight = CGFloat(44.0)
 

diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderSiteStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/ReaderSiteStreamHeader.swift
@@ -36,7 +36,7 @@ fileprivate func > <T: Comparable>(lhs: T?, rhs: T?) -> Bool {
     @IBOutlet fileprivate weak var descriptionLabel: UILabel!
     @IBOutlet fileprivate weak var descriptionLabelTopConstraint: NSLayoutConstraint!
 
-    open var delegate: ReaderStreamHeaderDelegate?
+    open weak var delegate: ReaderStreamHeaderDelegate?
     fileprivate var defaultBlavatar = "blavatar-default"
 
     // MARK: - Lifecycle Methods

diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/ReaderStreamHeader.swift
@@ -1,11 +1,11 @@
 import Foundation
 
-public protocol ReaderStreamHeaderDelegate: NSObjectProtocol {
+@objc public protocol ReaderStreamHeaderDelegate {
     func handleFollowActionForHeader(_ header: ReaderStreamHeader, completion: @escaping () -> Void)
 }
 
-public protocol ReaderStreamHeader: NSObjectProtocol {
-    var delegate: ReaderStreamHeaderDelegate? {get set}
+@objc public protocol ReaderStreamHeader {
+    weak var delegate: ReaderStreamHeaderDelegate? {get set}
     func enableLoggedInFeatures(_ enable: Bool)
     func configureHeader(_ topic: ReaderAbstractTopic)
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift
@@ -5,7 +5,7 @@ import WordPressShared
     @IBOutlet fileprivate weak var titleLabel: UILabel!
     @IBOutlet fileprivate weak var followButton: UIButton!
 
-    open var delegate: ReaderStreamHeaderDelegate?
+    open weak var delegate: ReaderStreamHeaderDelegate?
 
     // MARK: - Lifecycle Methods
     open override func awakeFromNib() {