Fix memory leaks

wikimedia · Apr 5, 2023 · fc5c7a9 · fc5c7a9
1 parent c7b8e77
commit fc5c7a9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/Sources/Components/Components/Base/Component Base Classes/WKComponentHostingController.swift b/Sources/Components/Components/Base/Component Base Classes/WKComponentHostingController.swift
@@ -39,7 +39,7 @@ open class WKComponentHostingController<HostedView: View>: UIHostingController<H
 
 	private func subscribeToAppEnvironmentChanges() {
 		WKAppEnvironment.publisher
-			.sink(receiveValue: { _ in self.appEnvironmentDidChange() })
+			.sink(receiveValue: { [weak self] _ in self?.appEnvironmentDidChange() })
 			.store(in: &cancellables)
 	}
 

diff --git a/Sources/Components/Components/Base/Component Base Classes/WKComponentView.swift b/Sources/Components/Components/Base/Component Base Classes/WKComponentView.swift
@@ -36,7 +36,7 @@ public class WKComponentView: UIView {
 
 	private func subscribeToAppEnvironmentChanges() {
 		WKAppEnvironment.publisher
-			.sink(receiveValue: { _ in self.appEnvironmentDidChange() })
+			.sink(receiveValue: { [weak self] _ in self?.appEnvironmentDidChange() })
 			.store(in: &cancellables)
 	}
 

diff --git a/Sources/Components/Components/Base/Component Base Classes/WKComponentViewController.swift b/Sources/Components/Components/Base/Component Base Classes/WKComponentViewController.swift
@@ -34,7 +34,7 @@ open class WKComponentViewController: UIViewController {
 
 	private func subscribeToAppEnvironmentChanges() {
 		WKAppEnvironment.publisher
-			.sink(receiveValue: { _ in self.appEnvironmentDidChange() })
+			.sink(receiveValue: { [weak self] _ in self?.appEnvironmentDidChange() })
 			.store(in: &cancellables)
 	}
 

diff --git a/Sources/Components/Components/UIViewController Component/WKRandomPhotoViewController.swift b/Sources/Components/Components/UIViewController Component/WKRandomPhotoViewController.swift
@@ -35,10 +35,16 @@ public class WKRandomPhotoViewController: WKComponentViewController {
 
 	private func loadImage() {
 		customView.activityIndicator.startAnimating()
-		viewModel.loadImage(completion: { image in
+        let configuration = viewModel.configuration
+		viewModel.loadImage(completion: { [weak self] image in
 			DispatchQueue.main.async {
+
+                guard let self = self else {
+                    return
+                }
+
 				self.customView.activityIndicator.stopAnimating()
-				self.customView.update(configuration: self.viewModel.configuration, image: image)
+				self.customView.update(configuration: configuration, image: image)
 			}
 		})
 	}

diff --git a/Sources/Components/Components/UIViewController Component/WKRandomPhotoViewModel.swift b/Sources/Components/Components/UIViewController Component/WKRandomPhotoViewModel.swift
@@ -39,17 +39,17 @@ public class WKRandomPhotoViewModel {
 	public func loadImage(completion: @escaping (UIImage) -> Void) {
 		switch configuration {
 		case .cats:
-			let task = URLSession.shared.dataTask(with: Configuration.cats.api) { data, _, _ in
+			let task = URLSession.shared.dataTask(with: Configuration.cats.api) { [weak self] data, _, _ in
 
 				if let data = data, let cat = try? JSONDecoder().decode(Cat.self, from: data) {
-					self.fetchPhoto(cat.file, completion: completion)
+					self?.fetchPhoto(cat.file, completion: completion)
 				}
 			}
 			task.resume()
 		case .dogs:
-			let task = URLSession.shared.dataTask(with: Configuration.dogs.api) { data, _, _ in
+			let task = URLSession.shared.dataTask(with: Configuration.dogs.api) { [weak self] data, _, _ in
 				if let data = data, let dog = try? JSONDecoder().decode(Dog.self, from: data) {
-					self.fetchPhoto(dog.message, completion: completion)
+					self?.fetchPhoto(dog.message, completion: completion)
 				}
 			}
 			task.resume()