Merge branch 'trunk' into task/update-gifu

wordpress-mobile · Jul 21, 2023 · d4c4c29 · d4c4c29
2 parents 85b92f3 + bef6348
commit d4c4c29
Show file tree

Hide file tree

Showing 111 changed files with 1,215 additions and 747 deletions.
diff --git a/Gutenberg/version.rb b/Gutenberg/version.rb
@@ -12,7 +12,7 @@
 #   LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install
 GUTENBERG_CONFIG = {
   # commit: ''
-  tag: 'v1.100.0-alpha1'
+  tag: 'v1.100.1'
 }
 
 GITHUB_ORG = 'wordpress-mobile'

diff --git a/Podfile.lock b/Podfile.lock
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -9,6 +9,8 @@
 * [*] Fix a memory leak caused by the theme customization web view. [#21051]
 * [*] [Jetpack-only] Made performance improvements for Posting Activity stats. [#21136]
 * [*] Fixed a crash that could occur when following sites in Reader. [#21140]
+* [*] Fixed a crash that occurs in Weekly Roundup Background task due to a Core Data Concurrency violation. [#21076]
+* [***] Block editor: Editor UX improvements with new icons, colors and additional design enhancements. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5985]
 
 22.8
 -----

diff --git a/WordPress/Classes/Models/Notifications/NotificationSettings.swift b/WordPress/Classes/Models/Notifications/NotificationSettings.swift
@@ -15,10 +15,20 @@ open class NotificationSettings {
     ///
     public let streams: [Stream]
 
-    /// Maps to the associated blog, if any.
+    /// The associated blog. This property is not thread-safe.
+    ///
+    /// If you need to access this property from a thread different from the one it was created on, don't access it directly. Instead, use the `blogManagedObjectID`
+    /// with `context.existingObject(with: blogManagedObjectID)` to retrieve the corresponding managed object in a thread-safe manner.
     ///
     public let blog: Blog?
 
+    /// The managed object identifier for the associated blog. This property serves as a thread-safe version of the `blog` property.
+    ///
+    /// Rather than directly accessing the `blog` property from a different thread than the one it was created on, use this identifier with
+    /// `context.existingObject(with: blogManagedObjectID)` to retrieve the corresponding managed object in a thread-safe manner.
+    ///
+    public let blogManagedObjectID: NSManagedObjectID?
+
     /// The settings that are stored locally
     ///
     static let locallyStoredKeys: [String] = [
@@ -37,6 +47,7 @@ open class NotificationSettings {
         self.channel = channel
         self.streams = streams
         self.blog    = blog
+        self.blogManagedObjectID = blog?.objectID
     }
 
 

diff --git a/WordPress/Classes/Services/NotificationSettingsService.swift b/WordPress/Classes/Services/NotificationSettingsService.swift
@@ -15,15 +15,15 @@ class NotificationSettingsService {
     /// - Parameter managedObjectContext: A Reference to the MOC that should be used to interact with the Core Data Stack.
     ///
     public convenience init(coreDataStack: CoreDataStack) {
-        var remoteApi: WordPressComRestApi? = nil
-
-        if let defaultAccount = try? WPAccount.lookupDefaultWordPressComAccount(in: coreDataStack.mainContext),
-            defaultAccount.authToken != nil,
-            let restApi = defaultAccount.wordPressComRestApi,
-            restApi.hasCredentials() {
-            remoteApi = restApi
+        let remoteApi = coreDataStack.performQuery { context -> WordPressComRestApi? in
+            guard let defaultAccount = try? WPAccount.lookupDefaultWordPressComAccount(in: context),
+                  defaultAccount.authToken != nil,
+                  let restApi = defaultAccount.wordPressComRestApi,
+                  restApi.hasCredentials() else {
+                return nil
+            }
+            return restApi
         }
-
         self.init(coreDataStack: coreDataStack, wordPressComRestApi: remoteApi)
     }