Merge branch trunk into task/19570-migration-notifications-screen-ui

Author: Giorgio Ruscigno

Podfile

@@ -218,7 +218,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.4'
+  pod 'WPMediaPicker', '~> 1.8.7-beta.1'
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
   ## while PR is in review:
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''

Podfile.lock

@@ -512,7 +512,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.5)
-  - WPMediaPicker (1.8.6)
+  - WPMediaPicker (1.8.7-beta.1)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -605,7 +605,7 @@ DEPENDENCIES:
   - WordPressKit (>= 4.58.2, ~> 4.58)
   - WordPressShared (~> 1.18.0)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.4)
+  - WPMediaPicker (~> 1.8.7-beta.1)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -868,7 +868,7 @@ SPEC CHECKSUMS:
   WordPressKit: d8bc00bce09273fc241cf171b0e61ef8f4f29479
   WordPressShared: e5a479220643f46dc4d7726ef8dd45f18bf0c53b
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
-  WPMediaPicker: 749ebfa75fb2b6df4f5e5d9d0847e9512ad74d28
+  WPMediaPicker: 59135aebb058a95a507045f93e478516729e5c0f
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -880,6 +880,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 879b8a4d9da3b3bad6cfed2de24977912ce560b0
+PODFILE CHECKSUM: 936784ec2e9d8246acccd6b123c0ba5b1b6e13b9
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 21.2
 -----
-
+* [*] [internal] Refactored fetching posts in the Reader tab. [#19539]
+* [*] Fixed an issue where the message "No media matching your search" for the media picker is not visible [#19555]
 
 21.1
 -----

WordPress/Classes/Extensions/Media+Blog.swift

@@ -59,4 +59,19 @@ extension Media {
 
         return media
     }
+
+    /// Returns a list of Media objects from a post, that should be autoUploaded on the next attempt.
+    ///
+    /// - Parameters:
+    ///     - post: the post to look auto-uploadable media for.
+    ///     - automatedRetry: whether the media to upload is the result of an automated retry.
+    ///
+    /// - Returns: the Media objects that should be autoUploaded.
+    ///
+    class func failedForUpload(in post: AbstractPost, automatedRetry: Bool) -> [Media] {
+        post.media.filter { media in
+            media.remoteStatus == .failed
+                && (!automatedRetry || media.autoUploadFailureCount.intValue < Media.maxAutoUploadFailureCount)
+        }
+    }
 }

WordPress/Classes/Extensions/Media+Sync.swift

@@ -0,0 +1,70 @@
+import Foundation
+
+extension Media {
+
+    /// Returns a list of Media objects that should be uploaded for the given input parameters.
+    ///
+    /// - Parameters:
+    ///     - automatedRetry: whether the media to upload is the result of an automated retry.
+    ///
+    /// - Returns: the Media objects that should be uploaded for the given input parameters.
+    ///
+    static func failedMediaForUpload(automatedRetry: Bool, in context: NSManagedObjectContext) -> [Media] {
+        let request = NSFetchRequest<Media>(entityName: Media.entityName())
+        let failedMediaPredicate = NSPredicate(format: "\(#keyPath(Media.remoteStatusNumber)) == %d", MediaRemoteStatus.failed.rawValue)
+
+        if automatedRetry {
+            let autoUploadFailureCountPredicate = NSPredicate(format: "\(#keyPath(Media.autoUploadFailureCount)) < %d", Media.maxAutoUploadFailureCount)
+
+            request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [failedMediaPredicate, autoUploadFailureCountPredicate])
+        } else {
+            request.predicate = failedMediaPredicate
+        }
+
+        let media = (try? context.fetch(request)) ?? []
+
+        return media
+    }
+
+    /// This method checks the status of all media objects and updates them to the correct status if needed.
+    /// The main cause of wrong status is the app being killed while uploads of media are happening.
+    ///
+    /// - Parameters:
+    ///   - onCompletion: block to invoke when status update is finished.
+    ///   - onError: block to invoke if any error occurs while the update is being made.
+    ///
+    static func refreshMediaStatus(using coreDataStack: CoreDataStack, onCompletion: (() -> Void)? = nil, onError: ((Error) -> Void)? = nil) {
+        coreDataStack.performAndSave { context in
+            let fetch = NSFetchRequest<Media>(entityName: Media.classNameWithoutNamespaces())
+            let pushingPredicate = NSPredicate(format: "remoteStatusNumber = %@", NSNumber(value: MediaRemoteStatus.pushing.rawValue))
+            let processingPredicate = NSPredicate(format: "remoteStatusNumber = %@", NSNumber(value: MediaRemoteStatus.processing.rawValue))
+            let errorPredicate = NSPredicate(format: "remoteStatusNumber = %@", NSNumber(value: MediaRemoteStatus.failed.rawValue))
+            fetch.predicate = NSCompoundPredicate(orPredicateWithSubpredicates: [pushingPredicate, processingPredicate, errorPredicate])
+            let mediaPushing = try context.fetch(fetch)
+            for media in mediaPushing {
+                // If file were in the middle of being pushed or being processed they now are failed.
+                if media.remoteStatus == .pushing || media.remoteStatus == .processing {
+                    media.remoteStatus = .failed
+                }
+                // If they failed to upload themselfs because no local copy exists then we need to delete this media object
+                // This scenario can happen when media objects were created based on an asset that failed to import to the WordPress App.
+                // For example a PHAsset that is stored on the iCloud storage and because of the network connection failed the import process.
+                if media.remoteStatus == .failed,
+                    let error = media.error as NSError?, error.domain == MediaServiceErrorDomain && error.code == MediaServiceError.fileDoesNotExist.rawValue {
+                    context.delete(media)
+                }
+            }
+        } completion: { result in
+            DispatchQueue.main.async {
+                switch result {
+                case .success:
+                    onCompletion?()
+                case let .failure(error):
+                    DDLogError("Error while attempting to clean local media: \(error.localizedDescription)")
+                    onError?(error)
+                }
+            }
+        }
+    }
+
+}

WordPress/Classes/Extensions/UIImageView+SiteIcon.swift

@@ -145,7 +145,7 @@ extension UIImageView {
 
 // MARK: - Private Methods
 //
-private extension UIImageView {
+extension UIImageView {
     /// Returns the Size Optimized URL for a given Path.
     ///
     func optimizedURL(for path: String) -> URL? {

WordPress/Classes/Services/MediaCoordinator.swift

@@ -11,12 +11,18 @@ import enum Alamofire.AFError
 class MediaCoordinator: NSObject {
     @objc static let shared = MediaCoordinator()
 
-    private(set) var backgroundContext: NSManagedObjectContext = {
-        let context = ContextManager.sharedInstance().newDerivedContext()
-        context.automaticallyMergesChangesFromParent = true
-        return context
+    private let coreDataStack: CoreDataStack
+
+    private var mainContext: NSManagedObjectContext {
+        coreDataStack.mainContext
+    }
+
+    private let syncOperationQueue: OperationQueue = {
+        let queue = OperationQueue()
+        queue.name = "org.wordpress.mediauploadcoordinator.sync"
+        queue.maxConcurrentOperationCount = 1
+        return queue
     }()
-    private let mainContext = ContextManager.sharedInstance().mainContext
 
     private let queue = DispatchQueue(label: "org.wordpress.mediauploadcoordinator")
 
@@ -36,8 +42,9 @@ class MediaCoordinator: NSObject {
 
     private let mediaServiceFactory: MediaService.Factory
 
-    init(_ mediaServiceFactory: MediaService.Factory = MediaService.Factory()) {
+    init(_ mediaServiceFactory: MediaService.Factory = MediaService.Factory(), coreDataStack: CoreDataStack = ContextManager.shared) {
         self.mediaServiceFactory = mediaServiceFactory
+        self.coreDataStack = coreDataStack
 
         super.init()
 
@@ -54,12 +61,11 @@ class MediaCoordinator: NSObject {
     /// - Returns: `true` if all media in the post is uploading or was uploaded, `false` otherwise.
     ///
     func uploadMedia(for post: AbstractPost, automatedRetry: Bool = false) -> Bool {
-        let mediaService = mediaServiceFactory.create(backgroundContext)
         let failedMedia: [Media] = post.media.filter({ $0.remoteStatus == .failed })
         let mediasToUpload: [Media]
 
         if automatedRetry {
-            mediasToUpload = mediaService.failedMediaForUpload(in: post, automatedRetry: automatedRetry)
+            mediasToUpload = Media.failedForUpload(in: post, automatedRetry: automatedRetry)
         } else {
             mediasToUpload = failedMedia
         }
@@ -286,25 +292,23 @@ class MediaCoordinator: NSObject {
     func delete(media: [Media], onProgress: ((Progress?) -> Void)? = nil, success: (() -> Void)? = nil, failure: (() -> Void)? = nil) {
         media.forEach({ self.cancelUpload(of: $0) })
 
-        let service = mediaServiceFactory.create(backgroundContext)
-        service.deleteMedia(media,
-                            progress: { onProgress?($0) },
-                            success: success,
-                            failure: failure)
+        coreDataStack.performAndSave { context in
+            let service = self.mediaServiceFactory.create(context)
+            service.deleteMedia(media,
+                                progress: { onProgress?($0) },
+                                success: success,
+                                failure: failure)
+        }
     }
 
     @discardableResult
     private func uploadMedia(_ media: Media, automatedRetry: Bool = false) -> Progress {
-        let service = mediaServiceFactory.create(backgroundContext)
-
-        var progress: Progress? = nil
+        let resultProgress = Progress.discreteProgress(totalUnitCount: 100)
 
-        service.uploadMedia(media,
-                            automatedRetry: automatedRetry,
-                            progress: &progress,
-                            success: {
-                                self.end(media)
-        }, failure: { error in
+        let success: () -> Void = {
+            self.end(media)
+        }
+        let failure: (Error?) -> Void = { error in
             // Ideally the upload service should always return an error.  This may be easier to enforce
             // if we update the service to Swift, but in the meanwhile I'm instantiating an unknown upload
             // error whenever the service doesn't provide one.
@@ -324,12 +328,19 @@ class MediaCoordinator: NSObject {
 
             self.coordinator(for: media).attach(error: nserror, toMediaID: media.uploadID)
             self.fail(nserror, media: media)
-        })
-        var resultProgress = Progress.discreteCompletedProgress()
-        if let taskProgress = progress {
-            resultProgress =  taskProgress
         }
+
+        coreDataStack.performAndSave { context in
+            let service = self.mediaServiceFactory.create(context)
+            var progress: Progress? = nil
+            service.uploadMedia(media, automatedRetry: automatedRetry, progress: &progress, success: success, failure: failure)
+            if let progress {
+                resultProgress.addChild(progress, withPendingUnitCount: resultProgress.totalUnitCount)
+            }
+        }
+
         uploading(media, progress: resultProgress)
+
         return resultProgress
     }
 
@@ -634,16 +645,30 @@ class MediaCoordinator: NSObject {
     /// - parameter blog: The blog from where to sync the media library from.
     ///
     @objc func syncMedia(for blog: Blog, success: (() -> Void)? = nil, failure: ((Error) ->Void)? = nil) {
-        let service = mediaServiceFactory.create(backgroundContext)
-        service.syncMediaLibrary(for: blog, success: success, failure: failure)
+        syncOperationQueue.addOperation(AsyncBlockOperation { done in
+            self.coreDataStack.performAndSave { context in
+                let service = self.mediaServiceFactory.create(context)
+                service.syncMediaLibrary(
+                    for: blog,
+                    success: {
+                        done()
+                        success?()
+                    },
+                    failure: { error in
+                        done()
+                        failure?(error)
+                    }
+                )
+            }
+        })
+
     }
 
     /// This method checks the status of all media objects and updates them to the correct status if needed.
     /// The main cause of wrong status is the app being killed while uploads of media are happening.
     ///
     @objc func refreshMediaStatus() {
-        let service = mediaServiceFactory.create(backgroundContext)
-        service.refreshMediaStatus()
+        Media.refreshMediaStatus(using: coreDataStack)
     }
 }
 
@@ -693,10 +718,12 @@ extension MediaCoordinator: MediaProgressCoordinatorDelegate {
 
 extension MediaCoordinator: Uploader {
     func resume() {
-        let service = mediaServiceFactory.create(backgroundContext)
-
-        service.failedMediaForUpload(automatedRetry: true).forEach() {
-            retryMedia($0, automatedRetry: true)
+        coreDataStack.performAndSave { context in
+            Media
+                .failedMediaForUpload(automatedRetry: true, in: context)
+                .forEach() {
+                    self.retryMedia($0, automatedRetry: true)
+                }
         }
     }
 }

WordPress/Classes/Services/MediaService.m

@@ -549,10 +549,17 @@ - (void) getMediaWithID:(NSNumber *) mediaID inBlog:(Blog *) blog
                media = [Media makeMediaWithBlog:blog];
            }
            [self updateMedia:media withRemoteMedia:remoteMedia];
+
+           [[ContextManager sharedInstance] saveContextAndWait:self.managedObjectContext];
+
            if (success){
                success(media);
+
+               if ([media hasChanges]) {
+                   NSCAssert(NO, @"The success callback should not modify the Media instance");
+                   [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
+               }
            }
-           [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
        }];
     } failure:^(NSError *error) {
         if (failure) {