Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change scanningDelegate to a weak reference #21053

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Change scanningDelegate to a weak reference #21053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
256abf6
Change scanningDelegate to a weak reference
crazytonyli Jul 11, 2023
4fc9a02
Fix a retain cycle between RichTextView and its delegate
crazytonyli Jul 11, 2023
f210ed6
Use weak reference in a unit test too
crazytonyli Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/QR Login/Helpers/QRLoginCameraSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class QRLoginCameraSession: NSObject, QRCodeScanningSession {
return AVCaptureVideoPreviewLayer(session: session)
}

var scanningDelegate: QRCodeScanningDelegate?
weak var scanningDelegate: QRCodeScanningDelegate?

func configure() {
configureCamera()
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/QR Login/Helpers/QRLoginProtocols.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protocol QRCameraPermissionsHandler: CameraPermissionsHandler {
}

/// A delegate that handles when a code was scanned and whether its valid or not
protocol QRCodeScanningDelegate {
protocol QRCodeScanningDelegate: AnyObject {
func validLink(_ stringValue: String) -> Bool
func didScanURLString(_ urlString: String)
}
Expand Down
4 changes: 2 additions & 2 deletions WordPress/Classes/ViewRelated/Views/RichTextView/RichTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import UniformTypeIdentifiers


@objc open class RichTextView: UIView, UITextViewDelegate {
@objc open var dataSource: RichTextViewDataSource?
@objc open var delegate: RichTextViewDelegate?
@objc open weak var dataSource: RichTextViewDataSource?
@objc open weak var delegate: RichTextViewDelegate?


// MARK: - Initializers
Expand Down
2 changes: 1 addition & 1 deletion WordPress/WordPressTest/QRLogin/QRLoginScanningCoordinatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private class QRCodeScanningSessionMock: QRCodeScanningSession {
var hasCamera: Bool = true
var session: AVCaptureSession? = nil
var previewLayer: CALayer? = nil
var scanningDelegate: QRCodeScanningDelegate? = nil
weak var scanningDelegate: QRCodeScanningDelegate? = nil

var isConfigured: Bool = false
func configure() {
Expand Down