Skip to content

Contact info api - featureConfig implementation #13804

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
illusaen merged 18 commits into from
Apr 8, 2021
Merged

Contact info api - featureConfig implementation #13804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8eab0aa
WC: Adding in contact info capability.
Jan 13, 2021
8e84102
WC: Updating release notes for contact info.
Jan 13, 2021
160a92d
Merge branch 'develop' into contact-info-api-mario
mzorz Jan 18, 2021
16c855c
added ContactIngoBlockFeatureConfig to control GB ContactInfo block a…
mzorz Jan 18, 2021
81bcacb
reverted unwanted changes to .idea/compiler.xml
mzorz Jan 18, 2021
563182e
updated gutenberg-mobile hash
mzorz Jan 27, 2021
5a15271
updated gutenberg-mobile branch
mzorz Jan 27, 2021
5a408ed
fixed merge conflicts - WARNING added mock implemetations of new call…
mzorz Jan 27, 2021
1f66092
Updated gb mobile ref.
jd-alexander Jan 28, 2021
544708e
gb mobile ref updated with bundles.
jd-alexander Jan 28, 2021
6107cc5
fixed merge conflicts
mzorz Jan 29, 2021
2477731
updated gutenberg-mobile commit hash
mzorz Feb 2, 2021
c95f9b1
Merge branch 'develop' into contact-info-api-mario
mzorz Feb 2, 2021
8d94051
updated gutenberg-mobile
mzorz Feb 9, 2021
28f4a20
Removing release notes from this branch as user facing changes are be…
mzorz Feb 9, 2021
a31c71a
disabled Contact Info block for production (vanilla flavors)
mzorz Feb 9, 2021
e32af3f
updated gutenberg-mobile hash with latest develop, already merged gut…
mzorz Feb 9, 2021
977f5f9
updated branch fixed with base branch
mzorz Apr 8, 2021
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 WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ android {
buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "true"
buildConfigField "boolean", "MY_SITE_IMPROVEMENTS", "false"
buildConfigField "boolean", "SEEN_UNSEEN_WITH_COUNTER", "false"
buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
buildConfigField "boolean", "LIKES_ENHANCEMENTS", "false"
}

Expand All @@ -99,6 +100,7 @@ android {
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "false"
}

zalpha { // alpha version - enable experimental features
Expand Down
3 changes: 3 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper;
import org.wordpress.android.util.analytics.AnalyticsUtils;
import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
import org.wordpress.android.util.config.ContactInfoBlockFeatureConfig;
import org.wordpress.android.util.helpers.MediaFile;
import org.wordpress.android.util.helpers.MediaGallery;
import org.wordpress.android.util.image.ImageManager;
Expand Down Expand Up @@ -399,6 +400,7 @@ enum RestartEditorOptions {
@Inject LoadStoryFromStoriesPrefsUseCase mLoadStoryFromStoriesPrefsUseCase;
@Inject StoriesPrefs mStoriesPrefs;
@Inject StoriesEventListener mStoriesEventListener;
@Inject ContactInfoBlockFeatureConfig mContactInfoBlockFeatureConfig;

private StorePostViewModel mViewModel;

Expand Down Expand Up @@ -2270,6 +2272,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite);

return new GutenbergPropsBuilder(
mContactInfoBlockFeatureConfig.isEnabled() && SiteUtils.supportsContactInfoFeature(mSite),
SiteUtils.supportsStoriesFeature(mSite),
mSite.isUsingWpComRestApi(),
enableXPosts,
Expand Down
5 changes: 5 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class SiteUtils {
public static final String AZTEC_EDITOR_NAME = "aztec";
public static final String WP_STORIES_CREATOR_NAME = "wp_stories_creator";
public static final String WP_STORIES_JETPACK_VERSION = "9.1";
public static final String WP_CONTACT_INFO_JETPACK_VERSION = "8.5";
Copy link
Contributor

@jd-alexander jd-alexander Jan 26, 2021

Choose a reason for hiding this comment

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

Hi @illusaen or @mzorz I have a question about the Jetpack version. I am looking at the release notes above and it specifies that the contact info block works on WP.com site and sites with JetPack 9.1 and above. But this value is 8.5 so I am just checking if this is expected i.e I am checking to see if these versions should be the same or not. Thanks 🙇

Copy link
Contributor Author

@mzorz mzorz Jan 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Good observation @jd-alexander ! My findings tell me the first version of Jetpack shipping with that block was 8.5, so the release notes should be updated accordingly 👍 @illusaen do you want to update it?

Copy link
Contributor

@jd-alexander jd-alexander Jan 27, 2021

Choose a reason for hiding this comment

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

Also another question @mzorz should the block be tested with vanilla debug or vanilla release ?

Copy link
Contributor Author

@mzorz mzorz Jan 27, 2021

Choose a reason for hiding this comment

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

I think both should work as long as it's vanilla - I tested vanillaDebug only but it should be the same (the productFlavors work this way)

private static final int GB_ROLLOUT_PERCENTAGE_PHASE_1 = 100;
private static final int GB_ROLLOUT_PERCENTAGE_PHASE_2 = 100;

Expand Down Expand Up @@ -345,6 +346,10 @@ public static boolean supportsStoriesFeature(SiteModel site) {
return site != null && (site.isWPCom() || checkMinimalJetpackVersion(site, WP_STORIES_JETPACK_VERSION));
}

public static boolean supportsContactInfoFeature(SiteModel site) {
return site != null & (site.isWPCom() || checkMinimalJetpackVersion(site, WP_CONTACT_INFO_JETPACK_VERSION));
}

public static boolean isNonAtomicBusinessPlanSite(@Nullable SiteModel site) {
return site != null && !site.isAutomatedTransfer() && SiteUtils.hasNonJetpackBusinessPlan(site);
}
Expand Down
9 changes: 9 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/util/config/ContactInfoBlockFeatureConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.wordpress.android.util.config

import org.wordpress.android.BuildConfig
import org.wordpress.android.annotation.FeatureInDevelopment
import javax.inject.Inject

@FeatureInDevelopment
class ContactInfoBlockFeatureConfig
@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.CONTACT_INFO_BLOCK_AVAILABLE)
3 changes: 2 additions & 1 deletion ...PressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.wordpress.mobile.WPAndroidGlue.GutenbergProps

@Parcelize
data class GutenbergPropsBuilder(
private val enableContactInfoBlock: Boolean,
private val enableMediaFilesCollectionBlocks: Boolean,
private val enableMentions: Boolean,
private val enableXPosts: Boolean,
Expand All @@ -19,7 +20,7 @@ data class GutenbergPropsBuilder(
private val editorTheme: Bundle?
) : Parcelable {
fun build(activity: Activity, isHtmlModeEnabled: Boolean) = GutenbergProps(
enableContactInfoBlock = false,
enableContactInfoBlock = enableContactInfoBlock,
enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks,
enableMentions = enableMentions,
enableXPosts = enableXPosts,
Expand Down