Fixes a memory leak solved by @hectorchu

- We had strong reference to the observer(s) and this was causing lingering issues causing the app to crash at rutime - Updated the key file references Signed-off-by: kcw-grunt <[email protected]>
litecoin-foundation · Jan 7, 2024 · 16a58d8 · 16a58d8
1 parent f6ca735
commit 16a58d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/litewallet/PartnerData.swift b/litewallet/PartnerData.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 
 enum PartnerName {
-	case unstop
 	case infura
 	case litewalletOps
 	case litewalletStart
@@ -53,18 +52,6 @@ struct Partner {
 				return errorDescription
 			}
 
-		case .unstop:
-
-			if let dictionary = NSDictionary(contentsOfFile: filePath) as? [String: AnyObject],
-			   let key = dictionary["change-now-api"] as? String
-			{
-				return key
-			} else {
-				let errorDescription = "ERROR-CHANGENOW_KEY"
-				LWAnalytics.logEventWithParameters(itemName: ._20200112_ERR, properties: ["error": errorDescription])
-				return errorDescription
-			}
-
 		case .litewalletOps:
 
 			if let dictionary = NSDictionary(contentsOfFile: filePath) as? [String: AnyObject],

diff --git a/litewallet/StartViewModel.swift b/litewallet/StartViewModel.swift
@@ -77,7 +77,7 @@ class StartViewModel: ObservableObject {
 		/// Test seed count
 		guard seedWords.count == 12 else { return }
 
-		/// Set for default
+		/// Set for default.  This model needs a initial value
 		walletManager.forceSetPin(newPin: Partner.partnerKeyPath(name: .litewalletStart))
 
 		guard walletManager.setRandomSeedPhrase() != nil else {

diff --git a/litewallet/src/ModalPresenter.swift b/litewallet/src/ModalPresenter.swift
@@ -310,12 +310,14 @@ class ModalPresenter: Subscriber, Trackable {
 		sendVC.presentScan = presentScan(parent: root)
 		sendVC.presentVerifyPin = { [weak self, weak root] bodyText, callback in
 			guard let myself = self else { return }
+			guard let myroot = root else { return }
+
 			let vc = VerifyPinViewController(bodyText: bodyText, pinLength: myself.store.state.pinLength, callback: callback)
-			vc.transitioningDelegate = self?.verifyPinTransitionDelegate
+			vc.transitioningDelegate = myself.verifyPinTransitionDelegate
 			vc.modalPresentationStyle = .overFullScreen
 			vc.modalPresentationCapturesStatusBarAppearance = true
-			root?.view.isFrameChangeBlocked = true
-			root?.present(vc, animated: true, completion: nil)
+			myroot.view.isFrameChangeBlocked = true
+			myroot.present(vc, animated: true, completion: nil)
 		}
 		sendVC.onPublishSuccess = { [weak self] in
 			self?.presentAlert(.sendSuccess, completion: {})

diff --git a/litewallet/src/WalletCoordinator.swift b/litewallet/src/WalletCoordinator.swift
@@ -147,33 +147,35 @@ class WalletCoordinator: Subscriber, Trackable {
 	}
 
 	private func addWalletObservers() {
-		NotificationCenter.default.addObserver(forName: .walletBalanceChangedNotification, object: nil, queue: nil, using: { _ in
-			self.updateBalance()
-			self.requestTxUpdate()
+		weak var myself = self
+		NotificationCenter.default.addObserver(forName: .walletBalanceChangedNotification, object: nil, queue: nil, using: {
+			_ in
+			myself?.updateBalance()
+			myself?.requestTxUpdate()
 		})
 
 		NotificationCenter.default.addObserver(forName: .walletTxStatusUpdateNotification, object: nil, queue: nil, using: { _ in
-			self.requestTxUpdate()
+			myself?.requestTxUpdate()
 		})
 
 		NotificationCenter.default.addObserver(forName: .walletTxRejectedNotification, object: nil, queue: nil, using: { note in
 			guard let recommendRescan = note.userInfo?["recommendRescan"] as? Bool else { return }
-			self.requestTxUpdate()
+			myself?.requestTxUpdate()
 			if recommendRescan {
-				self.store.perform(action: RecommendRescan.set(recommendRescan))
+				myself?.store.perform(action: RecommendRescan.set(recommendRescan))
 			}
 		})
 
 		NotificationCenter.default.addObserver(forName: .walletSyncStartedNotification, object: nil, queue: nil, using: { _ in
-			self.onSyncStart()
+			myself?.onSyncStart()
 		})
 
 		NotificationCenter.default.addObserver(forName: .walletSyncStoppedNotification, object: nil, queue: nil, using: { note in
-			self.onSyncStop(notification: note)
+			myself?.onSyncStop(notification: note)
 		})
 
 		NotificationCenter.default.addObserver(forName: .languageChangedNotification, object: nil, queue: nil, using: { _ in
-			self.updateTransactions()
+			myself?.updateTransactions()
 		})
 	}