From 2eec3f3fe025597d17a86653dd9b6aed9d3e6ea3 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 22 Apr 2025 15:39:35 +1000 Subject: [PATCH 1/2] Remove long-unused Iterable deep links handling See pbMoDN-fd-p2#comment-7311 --- Sources/Reader/Reader.entitlements | 1 - .../Classes/System/WordPressAppDelegate.swift | 19 +++++-------------- WordPress/Jetpack/JetpackDebug.entitlements | 1 - .../Jetpack/JetpackRelease-Alpha.entitlements | 1 - WordPress/Jetpack/JetpackRelease.entitlements | 1 - WordPress/WordPress-Alpha.entitlements | 1 - WordPress/WordPress.entitlements | 1 - 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Sources/Reader/Reader.entitlements b/Sources/Reader/Reader.entitlements index 70cf1beeadfb..5f0f76a5dc7e 100644 --- a/Sources/Reader/Reader.entitlements +++ b/Sources/Reader/Reader.entitlements @@ -6,7 +6,6 @@ webcredentials:wordpress.com webcredentials:*.wordpress.com - applinks:links.wp.a8cmail.com aps-environment development diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift index a6860bcaff2f..8167daf7b130 100644 --- a/WordPress/Classes/System/WordPressAppDelegate.swift +++ b/WordPress/Classes/System/WordPressAppDelegate.swift @@ -473,24 +473,15 @@ extension WordPressAppDelegate { extension WordPressAppDelegate { private func trackDeepLink(for url: URL, completion: @escaping ((URL) -> Void)) { - guard isIterableDeepLink(url) else { - completion(url) - return - } - - let task = URLSession.shared.dataTask(with: url) {(_, response, error) in - if let url = response?.url { - completion(url) + let task = URLSession.shared.dataTask(with: url) { _, response, error in + guard let url = response?.url else { + return } + + completion(url) } task.resume() } - - private func isIterableDeepLink(_ url: URL) -> Bool { - return url.absoluteString.contains(WordPressAppDelegate.iterableDomain) - } - - private static let iterableDomain = "links.wp.a8cmail.com" } // MARK: - Helpers diff --git a/WordPress/Jetpack/JetpackDebug.entitlements b/WordPress/Jetpack/JetpackDebug.entitlements index 7300f805fe0e..11eb0930bd31 100644 --- a/WordPress/Jetpack/JetpackDebug.entitlements +++ b/WordPress/Jetpack/JetpackDebug.entitlements @@ -17,7 +17,6 @@ applinks:wordpress.com applinks:*.wordpress.com applinks:public-api.wordpress.com - applinks:links.wp.a8cmail.com com.apple.security.application-groups diff --git a/WordPress/Jetpack/JetpackRelease-Alpha.entitlements b/WordPress/Jetpack/JetpackRelease-Alpha.entitlements index efdce8fda2ba..486afcb0595c 100644 --- a/WordPress/Jetpack/JetpackRelease-Alpha.entitlements +++ b/WordPress/Jetpack/JetpackRelease-Alpha.entitlements @@ -13,7 +13,6 @@ applinks:wordpress.com applinks:*.wordpress.com applinks:public-api.wordpress.com - applinks:links.wp.a8cmail.com com.apple.security.application-groups diff --git a/WordPress/Jetpack/JetpackRelease.entitlements b/WordPress/Jetpack/JetpackRelease.entitlements index 7300f805fe0e..11eb0930bd31 100644 --- a/WordPress/Jetpack/JetpackRelease.entitlements +++ b/WordPress/Jetpack/JetpackRelease.entitlements @@ -17,7 +17,6 @@ applinks:wordpress.com applinks:*.wordpress.com applinks:public-api.wordpress.com - applinks:links.wp.a8cmail.com com.apple.security.application-groups diff --git a/WordPress/WordPress-Alpha.entitlements b/WordPress/WordPress-Alpha.entitlements index b4fdb57dfdfd..746c03fe2ddc 100644 --- a/WordPress/WordPress-Alpha.entitlements +++ b/WordPress/WordPress-Alpha.entitlements @@ -6,7 +6,6 @@ webcredentials:wordpress.com webcredentials:*.wordpress.com - applinks:links.wp.a8cmail.com com.apple.security.application-groups diff --git a/WordPress/WordPress.entitlements b/WordPress/WordPress.entitlements index a0ac3a4d6d3b..01c82000c649 100644 --- a/WordPress/WordPress.entitlements +++ b/WordPress/WordPress.entitlements @@ -12,7 +12,6 @@ webcredentials:wordpress.com webcredentials:*.wordpress.com - applinks:links.wp.a8cmail.com com.apple.developer.icloud-container-identifiers From 6f001c41502e18e39ed31edd5fb6888104131582 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 22 Apr 2025 16:02:09 +1000 Subject: [PATCH 2/2] Address main-thread sanitizer issue: change tab bar index on main thread --- .../Root View/WPTabBarController+RootViewPresenter.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift b/WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift index 75f4b480f037..928f163069c3 100644 --- a/WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift +++ b/WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift @@ -22,8 +22,13 @@ extension WPTabBarController: RootViewPresenter { } func showNotificationsTab(completion: ((NotificationsViewController) -> Void)?) { - self.selectedIndex = WPTab.notifications.rawValue - completion?(self.notificationsViewController!) + // UITabBarController.selectedIndex must be used from main thread only. + DispatchQueue.main.async { [weak self] in + guard let self else { return } + + self.selectedIndex = WPTab.notifications.rawValue + completion?(self.notificationsViewController!) + } } // MARK: Me