- bug fix memory leak

- add sanity check to ensure we are tracking address changes before we start the staking wizard
kukai-wallet · Jan 10, 2025 · bd9c981 · bd9c981
1 parent a4b7937
commit bd9c981
Show file tree

Hide file tree

Showing 23 changed files with 104 additions and 0 deletions.
diff --git a/Kukai Mobile/Modules/Account/AccountViewController.swift b/Kukai Mobile/Modules/Account/AccountViewController.swift
@@ -54,6 +54,11 @@ class AccountViewController: UIViewController, UITableViewDelegate, EstimatedTot
 		}.store(in: &bag)
 	}
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isPresentedForSelectingToken = (self.parent != nil && self.tabBarController == nil)

diff --git a/Kukai Mobile/Modules/Account/AccountViewModel.swift b/Kukai Mobile/Modules/Account/AccountViewModel.swift
@@ -125,6 +125,10 @@ class AccountViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift b/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift
@@ -62,6 +62,11 @@ class TokenDetailsViewController: UIViewController, UITableViewDelegate {
 		}
 	}
 
+	deinit {
+		cancellable = nil
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 

diff --git a/Kukai Mobile/Modules/Account/TokenDetailsViewModel.swift b/Kukai Mobile/Modules/Account/TokenDetailsViewModel.swift
@@ -170,7 +170,13 @@ public class TokenDetailsViewModel: ViewModel, TokenDetailsChartCellDelegate {
 			}.store(in: &bag)
 	}
 
+	// deinit doesn't reliably call, even when the parent VC does call deinit.
+	// add backup for now until more testing can be done
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Activity/ActivityViewController.swift b/Kukai Mobile/Modules/Activity/ActivityViewController.swift
@@ -49,6 +49,11 @@ class ActivityViewController: UIViewController, UITableViewDelegate {
 		}.store(in: &bag)
 	}
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		viewModel.isVisible = true
 

diff --git a/Kukai Mobile/Modules/Activity/ActivityViewModel.swift b/Kukai Mobile/Modules/Activity/ActivityViewModel.swift
@@ -57,6 +57,10 @@ class ActivityViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewController.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewController.swift
@@ -68,6 +68,11 @@ class CollectiblesCollectionsViewController: UIViewController, UICollectionViewD
 			}.store(in: &bag)
     }
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isVisible = true

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift
@@ -83,6 +83,10 @@ class CollectiblesCollectionsViewModel: ViewModel, UICollectionViewDiffableDataS
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesFavouritesViewController.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesFavouritesViewController.swift
@@ -52,6 +52,11 @@ class CollectiblesFavouritesViewController: UIViewController, UICollectionViewDe
 			}.store(in: &bag)
     }
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isVisible = true

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesFavouritesViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesFavouritesViewModel.swift
@@ -57,6 +57,10 @@ class CollectiblesFavouritesViewModel: ViewModel, UICollectionViewDiffableDataSo
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesRecentsViewController.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesRecentsViewController.swift
@@ -52,6 +52,11 @@ class CollectiblesRecentsViewController: UIViewController, UICollectionViewDeleg
 			}.store(in: &bag)
 	}
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isVisible = true

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesRecentsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesRecentsViewModel.swift
@@ -57,6 +57,10 @@ class CollectiblesRecentsViewModel: ViewModel, UICollectionViewDiffableDataSourc
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewController.swift b/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewController.swift
@@ -70,6 +70,11 @@ class CollectionDetailsViewController: UIViewController, UICollectionViewDelegat
 		}
     }
 
+	deinit {
+		cancellable?.cancel()
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isVisible = true

diff --git a/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift
@@ -47,6 +47,10 @@ class CollectionDetailsViewModel: ViewModel, UICollectionViewDiffableDataSourceH
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Discover/DiscoverViewController.swift b/Kukai Mobile/Modules/Discover/DiscoverViewController.swift
@@ -53,6 +53,11 @@ class DiscoverViewController: UIViewController, UITableViewDelegate, DiscoverFea
 		}.store(in: &bag)
 	}
 
+	deinit {
+		bag.forEach({ $0.cancel() })
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		viewModel.isVisible = true

diff --git a/Kukai Mobile/Modules/Discover/DiscoverViewModel.swift b/Kukai Mobile/Modules/Discover/DiscoverViewModel.swift
@@ -49,6 +49,10 @@ class DiscoverViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Home/AccountsViewController.swift b/Kukai Mobile/Modules/Home/AccountsViewController.swift
@@ -102,6 +102,11 @@ class AccountsViewController: UIViewController, BottomSheetContainerDelegate {
 		}
 	}
 
+	deinit {
+		cancellable = nil
+		viewModel.cleanup()
+	}
+
 	func bottomSheetDataChanged() {
 		viewModel.isPresentingForConnectedApps = (bottomSheetContainer != nil)
 		viewModel.addressToMarkAsSelected = addressToMarkAsSelected

diff --git a/Kukai Mobile/Modules/Home/AccountsViewModel.swift b/Kukai Mobile/Modules/Home/AccountsViewModel.swift
@@ -74,6 +74,10 @@ class AccountsViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Stake/BakerDetailsViewController.swift b/Kukai Mobile/Modules/Stake/BakerDetailsViewController.swift
@@ -45,6 +45,11 @@ class BakerDetailsViewController: UIViewController {
 		}
     }
 
+	deinit {
+		cancellable?.cancel()
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 

diff --git a/Kukai Mobile/Modules/Stake/BakerDetailsViewModel.swift b/Kukai Mobile/Modules/Stake/BakerDetailsViewModel.swift
@@ -36,6 +36,10 @@ class BakerDetailsViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Stake/ChooseBakerViewController.swift b/Kukai Mobile/Modules/Stake/ChooseBakerViewController.swift
@@ -47,6 +47,11 @@ class ChooseBakerViewController: UIViewController {
 		}
     }
 
+	deinit {
+		cancellable?.cancel()
+		viewModel.cleanup()
+	}
+
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 

diff --git a/Kukai Mobile/Modules/Stake/ChooseBakerViewModel.swift b/Kukai Mobile/Modules/Stake/ChooseBakerViewModel.swift
@@ -35,6 +35,10 @@ class ChooseBakerViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	}
 
 	deinit {
+		cleanup()
+	}
+
+	func cleanup() {
 		bag.forEach({ $0.cancel() })
 	}
 

diff --git a/Kukai Mobile/Modules/Stake/StakeOnboardingContainerViewController.swift b/Kukai Mobile/Modules/Stake/StakeOnboardingContainerViewController.swift
@@ -67,7 +67,10 @@ class StakeOnboardingContainerViewController: UIViewController {
 			indicatorStackviewTrailingConstraint.constant = 24 * 5
 		}
 
+		// triple make sure activity listener is up and running before we start
+		AccountViewModel.setupAccountActivityListener()
 
+		// Listen for requests to add pending operations
 		DependencyManager.shared.activityService.$addressesWithPendingOperation
 			.dropFirst()
 			.sink { [weak self] addresses in