Merge release/25.4.1 into trunk using cherry picked commits (#23698)

* Bump version number

* Fix crash in ImageDownloader

* Revert split view changes

* Show post stats from Authors section

* Improve sharing

---------

Co-authored-by: Automattic Release Bot <[email protected]>
Co-authored-by: kean <[email protected]>

Author: 3 people

WordPress/Classes/System/SplitViewRootPresenter.swift

@@ -318,19 +318,9 @@ extension SplitViewRootPresenter: UISplitViewControllerDelegate {
 
     // TODO: refactor this
     func splitViewControllerDidCollapse(_ svc: UISplitViewController) {
-        let mainContext = ContextManager.shared.mainContext
         switch sidebarViewModel.selection {
-        case .blog(let objectID):
-            guard let blog = try? mainContext.existingObject(with: objectID) else {
-                return
-            }
-            if let navigationVC = svc.viewController(for: .supplementary) as? UINavigationController,
-               let menuVC = navigationVC.viewControllers.first as? SiteMenuViewController,
-               let subsection = menuVC.selectedSubsection, subsection != .home {
-                tabBarVC.showBlogDetails(for: blog, then: subsection, userInfo: [:])
-            } else {
-                tabBarVC.showBlogDetails(for: blog)
-            }
+        case .blog:
+            break
         case .reader:
             if let selection = readerPresenter.sidebar.viewModel.selection {
                 switch selection {

WordPress/Classes/Utility/Media/ImageDownloader.swift

@@ -106,23 +106,25 @@ actor ImageDownloader {
 
     private func data(for request: URLRequest, options: ImageRequestOptions) async throws -> Data {
         let requestKey = request.urlRequest?.url?.absoluteString ?? ""
-        let task = tasks[requestKey] ?? ImageDataTask(task: Task {
+        let task = tasks[requestKey] ?? ImageDataTask(key: requestKey, Task {
             try await self._data(for: request, options: options, key: requestKey)
         })
+        task.downloader = self
+
         let subscriptionID = UUID()
         task.subscriptions.insert(subscriptionID)
         tasks[requestKey] = task
 
-        return try await withTaskCancellationHandler {
-            try await task.task.value
-        } onCancel: {
-            Task {
-                await self.unsubscribe(subscriptionID, key: requestKey)
-            }
+        return try await task.getData(subscriptionID: subscriptionID)
+    }
+
+    fileprivate nonisolated func unsubscribe(_ subscriptionID: UUID, key: String) {
+        Task {
+            await _unsubscribe(subscriptionID, key: key)
         }
     }
 
-    private func unsubscribe(_ subscriptionID: UUID, key: String) {
+    private func _unsubscribe(_ subscriptionID: UUID, key: String) {
         guard let task = tasks[key],
               task.subscriptions.remove(subscriptionID) != nil,
               task.subscriptions.isEmpty else {
@@ -151,14 +153,24 @@ actor ImageDownloader {
 }
 
 private final class ImageDataTask {
+    let key: String
     var subscriptions = Set<UUID>()
-    var isCancelled = false
-    var task: Task<Data, Error>
+    let task: Task<Data, Error>
+    weak var downloader: ImageDownloader?
 
-    init(subscriptions: Set<UUID> = Set<UUID>(), task: Task<Data, Error>) {
-        self.subscriptions = subscriptions
+    init(key: String, _ task: Task<Data, Error>) {
+        self.key = key
         self.task = task
     }
+
+    func getData(subscriptionID: UUID) async throws -> Data {
+        try await withTaskCancellationHandler {
+            try await task.value
+        } onCancel: { [weak self] in
+            guard let self else { return }
+            self.downloader?.unsubscribe(subscriptionID, key: self.key)
+        }
+    }
 }
 
 // MARK: - ImageDownloader (Closures)

WordPress/Classes/Utility/Sharing/SafariActivity.m

@@ -6,7 +6,7 @@ @implementation SafariActivity {
 
 - (UIImage *)activityImage
 {
-    return [UIImage imageNamed:@"Safari"];
+    return [UIImage systemImageNamed:@"safari"];
 }
 
 - (NSString *)activityTitle

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.h

@@ -89,9 +89,6 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
 @property (nonatomic) BOOL showsDisclosureIndicator;
 @property (nonatomic, copy, nullable) void (^callback)(void);
 
-/// - warning: This property is not specified for every row.
-@property (nonatomic, readonly) BlogDetailsSubsection subsection;
-
 - (instancetype _Nonnull)initWithTitle:(NSString * __nonnull)title
                             identifier:(NSString * __nonnull)identifier
                accessibilityIdentifier:(NSString *__nullable)accessibilityIdentifier
@@ -118,8 +115,6 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
                          renderingMode:(UIImageRenderingMode)renderingMode
                               callback:(void(^_Nullable)(void))callback;
 
-- (BlogDetailsRow * _Nonnull)withSubsection:(BlogDetailsSubsection)subsection;
-
 @end
 
 @protocol ScenePresenter;
@@ -140,9 +135,6 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
 /// A new display mode for the displaying it as part of the site menu.
 @property (nonatomic) BOOL isSidebarModeEnabled;
 
-/// - warning: A temporary solution for restoring selection on iPad – imprecise!
-@property (nonatomic, readonly) BlogDetailsSubsection selectedSubsection;
-
 - (id _Nonnull)init;
 - (void)showDetailViewForSubsection:(BlogDetailsSubsection)section;
 - (void)showDetailViewForSubsection:(BlogDetailsSubsection)section userInfo:(nonnull NSDictionary *)userInfo;