Skip to content

feat: Enable sharing to non-Jetpack sites #23778

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

Merged
merged 5 commits into from
Nov 6, 2024
Merged

feat: Enable sharing to non-Jetpack sites #23778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7eae7a0
feat: Enable sharing to non-Jetpack sites
dcalhoun Nov 6, 2024
74f59b3
docs: Add release note
dcalhoun Nov 6, 2024
02518d6
docs: Add release note for Stats navigation change
dcalhoun Nov 6, 2024
14c227a
docs: Assign notes to the correct release
dcalhoun Nov 6, 2024
e1a3980
refactor: Remove unnecessary `showJetpackSitesOnly` configuration
dcalhoun Nov 6, 2024
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
2 changes: 2 additions & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
25.5
-----
* [***] Use web-based sign-in flow (hidden under a feature flag) [#23675]
* [*] Enable navigating to an individual post's stats from within the "view more" screen for author stats. [#23761]
* [*] [Jetpack-only] Enable pubishing to non-Jetpack sites when sharing content to the Jetpack app. [#23778]

25.4
-----
Expand Down
4 changes: 2 additions & 2 deletions WordPress/Classes/Services/BlogService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ - (void)syncBlogsForAccount:(WPAccount *)account

id<AccountServiceRemote> remote = [self remoteForAccount:account];

BOOL filterJetpackSites = [AppConfiguration showJetpackSitesOnly];
BOOL filterJetpackSites = false;

[remote getBlogs:filterJetpackSites success:^(NSArray *blogs) {
[[[JetpackCapabilitiesService alloc] init] syncWithBlogs:blogs success:^(NSArray<RemoteBlog *> *blogs) {
Expand Down Expand Up @@ -404,7 +404,7 @@ - (void)associateSyncedBlogsToJetpackAccount:(WPAccount *)account
{
AccountServiceRemoteREST *remote = [[AccountServiceRemoteREST alloc] initWithWordPressComRestApi:account.wordPressComRestApi];

BOOL filterJetpackSites = [AppConfiguration showJetpackSitesOnly];
BOOL filterJetpackSites = false;

[remote getBlogs:filterJetpackSites success:^(NSArray *remoteBlogs) {
[self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
Expand Down
1 change: 0 additions & 1 deletion WordPress/Classes/Utility/App Configuration/AppConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Foundation
@objc class AppConfiguration: NSObject {
@objc static let isJetpack: Bool = false
@objc static let isWordPress: Bool = true
@objc static let showJetpackSitesOnly: Bool = false
@objc static let allowsNewPostShortcut: Bool = true
@objc static let allowsConnectSite: Bool = true
@objc static let allowSignUp: Bool = true
Expand Down
1 change: 0 additions & 1 deletion WordPress/Jetpack/AppConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Foundation
@objc class AppConfiguration: NSObject {
@objc static let isJetpack: Bool = true
@objc static let isWordPress: Bool = false
@objc static let showJetpackSitesOnly: Bool = false
@objc static let allowsNewPostShortcut: Bool = true
@objc static let allowsConnectSite: Bool = true
@objc static let allowSignUp: Bool = true
Expand Down
5 changes: 1 addition & 4 deletions WordPress/WordPressShareExtension/AppExtensionsService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,7 @@ extension AppExtensionsService {
func fetchSites(onSuccess: @escaping ([RemoteBlog]?) -> (), onFailure: @escaping FailureBlock) {
let remote = AccountServiceRemoteREST(wordPressComRestApi: simpleRestAPI)

var filterJetpackSites = false
#if IS_JETPACK
filterJetpackSites = true
#endif
let filterJetpackSites = false

remote.getBlogs(filterJetpackSites, success: { blogs in
guard let blogs = blogs as? [RemoteBlog] else {
Expand Down