Merge branch 'trunk' into task/xcode-targets-wp

Author: kean

.rubocop.yml

@@ -3,6 +3,8 @@ AllCops:
     - DerivedData/**/*
     - Pods/**/*
     - vendor/**/*
+    - WordPressAuthenticator/**/*
+    - WordPressKit/**/*
   NewCops: enable
 
 Metrics/BlockLength:

Podfile

@@ -56,13 +56,6 @@ def gravatar
   pod 'GravatarUI', '2.0.0'
 end
 
-def kanvas
-  pod 'Kanvas', '~> 1.4.4'
-  # pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', tag: ''
-  # pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', commit: ''
-  # pod 'Kanvas', path: '../Kanvas-iOS'
-end
-
 def shared_with_all_pods
   wordpress_shared
 end
@@ -107,7 +100,6 @@ abstract_target 'Apps' do
   ## ====================
   ##
   wordpress_shared
-  kanvas
   gravatar
 
   # Production

Podfile.lock

@@ -16,8 +16,6 @@ PODS:
   - GravatarUI (2.0.0):
     - Gravatar (= 2.0.0)
   - Gutenberg (1.120.1)
-  - Kanvas (1.4.9):
-    - CropViewController
   - MediaEditor (1.2.2):
     - CropViewController (~> 2.5.3)
   - Specta (1.0.7)
@@ -37,7 +35,6 @@ DEPENDENCIES:
   - Gravatar (= 2.0.0)
   - GravatarUI (= 2.0.0)
   - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
-  - Kanvas (~> 1.4.4)
   - MediaEditor (>= 1.2.2, ~> 1.2)
   - Specta (= 1.0.7)
   - SwiftLint (= 0.54.0)
@@ -57,7 +54,6 @@ SPEC REPOS:
     - Expecta
     - Gravatar
     - GravatarUI
-    - Kanvas
     - MediaEditor
     - Specta
     - SwiftLint
@@ -82,7 +78,6 @@ SPEC CHECKSUMS:
   Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
   GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
   Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
-  Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
   MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
@@ -91,6 +86,6 @@ SPEC CHECKSUMS:
   WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
   WordPressUI: f883fdd2508a0bc525c19805b2bbae980b581271
 
-PODFILE CHECKSUM: be2b1266b694f9fb945c63ec61af8a26ee415305
+PODFILE CHECKSUM: 2c4301332e4759f1e2cf52493c97c0c95207b1a0
 
 COCOAPODS: 1.15.2

RELEASE-NOTES.txt

@@ -1,7 +1,11 @@
 25.2
 -----
+
+* [*] [Jetpack-only] Stats: Made optimizations to enhance scrolling performance. [#22847]
 * [*] Simplify post list context menu sections [#23356]
 * [*] Fix an issue with incorrect snackbar shown when saving drafts manually [#23358]
+* [**] Support editing media metadata for sites not powered by Jetpack and reliant on XML-RPC [#23316]
+* [*] Fix rare crash in the unsupported block editor [#23379]
 
 25.1
 -----

WordPress/Classes/Models/Blog.h

@@ -74,6 +74,8 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
     BlogFeatureNoncePreviews,
     /// Does the blog support editing media metadata?
     BlogFeatureMediaMetadataEditing,
+    /// Does the blog support editing media alternative text?
+    BlogFeatureMediaAltEditing,
     /// Does the blog support deleting media?
     BlogFeatureMediaDeletion,
     /// Does the blog support Stock Photos feature (free photos library)
@@ -82,8 +84,6 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
     BlogFeatureTenor,
     /// Does the blog support setting the homepage type and pages?
     BlogFeatureHomepageSettings,
-    /// Does the blog support stories?
-    BlogFeatureStories,
     /// Does the blog support Jetpack contact info block?
     BlogFeatureContactInfo,
     BlogFeatureBlockEditorSettings,

WordPress/Classes/Models/Blog.m

@@ -592,13 +592,16 @@ - (BOOL)supports:(BlogFeature)feature
         case BlogFeatureNoncePreviews:
             return [self supportsRestApi] && ![self isHostedAtWPcom];
         case BlogFeatureMediaMetadataEditing:
-            return [self supportsRestApi] && [self isAdmin];
+            return [self isAdmin];
+        case BlogFeatureMediaAltEditing:
+            // alt is not supported via XML-RPC API
+            // https://core.trac.wordpress.org/ticket/58582
+            // https://github.com/wordpress-mobile/WordPress-Android/issues/18514#issuecomment-1589752274
+            return [self supportsRestApi];
         case BlogFeatureMediaDeletion:
             return [self isAdmin];
         case BlogFeatureHomepageSettings:
             return [self supportsRestApi] && [self isAdmin];
-        case BlogFeatureStories:
-            return [self supportsStories];
         case BlogFeatureContactInfo:
             return [self supportsContactInfo];
         case BlogFeatureBlockEditorSettings:
@@ -712,11 +715,6 @@ - (BOOL)supportsPluginManagement
     return supports;
 }
 
-- (BOOL)supportsStories
-{
-    return NO;
-}
-
 - (BOOL)supportsContactInfo
 {
     return [self hasRequiredJetpackVersion:@"8.5"] || self.isHostedAtWPcom;

WordPress/Classes/Services/PostCoordinator.swift

@@ -717,13 +717,6 @@ class PostCoordinator: NSObject {
         return post.titleForDisplay()
     }
 
-    func add(assets: [ExportableAsset], to post: AbstractPost) -> [Media?] {
-        let media = assets.map { asset in
-            return mediaCoordinator.addMedia(from: asset, to: post)
-        }
-        return media
-    }
-
     private func observeMedia(for post: AbstractPost, completion: @escaping (Result<AbstractPost, SavingError>) -> ()) -> UUID {
         // Only observe if we're not already
         let handleSingleMediaFailure = { [weak self] (error: Error) -> Void in