-
Notifications
You must be signed in to change notification settings - Fork 37
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.
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
Filter Jetpack sites for Jetpack app #1936
Conversation
fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.java
Outdated
Show resolved
Hide resolved
As per our discussion on P.S.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👋 @ashiagr !
I have reviewed and tested this PR as per the instructions, everything works as expected, good job! 🌟
I have left a couple of warning (
I am still skeptical whether this change needs to target the jetpack
feature branch or directly the develop
. While reviewing this PR I got to thinking that Woo
is going to be using this new enhanced api as well, through newFetchSitesAction(...)
. As such, when that eventually enters develop
, the Woo
team would need to update their usages of that api. This makes me think that it is better if that is merged to develop
sooner that later so that we don't forget about this going forward and so that we don't create too many requirements before merging later on. I also suggest that after this is merged to develop
, we ourselves go and created two PRs, one on the WordPress
and one on the Woo
side to merge this change with the apps' develop
as soon as possible. This way, all apps will be able to reuse this functionality from there after (WordPress
, Jetpack
and Woo
) and we will stop thinking about that anymore, progressing with the next task in line. Also, since the tests.properties
where updates to account for this change, new tests where written to support this, this makes me feel that merging to develop
now is better.
Having said that, if you and @zwarm feel strongly about keeping the feature branch on FluxC
and do the merge later on, I am okay with that path too. Even thought this path will make us start maintain and update yet another feature branch, on a separate repo, it hopeful shouldn't be that difficult. 🤞
instaflux/src/main/java/org/wordpress/android/fluxc/instaflux/MainInstafluxActivity.java
Outdated
Show resolved
Hide resolved
fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.java
Outdated
Show resolved
Hide resolved
...e/src/androidTest/java/org/wordpress/android/fluxc/release/ReleaseStack_SiteTestJetpack.java
Show resolved
Hide resolved
# Conflicts: # .configure-files/tests.properties.enc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👋 @ashiagr !
I have reviewed and tested this PR as per the instructions, everything works as expected, good job! 🌟
PS: Thanks for the updates! ❤️
Description
How to test
Merge Instructions
This PR targetsfeature/jetpack-app-basics-fluxc
. We'll decide next week if we want to merge these changes todevelop
.develop
branch:Not Ready for Merge
labeldevelop