Support new "reader" deeplinks (#22369)

* Supporting new format

* Proper logic handling

* Moving manifest lines to avoid llint issue

* Updating baseline for lint errors

Author: adalpari

WordPress/src/main/AndroidManifest.xml

@@ -657,6 +657,18 @@
                     android:scheme="http" >
                 </data>
 
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="https" >
+                </data>
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="http" >
+                </data>
+
                 <action android:name="org.wordpress.android.action.VIEW_POST" />
                 <action android:name="android.intent.action.VIEW" />
 

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

@@ -66,6 +66,7 @@ class ReaderLinkHandler
      * `wordpress://viewpost?blogId={blogId}&postId={postId}`
      * wordpress.com/read/feeds/feedId/posts/feedItemId
      * wordpress.com/read/blogs/feedId/posts/feedItemId
+     * wordpress.com/reader/feeds/feedId/posts/feedItemId
      * domain.wordpress.com/2.../../../postId
      * domain.wordpress.com/19../../../postId
      */
@@ -95,9 +96,11 @@ class ReaderLinkHandler
                 buildString {
                     val segments = uri.pathSegments
                     // Handled URLs look like this: http[s]://wordpress.com/read/feeds/{feedId}/posts/{feedItemId}
-                    // with the first segment being 'read'.
+                    // or http[s]://wordpress.com/reader/feeds/{feedId}/posts/{feedItemId}
+                    // with the first segment being 'read' or 'reader'.
                     append(stripHost(uri))
-                    if (segments.firstOrNull() == "read") {
+                    val firstSegment = segments.firstOrNull()
+                    if (firstSegment == "read" || firstSegment == "reader") {
                         appendReadPath(segments)
                     } else if (segments.size > DATE_URL_SEGMENTS) {
                         append("/YYYY/MM/DD/$POST_ID")

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.kt

@@ -431,11 +431,12 @@ class ReaderPostPagerActivity : BaseAppCompatActivity() {
         val segments = uri.pathSegments
 
         // Handled URLs look like this: http[s]://wordpress.com/read/feeds/{feedId}/posts/{feedItemId}
-        // with the first segment being 'read'.
+        // or http[s]://wordpress.com/reader/feeds/{feedId}/posts/{feedItemId}
+        // with the first segment being 'read' or 'reader'.
         if (segments != null) {
             // Builds stripped URI for tracking purposes
             val wrappedUri = UriWrapper(uri)
-            if (segments[0] == "read") {
+            if (segments[0] == "read" || segments[0] == "reader") {
                 if (segments.size > 2) {
                     blogIdentifier = segments[2]
 

WordPress/src/test/java/org/wordpress/android/ui/deeplinks/handlers/ReaderLinkHandlerTest.kt

@@ -189,6 +189,16 @@ class ReaderLinkHandlerTest : BaseUnitTest() {
         assertThat(strippedUrl).isEqualTo("wordpress.com/read/blogs/feedId/posts/feedItemId")
     }
 
+    @Test
+    fun `correctly strips reader feeds URI`() {
+        val uri = buildUri("wordpress.com", "reader", "feeds", feedId.toString(), "posts", postId.toString())
+
+        val strippedUrl = readerLinkHandler.stripUrl(uri)
+
+        // Note: both 'reader' and 'read' paths are normalized to 'read' for analytics tracking
+        assertThat(strippedUrl).isEqualTo("wordpress.com/read/feeds/feedId/posts/feedItemId")
+    }
+
     @Test
     fun `correctly strips 2xxx URI`() {
         val uri = buildUri("wordpress.com", "2020", "10", "1", postId.toString())

config/lint/baseline.xml

@@ -4918,6 +4918,28 @@
             column="17"/>
     </issue>
 
+    <issue
+        id="IntentFilterUniqueDataAttributes"
+        message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
+        errorLine1="                &lt;data"
+        errorLine2="                ^">
+        <location
+            file="src/main/AndroidManifest.xml"
+            line="660"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="IntentFilterUniqueDataAttributes"
+        message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
+        errorLine1="                &lt;data"
+        errorLine2="                ^">
+        <location
+            file="src/main/AndroidManifest.xml"
+            line="666"
+            column="17"/>
+    </issue>
+
     <issue
         id="NonConstantResourceId"
         message="Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements"