Integrate Gravatar Quick Editor (#23729)

* Add remote FF gravatar_quick_editor

* Add forceRefresh option for image download methods

* Force refresh on gravatar update notification

* Add `GravatarQuickEditorPresenter`

* Display QuickEditor instead of the avatar upload menu

* Move listenForGravatarChanges to upper level
Add forceRefresh option

* Add one more FF check

* Adjust the obj-c call

* Listen to changes on the MeHeaderView

* Await the image download to update the cached image

* Listen to gravatar changes on the signup epilogue

* Add one more FF check

* Separate the notification name for the QE
Add email check when handling the notification

`GravatarQEAvatarUpdateNotification`

* Add a release note

* Revert whitespace change

* Use overrideImageCache`

* Fix the old avatar issue

* Update unit test

* Move `addObserver` to viewDidLoad

* Mode addObserver to init`

* Add unit tests for `appendingGravatarCacheBusterParam` and handle the canonical URL as well

* Fix "unused var" warning

* Update release notes

* Revert "Update release notes"

This reverts commit f0b3eb9.

Author: pinarol

Modules/Sources/WordPressShared/Utility/Notification+Gravatar.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+public enum GravatarQEAvatarUpdateNotificationKeys: String {
+    case email
+}
+
+public extension NSNotification.Name {
+    /// Gravatar Quick Editor updated the avatar
+    static let GravatarQEAvatarUpdateNotification = NSNotification.Name(rawValue: "GravatarQEAvatarUpdateNotification")
+}
+
+extension Foundation.Notification {
+    public func userInfoHasEmail(_ email: String) -> Bool {
+        guard let userInfo = userInfo,
+              let notificationEmail = userInfo[GravatarQEAvatarUpdateNotificationKeys.email.rawValue] as? String else {
+                  return false
+              }
+        return email == notificationEmail
+    }
+}

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 25.6
 -----
 * [*] [internal] Update Gravatar SDK to 3.0.0 [#23701]
+* [*] Use the Gravatar Quick Editor to update the avatar [#23729]
 * [*] (Hidden under a feature flag) User Management for self-hosted sites. [#23768]
 
 25.5

WordPress/Classes/Extensions/URL+Helpers.swift

@@ -151,4 +151,15 @@ extension URL {
         components?.queryItems = queryItems
         return components?.url ?? self
     }
+
+    /// Gravatar doesn't support "Cache-Control: none" header. So we add a random query parameter to
+    /// bypass the backend cache and get the latest image.
+    public func appendingGravatarCacheBusterParam() -> URL {
+        var urlComponents = URLComponents(url: self, resolvingAgainstBaseURL: false)
+        if urlComponents?.queryItems == nil {
+            urlComponents?.queryItems = []
+        }
+        urlComponents?.queryItems?.append(.init(name: "_", value: "\(NSDate().timeIntervalSince1970)"))
+        return urlComponents?.url ?? self
+    }
 }

WordPress/Classes/Utility/BuildInformation/RemoteFeatureFlag.swift

@@ -27,6 +27,7 @@ enum RemoteFeatureFlag: Int, CaseIterable {
     case inAppRating
     case siteMonitoring
     case inAppUpdates
+    case gravatarQuickEditor
     case dotComWebLogin
 
     var defaultValue: Bool {
@@ -81,6 +82,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
             return false
         case .inAppUpdates:
             return false
+        case .gravatarQuickEditor:
+            return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest, .a8cPrereleaseTesting]
         case .dotComWebLogin:
             return false
         }
@@ -139,6 +142,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
             return "site_monitoring"
         case .inAppUpdates:
             return "in_app_updates"
+        case .gravatarQuickEditor:
+            return "gravatar_quick_editor"
         case .dotComWebLogin:
             return "jp_wpcom_web_login"
         }
@@ -196,6 +201,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
             return "Site Monitoring"
         case .inAppUpdates:
             return "In-App Updates"
+        case .gravatarQuickEditor:
+            return "Gravatar Quick Editor"
         case .dotComWebLogin:
             return "Log in to WordPress.com from web browser"
         }

WordPress/Classes/Utility/Media/ImageDownloader+Gravatar.swift

@@ -4,19 +4,22 @@ import Gravatar
 
 extension ImageDownloader {
 
-    nonisolated func downloadGravatarImage(with email: String, completion: @escaping (UIImage?) -> Void) {
+    nonisolated func downloadGravatarImage(with email: String, forceRefresh: Bool = false, completion: @escaping (UIImage?) -> Void) {
 
         guard let url = AvatarURL.url(for: email) else {
             completion(nil)
             return
         }
 
-        if let cachedImage = ImageCache.shared.getImage(forKey: url.absoluteString) {
+        if !forceRefresh, let cachedImage = ImageCache.shared.getImage(forKey: url.absoluteString) {
             completion(cachedImage)
             return
         }
-
-        downloadImage(at: url) { image, _ in
+        var urlToDownload = url
+        if forceRefresh {
+            urlToDownload = url.appendingGravatarCacheBusterParam()
+        }
+        downloadImage(at: urlToDownload) { image, _ in
             DispatchQueue.main.async {
 
                 guard let image else {

WordPress/Classes/Utility/Media/ImageDownloader.swift

@@ -102,6 +102,15 @@ actor ImageDownloader {
         return imageURL.absoluteString + (size.map { "?size=\($0)" } ?? "")
     }
 
+    func clearURLSessionCache() {
+        urlSessionWithCache.configuration.urlCache?.removeAllCachedResponses()
+        urlSession.configuration.urlCache?.removeAllCachedResponses()
+    }
+
+    func clearMemoryCache() {
+        self.cache.removeAllObjects()
+    }
+
     // MARK: - Networking
 
     private func data(for request: URLRequest, options: ImageRequestOptions) async throws -> Data {

WordPress/Classes/Utility/Media/ImageViewController.swift

@@ -6,7 +6,7 @@ final class ImageViewController {
     var downloader: ImageDownloader = .shared
     var onStateChanged: (State) -> Void = { _ in }
 
-    private var task: Task<Void, Never>?
+    private(set) var task: Task<Void, Never>?
 
     enum State {
         case loading

WordPress/Classes/Utility/Media/MemoryCache.swift

@@ -4,10 +4,12 @@ import WordPressUI
 
 protocol MemoryCacheProtocol: AnyObject {
     subscript(key: String) -> UIImage? { get set }
+    func removeAllObjects()
 }
 
 /// - note: The type is thread-safe because it uses thread-safe `NSCache`.
 final class MemoryCache: MemoryCacheProtocol, @unchecked Sendable {
+
     /// A shared image cache used by the entire system.
     static let shared = MemoryCache()
 
@@ -23,6 +25,10 @@ final class MemoryCache: MemoryCacheProtocol, @unchecked Sendable {
         cache.removeAllObjects()
     }
 
+    func removeAllObjects() {
+        cache.removeAllObjects()
+    }
+
     // MARK: - UIImage
 
     subscript(key: String) -> UIImage? {

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Me.swift

@@ -4,12 +4,12 @@ import Gravatar
 
 extension BlogDetailsViewController {
 
-    @objc func downloadGravatarImage(for row: BlogDetailsRow) {
+    @objc func downloadGravatarImage(for row: BlogDetailsRow, forceRefresh: Bool = false) {
         guard let email = blog.account?.email else {
             return
         }
 
-        ImageDownloader.shared.downloadGravatarImage(with: email) { [weak self] image in
+        ImageDownloader.shared.downloadGravatarImage(with: email, forceRefresh: forceRefresh) { [weak self] image in
             guard let image,
                   let gravatarIcon = image.gravatarIcon(size: Metrics.iconSize) else {
                 return
@@ -21,9 +21,17 @@ extension BlogDetailsViewController {
     }
 
     @objc func observeGravatarImageUpdate() {
+        NotificationCenter.default.addObserver(self, selector: #selector(refreshAvatar(_:)), name: .GravatarQEAvatarUpdateNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(updateGravatarImage(_:)), name: .GravatarImageUpdateNotification, object: nil)
     }
 
+    @objc private func refreshAvatar(_ notification: Foundation.Notification) {
+        guard let meRow,
+              let email = blog.account?.email,
+              notification.userInfoHasEmail(email) else { return }
+        downloadGravatarImage(for: meRow, forceRefresh: true)
+    }
+
     @objc private func updateGravatarImage(_ notification: Foundation.Notification) {
         guard let userInfo = notification.userInfo,
             let email = userInfo["email"] as? String,

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

@@ -1350,7 +1350,7 @@ - (BlogDetailsSection *)configurationSectionViewModel
                                      callback:^{
                                          [weakSelf showMe];
                                      }];
-        [self downloadGravatarImageFor:row];
+        [self downloadGravatarImageFor:row forceRefresh: NO];
         self.meRow = row;
         [rows addObject:row];
     }