Merge pull request #19826 from wordpress-mobile/disable-jp-features-stock-photos-tenor

Disable Stock Photo and Tenor media sources when Jetpack features are removed

Author: fluiddot

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 -----
 * [***] [internal] A significant refactor to the app’s architecture was made to allow for the new simplified UI. Regression testing on the app’s main flows is needed. [#19817]
 * [**] [internal] Disable Story posts when Jetpack features are removed [#19823]
+* [**] [internal] Disable StockPhoto and Tenor media sources when Jetpack features are removed [#19826]
 
 21.4
 -----

WordPress/Classes/Models/Blog.h

@@ -77,6 +77,8 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
     BlogFeatureMediaDeletion,
     /// Does the blog support Stock Photos feature (free photos library)
     BlogFeatureStockPhotos,
+    /// Does the blog support Tenor feature (free GIF library)
+    BlogFeatureTenor,
     /// Does the blog support setting the homepage type and pages?
     BlogFeatureHomepageSettings,
     /// Does the blog support stories?

WordPress/Classes/Models/Blog.m

@@ -535,8 +535,11 @@ - (BOOL)supports:(BlogFeature)feature
         case BlogFeatureWPComRESTAPI:
         case BlogFeatureCommentLikes:
         case BlogFeatureStats:
-        case BlogFeatureStockPhotos:
             return [self supportsRestApi];
+        case BlogFeatureStockPhotos:
+            return [self supportsRestApi] && [JetpackFeaturesRemovalCoordinator jetpackFeaturesEnabled];
+        case BlogFeatureTenor:
+            return [JetpackFeaturesRemovalCoordinator jetpackFeaturesEnabled];
         case BlogFeatureSharing:
             return [self supportsSharing];
         case BlogFeatureOAuth2Login:

WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift

@@ -1182,7 +1182,7 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
     func gutenbergMediaSources() -> [Gutenberg.MediaSource] {
         return [
             post.blog.supports(.stockPhotos) ? .stockPhotos : nil,
-            .tenor,
+            post.blog.supports(.tenor) ? .tenor : nil,
             .otherApps,
             .allFiles,
         ].compactMap { $0 }

WordPress/Classes/ViewRelated/Media/MediaLibraryMediaPickingCoordinator.swift

@@ -38,8 +38,10 @@ final class MediaLibraryMediaPickingCoordinator {
         if blog.supports(.stockPhotos) {
             menuAlert.addAction(freePhotoAction(origin: origin, blog: blog))
         }
+        if blog.supports(.tenor) {
+            menuAlert.addAction(tenorAction(origin: origin, blog: blog))
+        }
 
-        menuAlert.addAction(tenorAction(origin: origin, blog: blog))
         menuAlert.addAction(otherAppsAction(origin: origin, blog: blog))
         menuAlert.addAction(cancelAction())
 

WordPress/Classes/ViewRelated/Media/StockPhotos/AztecMediaPickingCoordinator.swift

@@ -25,8 +25,10 @@ final class AztecMediaPickingCoordinator {
         if blog.supports(.stockPhotos) {
             alertController.addAction(freePhotoAction(origin: origin, blog: blog))
         }
+        if blog.supports(.tenor) {
+            alertController.addAction(tenorAction(origin: origin, blog: blog))
+        }
 
-        alertController.addAction(tenorAction(origin: origin, blog: blog))
         alertController.addAction(otherAppsAction(origin: origin, blog: blog))
         alertController.addAction(cancelAction())