Skip to content

Commit f01ecdc

Browse files
authored
Remove RS Pages experimental toggle; auto-enable for eligible sites (#23127)
The RS Pages list now shows automatically for any site with an application password, mirroring how RS Posts works. Removes the Feature.RS_PAGES_LIST experimental toggle and its strings; the RS Pages UI itself is unchanged.
1 parent 6fdf0bc commit f01ecdc

25 files changed

Lines changed: 3 additions & 61 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public static void viewCurrentBlogMedia(Context context, SiteModel site) {
687687
}
688688

689689
public static void viewCurrentBlogPages(@NonNull Context context, @NonNull SiteModel site) {
690-
if (shouldUseNewPagesList(context, site)) {
690+
if (shouldUseNewPagesList(site)) {
691691
context.startActivity(PagesRsListActivity.Companion.createIntent(context));
692692
AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_PAGES, site);
693693
return;
@@ -698,15 +698,8 @@ public static void viewCurrentBlogPages(@NonNull Context context, @NonNull SiteM
698698
AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_PAGES, site);
699699
}
700700

701-
private static boolean shouldUseNewPagesList(@NonNull Context context, @NonNull SiteModel site) {
702-
if (!site.hasApplicationPassword()) {
703-
return false;
704-
}
705-
ActivityLauncherEntryPoint entryPoint = EntryPointAccessors.fromApplication(
706-
context.getApplicationContext(),
707-
ActivityLauncherEntryPoint.class
708-
);
709-
return entryPoint.experimentalFeatures().isEnabled(Feature.RS_PAGES_LIST);
701+
private static boolean shouldUseNewPagesList(@Nullable SiteModel site) {
702+
return site != null && site.hasApplicationPassword();
710703
}
711704

712705
public static void viewPostTypes(@NonNull Context context, @NonNull SiteModel site) {

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeatures.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ class ExperimentalFeatures @Inject constructor(
4040
R.string.experimental_post_types,
4141
R.string.experimental_post_types_description
4242
),
43-
RS_PAGES_LIST(
44-
"rs_pages_list",
45-
R.string.experimental_rs_pages_list,
46-
R.string.experimental_rs_pages_list_description
47-
),
4843
RS_UNIFIED_COMMENTS(
4944
"rs_unified_comments",
5045
R.string.experimental_rs_comments,

WordPress/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ Language: ar
254254
<string name="scan_start_request_failed_subtitle">تعذر على Jetpack Scan إكمال فحص موقعك. يرجى التحقق لمعرفة ما إذا كان موقعك معطلاً أم لا.</string>
255255
<string name="stats_timeframe_hours">ساعات</string>
256256
<string name="post_rs_failed_to_load">فشل تحميل التدوينة</string>
257-
<string name="experimental_rs_pages_list">قائمة الصفحات الجديدة</string>
258-
<string name="experimental_rs_pages_list_description">إظهار قائمة الصفحات في واجهة مستخدم أكثر حداثة لموقع WordPress.com والمواقع المستضافة ذاتيًا باستخدام كلمات مرور التطبيقات</string>
259257
<string name="stats_error_no_site">لم يتم تحديد أي موقع</string>
260258
<string name="stats_error_api">فشل تحميل الإحصاءات</string>
261259
<string name="stats_error_unknown">حدث خطأ غير متوقع</string>

WordPress/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ Language: cs_CZ
256256
<string name="post_rs_confirm_delete_message">Tím trvale smažete tento příspěvek. Tuto akci nelze vrátit zpět.</string>
257257
<string name="post_rs_confirm_trash_message">Opravdu chcete přesunout tento příspěvek do koše?</string>
258258
<string name="post_rs_failed_to_load">Načtení příspěvku se nezdařilo</string>
259-
<string name="experimental_rs_pages_list_description">Zobrazit seznam stránek v modernějším uživatelském rozhraní pro WordPress.com a weby s vlastním hostováním pomocí aplikačních hesel</string>
260-
<string name="experimental_rs_pages_list">Seznam nových stránek</string>
261259
<string name="stats_error_admin_url_unavailable">Nelze otevřít WP Admin pro tento web</string>
262260
<string name="stats_error_parsing">Při načítání dat došlo k chybě. Zkuste to prosím znovu</string>
263261
<string name="stats_error_network">Chyba sítě. Zkontrolujte připojení a zkuste to znovu</string>

WordPress/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ Language: de
256256
<string name="post_rs_confirm_delete_message">Dadurch wird dieser Beitrag endgültig gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</string>
257257
<string name="post_rs_confirm_trash_message">Möchtest du diesen Beitrag wirklich in den Papierkorb verschieben?</string>
258258
<string name="post_rs_failed_to_load">Beitrag konnte nicht geladen werden</string>
259-
<string name="experimental_rs_pages_list_description">Seitenliste in einer moderneren Benutzeroberfläche für WordPress.com und selbst gehostete Websites mit Anwendungspasswörtern anzeigen</string>
260-
<string name="experimental_rs_pages_list">Neue Seitenliste</string>
261259
<string name="stats_error_admin_url_unavailable">WP Admin kann für diese Website nicht geöffnet werden</string>
262260
<string name="stats_error_parsing">Beim Laden der Daten ist ein Problem aufgetreten. Bitte erneut versuchen</string>
263261
<string name="stats_error_network">Netzwerkfehler. Bitte überprüfe deine Verbindung und versuche es erneut</string>

WordPress/src/main/res/values-en-rGB/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ Language: en_GB
256256
<string name="post_rs_confirm_delete_message">This will permanently delete this post. This action cannot be undone.</string>
257257
<string name="post_rs_confirm_trash_message">Are you sure you want to bin this post?</string>
258258
<string name="post_rs_failed_to_load">Failed to load post</string>
259-
<string name="experimental_rs_pages_list_description">Show pages list in a more modern UI for WordPress.com and self-hosted sites with application passwords</string>
260-
<string name="experimental_rs_pages_list">New Pages List</string>
261259
<string name="stats_error_admin_url_unavailable">Unable to open WP Admin for this site</string>
262260
<string name="stats_error_parsing">There was a problem loading the data. Please try again</string>
263261
<string name="stats_error_network">Network error. Please check your connection and try again</string>

WordPress/src/main/res/values-es-rCO/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ Language: es_CO
256256
<string name="post_rs_confirm_delete_message">Esto eliminará permanentemente esta entrada. Esta acción no se puede deshacer.</string>
257257
<string name="post_rs_confirm_trash_message">¿Seguro que quieres enviar a la papelera esta entrada?</string>
258258
<string name="post_rs_failed_to_load">No se ha podido cargar la entrada</string>
259-
<string name="experimental_rs_pages_list_description">Mostrar la lista de páginas con una interfaz de usuario más moderna para WordPress.com y sitios autoalojados con contraseñas de aplicación</string>
260-
<string name="experimental_rs_pages_list">Lista de páginas nuevas</string>
261259
<string name="stats_error_admin_url_unavailable">No se puede abrir WP Admin para este sitio</string>
262260
<string name="stats_error_parsing">Se ha producido un problema al cargar los datos. Inténtalo de nuevo.</string>
263261
<string name="stats_error_network">Error de red. Comprueba la conexión e inténtalo de nuevo</string>

WordPress/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ Language: es
256256
<string name="post_rs_confirm_delete_message">Esto eliminará permanentemente esta entrada. Esta acción no se puede deshacer.</string>
257257
<string name="post_rs_confirm_trash_message">¿Seguro que quieres enviar a la papelera esta entrada?</string>
258258
<string name="post_rs_failed_to_load">No se ha podido cargar la entrada</string>
259-
<string name="experimental_rs_pages_list_description">Mostrar la lista de páginas con una interfaz de usuario más moderna para WordPress.com y sitios autoalojados con contraseñas de aplicación</string>
260-
<string name="experimental_rs_pages_list">Lista de páginas nuevas</string>
261259
<string name="stats_error_admin_url_unavailable">No se puede abrir WP Admin para este sitio</string>
262260
<string name="stats_error_parsing">Se ha producido un problema al cargar los datos. Inténtalo de nuevo.</string>
263261
<string name="stats_error_network">Error de red. Comprueba la conexión e inténtalo de nuevo</string>

WordPress/src/main/res/values-fr-rCA/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ Language: fr
244244
<string name="post_rs_confirm_delete_message">Cet article sera définitivement supprimé. Cette action est irréversible.</string>
245245
<string name="post_rs_confirm_trash_message">Voulez-vous vraiment déplacer cet article vers la corbeille ?</string>
246246
<string name="post_rs_failed_to_load">Échec du chargement de l’article</string>
247-
<string name="experimental_rs_pages_list_description">Affiche la liste des pages dans une interface utilisateur plus moderne pour WordPress.com et les sites auto-hébergés avec des mots de passe d’application</string>
248-
<string name="experimental_rs_pages_list">Nouvelle liste de pages</string>
249247
<string name="stats_error_admin_url_unavailable">Impossible d’ouvrir WP Admin pour ce site</string>
250248
<string name="stats_error_parsing">Un problème est survenu lors du chargement des données. Veuillez réessayer.</string>
251249
<string name="stats_error_network">Erreur réseau. Veuillez vérifier votre connexion et réessayer.</string>

WordPress/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ Language: fr
244244
<string name="post_rs_confirm_delete_message">Cet article sera définitivement supprimé. Cette action est irréversible.</string>
245245
<string name="post_rs_confirm_trash_message">Voulez-vous vraiment déplacer cet article vers la corbeille ?</string>
246246
<string name="post_rs_failed_to_load">Échec du chargement de l’article</string>
247-
<string name="experimental_rs_pages_list_description">Affiche la liste des pages dans une interface utilisateur plus moderne pour WordPress.com et les sites auto-hébergés avec des mots de passe d’application</string>
248-
<string name="experimental_rs_pages_list">Nouvelle liste de pages</string>
249247
<string name="stats_error_admin_url_unavailable">Impossible d’ouvrir WP Admin pour ce site</string>
250248
<string name="stats_error_parsing">Un problème est survenu lors du chargement des données. Veuillez réessayer.</string>
251249
<string name="stats_error_network">Erreur réseau. Veuillez vérifier votre connexion et réessayer.</string>

0 commit comments

Comments
 (0)