Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable Story posts when Jetpack features are removed #19823

Merged
merged 6 commits into from
Jan 4, 2023
Merged

Disable Story posts when Jetpack features are removed #19823

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5787bbf
Expose shouldRemoveJetpackFeatures helper to ObjC
fluiddot Jan 2, 2023
6197b2b
Disable Story posts when Jetpack features are removed
fluiddot Dec 30, 2022
d9f9da6
Merge branch 'trunk' into disable-jp-features-story-posts
fluiddot Jan 3, 2023
afd7418
Expose `jetpackFeaturesEnabled` helper to ObjC
fluiddot Jan 3, 2023
6336f62
Replace `shouldRemoveJetpackFeatures` calls with new function
fluiddot Jan 3, 2023
b156b82
Update release notes
fluiddot Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/Classes/Models/Blog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
@class UserSuggestion;
@class SiteSuggestion;
@class PageTemplateCategory;
@class JetpackFeaturesRemovalCoordinator;

extern NSString * const BlogEntityName;
extern NSString * const PostFormatStandard;
Expand Down
3 changes: 2 additions & 1 deletion WordPress/Classes/Models/Blog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,8 @@ - (BOOL)supportsPluginManagement
- (BOOL)supportsStories
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I originally considered checking the isPad and feature removal conditions in a specific helper within the StoryAction class. But I finally ended up using the supports functionality of the Blog model as the logic seemed closer to me. In any case, please let me know if there's a better approach for this, thanks!

{
BOOL hasRequiredJetpack = [self hasRequiredJetpackVersion:@"9.1"];
return hasRequiredJetpack || self.isHostedAtWPcom;
// Stories are disabled in iPad until this Kanvas issue is solved: https://github.com/tumblr/kanvas-ios/issues/104
return (hasRequiredJetpack || self.isHostedAtWPcom) && ![UIDevice isPad] && ![JetpackFeaturesRemovalCoordinator shouldRemoveJetpackFeatures];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that we weren't using the same conditions for determining if the Story Post action should be shown in different places. For this reason, I decided to unify the logic into a single function. Specifically, checking if the device is an iPad. Based on this PR and this Kanvas issue, I understand that the Story post shouldn't be enabled on iPad.

}

- (BOOL)supportsContactInfo
Expand Down
6 changes: 1 addition & 5 deletions WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extension MySiteViewController {

var actions: [ActionSheetItem] = []

if shouldShowNewStory {
if blog?.supports(.stories) ?? false {
actions.append(StoryAction(handler: newStory, source: source))
}

Expand All @@ -38,8 +38,4 @@ extension MySiteViewController {
let coordinator = CreateButtonCoordinator(self, actions: actions, source: source, blog: blog)
return coordinator
}

private var shouldShowNewStory: Bool {
return (blog?.supports(.stories) ?? false) && !UIDevice.isPad()
}
}
3 changes: 2 additions & 1 deletion .../Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

/// A class containing convenience methods for the the Jetpack features removal experience
class JetpackFeaturesRemovalCoordinator {
class JetpackFeaturesRemovalCoordinator: NSObject {

/// Enum descibing the current phase of the Jetpack features removal
enum GeneralPhase: String {
Expand Down Expand Up @@ -108,6 +108,7 @@ class JetpackFeaturesRemovalCoordinator {
}

/// Used to determine if the Jetpack features should be removed based on the removal phase.
@objc
fluiddot marked this conversation as resolved.
Show resolved Hide resolved
static func shouldRemoveJetpackFeatures() -> Bool {
switch generalPhase() {
case .four, .newUsers:
Expand Down