Merge release/26.4 into trunk

WordPress/build.gradle

@@ -493,6 +493,8 @@ dependencies {
     testImplementation(libs.assertj.core)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.turbine)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.test.core)
 
     androidTestImplementation project(path:':libs:mocks')
 

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -10,6 +10,14 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
+msgctxt "release_note_264"
+msgid ""
+"26.4:\n"
+"- The app icon has a single-color option to match your device’s other themed icons. #aesthetic\n"
+"- Large, high-resolution images are more likely to load (but might take a few seconds).\n"
+"- We removed HTML tags from the Reader comment editor and fixed the “Subscribe” button.\n"
+msgstr ""
+
 msgctxt "release_note_263"
 msgid ""
 "26.3:\n"
@@ -18,14 +26,6 @@ msgid ""
 "The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!\n"
 msgstr ""
 
-msgctxt "release_note_262"
-msgid ""
-"26.2:\n"
-"- Connect your self-hosted sites to Jetpack with our new streamlined flow—available right from Stats and Notifications.\n"
-"- We've added support for mentions in the experimental editor—tag your friends and collaborators with ease.\n"
-"- Media selection just got more accessible for everyone.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
 msgctxt "play_store_app_title"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,2 +1,3 @@
-* [*] Monochrome icon support for the WordPress app [#22321]
-* [*] Fixed high-resolution image loading issues [#22235]
+- The app icon has a single-color option to match your device’s other themed icons. #aesthetic
+- Large, high-resolution images are more likely to load (but might take a few seconds).
+- We removed HTML tags from the Reader comment editor and fixed the “Subscribe” button.

WordPress/metadata/PlayStoreStrings.po

@@ -10,6 +10,13 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
+msgctxt "release_note_264"
+msgid ""
+"26.4:\n"
+"- The app icon has a single-color option to match your device’s other themed icons. #aesthetic\n"
+"- Large, high-resolution images are more likely to load (but might take a few seconds).\n"
+msgstr ""
+
 msgctxt "release_note_263"
 msgid ""
 "26.3:\n"
@@ -20,13 +27,6 @@ msgid ""
 "The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!\n"
 msgstr ""
 
-msgctxt "release_note_262"
-msgid ""
-"26.2:\n"
-"- We've added support for mentions in the experimental editor—tag your friends and collaborators with ease.\n"
-"- Media selection just got more accessible for everyone.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"

WordPress/metadata/release_notes.txt

@@ -1,2 +1,2 @@
-* [*] Monochrome icon support for the WordPress app [#22321]
-* [*] Fixed high-resolution image loading issues [#22235]
+- The app icon has a single-color option to match your device’s other themed icons. #aesthetic
+- Large, high-resolution images are more likely to load (but might take a few seconds).

WordPress/src/main/AndroidManifest.xml

@@ -581,6 +581,82 @@
                     android:pathPattern="/site-monitoring/.*"
                     android:scheme="http" />
 
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+
             </intent-filter>
         </activity-alias>
 
@@ -612,49 +688,71 @@
                 <data
                     android:host="wordpress.com"
                     android:pathPattern="/read/feeds/.*/posts/.*"
-                    android:scheme="https" >
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="wordpress.com"
                     android:pathPattern="/read/feeds/.*/posts/.*"
-                    android:scheme="http" >
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="wordpress.com"
                     android:pathPattern="/read/blogs/.*/posts/.*"
-                    android:scheme="https" >
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="wordpress.com"
                     android:pathPattern="/read/blogs/.*/posts/.*"
-                    android:scheme="http" >
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="*.wordpress.com"
                     android:pathPattern="/2.../../../.*"
-                    android:scheme="https" >
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="*.wordpress.com"
                     android:pathPattern="/2.../../../.*"
-                    android:scheme="http" >
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="*.wordpress.com"
                     android:pathPattern="/19../../../.*"
-                    android:scheme="https" >
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data
                     android:host="*.wordpress.com"
                     android:pathPattern="/19../../../.*"
-                    android:scheme="http" >
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
+                </data>
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="https"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
+                </data>
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="http"
+                    tools:ignore="IntentFilterUniqueDataAttributes" >
                 </data>
 
                 <data

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

@@ -338,6 +338,43 @@
         context.startActivity(intent);
     }
 
+    public static void viewReaderDiscoverInNewStack(Context context) {
+        Intent intent = getMainActivityInNewStack(context);
+        intent.putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        intent.putExtra(WPMainActivity.ARG_READER_DISCOVER_TAB, true);
+        context.startActivity(intent);
+    }
+
+    public static void viewReaderFeedInNewStack(Context context, long feedId) {
+        Intent mainActivityIntent = getMainActivityInNewStack(context)
+                .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        Intent feedIntent = ReaderActivityLauncher.buildReaderFeedIntent(context, feedId, "deeplink");
+        TaskStackBuilder.create(context)
+                        .addNextIntent(mainActivityIntent)
+                        .addNextIntent(feedIntent)
+                        .startActivities();
+    }
+
+    public static void viewReaderSearchInNewStack(Context context) {
+        Intent mainActivityIntent = getMainActivityInNewStack(context)
+                .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        Intent searchIntent = ReaderActivityLauncher.createReaderSearchIntent(context);
+        TaskStackBuilder.create(context)
+                        .addNextIntent(mainActivityIntent)
+                        .addNextIntent(searchIntent)
+                        .startActivities();
+    }
+
+    public static void viewReaderTagInNewStack(@NonNull Context context, @NonNull String tagSlug) {
+        Intent mainActivityIntent = getMainActivityInNewStack(context)
+                .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        Intent tagIntent = ReaderActivityLauncher.buildReaderTagIntent(context, tagSlug, "deeplink");
+        TaskStackBuilder.create(context)
+                        .addNextIntent(mainActivityIntent)
+                        .addNextIntent(tagIntent)
+                        .startActivities();
+    }
+
     public static void viewPostDeeplinkInNewStack(Context context, Uri uri) {
         Intent mainActivityIntent = getMainActivityInNewStack(context)
                 .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
@@ -515,7 +552,7 @@
 
     public static PendingIntent buildStatsPendingIntentOverMainActivityInNewStack(Context context, SiteModel site,
                                                                                   @Nullable StatsTimeframe timeframe,
                                                                                   @Nullable String period,
                                                                                   @Nullable NotificationType type,
                                                                                   @NonNull
                                                                                   StatsLaunchedFrom launchedFrom,
@@ -1554,7 +1591,7 @@
         intent.putExtra(SignupEpilogueActivity.EXTRA_SIGNUP_USERNAME, username);
         intent.putExtra(SignupEpilogueActivity.EXTRA_SIGNUP_IS_EMAIL, isEmail);
         activity.startActivityForResult(intent, RequestCodes.SHOW_SIGNUP_EPILOGUE_AND_RETURN);
     }
 
     public static void showPostSignupInterstitial(Context context) {
         final Intent parentIntent = new Intent(context, WPMainActivity.class);

WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt

@@ -18,7 +18,11 @@
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPages
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPagesForSite
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenQRCodeAuthFlow
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenFeedInReader
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReaderDiscover
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReaderSearch
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenTagInReader
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStats
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSite
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSiteAndTimeframe
@@ -37,7 +41,7 @@
 @Inject constructor(private val activityNavigator: ActivityNavigator) {
     @Suppress("ComplexMethod", "LongMethod")
     fun handleNavigationAction(navigateAction: NavigateAction, activity: AppCompatActivity) {
         when (navigateAction) {
             LoginForResult -> ActivityLauncher.loginForDeeplink(activity)
             StartCreateSiteFlow -> {
                 ActivityLauncher.showMainActivityAndSiteCreationActivity(activity, DEEP_LINK)
@@ -78,6 +82,10 @@
             )
 
             OpenReader -> ActivityLauncher.viewReaderInNewStack(activity)
+            OpenReaderDiscover -> ActivityLauncher.viewReaderDiscoverInNewStack(activity)
+            OpenReaderSearch -> ActivityLauncher.viewReaderSearchInNewStack(activity)
+            is OpenFeedInReader -> ActivityLauncher.viewReaderFeedInNewStack(activity, navigateAction.feedId)
+            is OpenTagInReader -> ActivityLauncher.viewReaderTagInNewStack(activity, navigateAction.tagSlug)
             is OpenInReader -> ActivityLauncher.viewPostDeeplinkInNewStack(activity, navigateAction.uri.uri)
             is ViewPostInReader -> ActivityLauncher.viewReaderPostDetailInNewStack(
                 activity,
@@ -123,6 +131,10 @@
         data class OpenEditorForPost(val site: SiteModel, val postId: Int) : NavigateAction()
         data class OpenEditorForSite(val site: SiteModel) : NavigateAction()
         object OpenReader : NavigateAction()
+        object OpenReaderDiscover : NavigateAction()
+        object OpenReaderSearch : NavigateAction()
+        data class OpenFeedInReader(val feedId: Long) : NavigateAction()
+        data class OpenTagInReader(val tagSlug: String) : NavigateAction()
         data class OpenInReader(val uri: UriWrapper) : NavigateAction()
         data class ViewPostInReader(val blogId: Long, val postId: Long, val uri: UriWrapper) : NavigateAction()
         object OpenEditor : NavigateAction()