Allow shared reading lists to be serialized as IDs or titles. (#3917)

Co-authored-by: Sharvani Haran <[email protected]>

Author: dbrant

app/src/main/java/org/wikipedia/dataclient/Service.kt

@@ -75,7 +75,7 @@ interface Service {
     fun getInfoByPageId(@Query("pageids") pageIds: String): Observable<MwQueryResponse>
 
     @GET(MW_API_PREFIX + "action=query&prop=info|description|pageimages&inprop=varianttitles|displaytitle&redirects=1")
-    suspend fun getPageTitlesByPageId(@Query("pageids") pageIds: String): MwQueryResponse
+    suspend fun getPageTitlesByPageIdsOrTitles(@Query("pageids") pageIds: String? = null, @Query("titles") titles: String? = null): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query")
     suspend fun getPageIds(@Query("titles") titles: String): MwQueryResponse

app/src/main/java/org/wikipedia/readinglist/ReadingListsReceiveHelper.kt

@@ -1,11 +1,14 @@
+
 package org.wikipedia.readinglist
 
 import android.content.Context
 import android.util.Base64
+import kotlinx.serialization.json.int
 import org.wikipedia.R
 import org.wikipedia.dataclient.Service
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
+import org.wikipedia.dataclient.mwapi.MwQueryPage
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.readinglist.database.ReadingList
 import org.wikipedia.readinglist.database.ReadingListPage
@@ -23,18 +26,29 @@ object ReadingListsReceiveHelper {
         val listPages = mutableListOf<ReadingListPage>()
 
         // Request API by languages
-        readingListData?.list?.forEach {
-            val wikiSite = WikiSite.forLanguageCode(it.key)
-            it.value.chunked(ReadingListsShareHelper.API_MAX_SIZE).forEach { list ->
-                val response = ServiceFactory.get(wikiSite).getPageTitlesByPageId(list.joinToString(separator = "|"))
-                response.query?.pages?.forEach { page ->
+        readingListData?.list?.forEach { map ->
+            val wikiSite = WikiSite.forLanguageCode(map.key)
+            map.value.chunked(ReadingListsShareHelper.API_MAX_SIZE).forEach { list ->
+                val listOfTitles = list.filter { it.isString }.map { it.content }
+                val listOfIds = list.filter { !it.isString }.map { it.int }
+
+                val pages = mutableListOf<MwQueryPage>()
+                if (listOfIds.isNotEmpty()) {
+                    pages.addAll(ServiceFactory.get(wikiSite).getPageTitlesByPageIdsOrTitles(pageIds = listOfIds.joinToString(separator = "|"))
+                        .query?.pages.orEmpty())
+                }
+                if (listOfTitles.isNotEmpty()) {
+                    pages.addAll(ServiceFactory.get(wikiSite).getPageTitlesByPageIdsOrTitles(titles = listOfTitles.joinToString(separator = "|"))
+                        .query?.pages.orEmpty())
+                }
+                pages.forEach {
                     val readingListPage = ReadingListPage(
                         wikiSite,
-                        page.namespace(),
-                        page.displayTitle(wikiSite.languageCode),
-                        StringUtil.addUnderscores(page.title),
-                        page.description,
-                        ImageUrlUtil.getUrlForPreferredSize(page.thumbUrl().orEmpty(), Service.PREFERRED_THUMB_SIZE),
+                        it.namespace(),
+                        it.displayTitle(wikiSite.languageCode),
+                        StringUtil.addUnderscores(it.title),
+                        it.description,
+                        ImageUrlUtil.getUrlForPreferredSize(it.thumbUrl().orEmpty(), Service.PREFERRED_THUMB_SIZE),
                         lang = wikiSite.languageCode
                     )
                     listPages.add(readingListPage)

app/src/main/java/org/wikipedia/readinglist/ReadingListsShareHelper.kt

@@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonPrimitive
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.analytics.eventplatform.ReadingListsSharingAnalyticsHelper
@@ -73,8 +74,8 @@ object ReadingListsShareHelper {
     }
 
     private fun readingListToUrlParam(readingList: ReadingList, pageIdMap: Map<String, Map<String, Int>>): String {
-        val projectUrlMap = mutableMapOf<String, Collection<Int>>()
-        pageIdMap.keys.forEach { projectUrlMap[it] = pageIdMap[it]!!.values }
+        val projectUrlMap = mutableMapOf<String, Collection<JsonPrimitive>>()
+        pageIdMap.keys.forEach { key -> projectUrlMap[key] = pageIdMap[key]!!.values.map { JsonPrimitive(it) } }
 
         // TODO: for now we're not transmitting the free-form Name and Description of a reading list.
         val exportedReadingLists = ExportedReadingLists(projectUrlMap /*, readingList.title, readingList.description */)
@@ -83,10 +84,9 @@ object ReadingListsShareHelper {
 
     @Suppress("unused")
     @Serializable
-    class ExportedReadingLists
-    (
-            val list: Map<String, Collection<Int>>,
-            val name: String? = null,
-            val description: String? = null
+    class ExportedReadingLists(
+        val list: Map<String, Collection<JsonPrimitive>>,
+        val name: String? = null,
+        val description: String? = null
     )
 }