From e5daca8f8d9186e8e4af53d7bc244915f27b04bf Mon Sep 17 00:00:00 2001 From: Thomas Horta Date: Wed, 29 Mar 2023 12:25:02 -0300 Subject: [PATCH 1/3] point field to remote config, enabled by default --- .../config/WPIndividualPluginOverlayFeatureConfig.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/WPIndividualPluginOverlayFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/WPIndividualPluginOverlayFeatureConfig.kt index 9c3525954238..2da8f4e2af9c 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/config/WPIndividualPluginOverlayFeatureConfig.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/config/WPIndividualPluginOverlayFeatureConfig.kt @@ -1,15 +1,18 @@ package org.wordpress.android.util.config import org.wordpress.android.BuildConfig -import org.wordpress.android.annotation.FeatureInDevelopment +import org.wordpress.android.annotation.Feature import javax.inject.Inject -@FeatureInDevelopment +private const val WP_INDIVIDUAL_PLUGIN_OVERLAY_REMOTE_FIELD = "wp_individual_plugin_overlay" + +@Feature(WP_INDIVIDUAL_PLUGIN_OVERLAY_REMOTE_FIELD, true) class WPIndividualPluginOverlayFeatureConfig @Inject constructor( appConfig: AppConfig ) : FeatureConfig( - appConfig, - BuildConfig.WP_INDIVIDUAL_PLUGIN_OVERLAY, + appConfig, + BuildConfig.WP_INDIVIDUAL_PLUGIN_OVERLAY, + WP_INDIVIDUAL_PLUGIN_OVERLAY_REMOTE_FIELD ) { override fun isEnabled(): Boolean { return super.isEnabled() && !BuildConfig.IS_JETPACK_APP From 9976325e49a35724293c9cb844f1604df17ec5fe Mon Sep 17 00:00:00 2001 From: Thomas Horta Date: Wed, 29 Mar 2023 12:27:01 -0300 Subject: [PATCH 2/3] add release notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 7ad4456eaa10..ff126eb1a1f9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,7 +2,7 @@ 22.1 ----- - +* [**] [WordPress-only] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. 22.0 ----- From 03513650d2b72f8c614c6690314635a8a147f579 Mon Sep 17 00:00:00 2001 From: Thomas Horta Date: Wed, 29 Mar 2023 12:32:19 -0300 Subject: [PATCH 3/3] add PR number to release notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ff126eb1a1f9..4be2eef3bf60 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,7 +2,7 @@ 22.1 ----- -* [**] [WordPress-only] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. +* [**] [WordPress-only] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. [https://github.com/wordpress-mobile/WordPress-Android/pull/18199] 22.0 -----