Feature branch: Recommended Content

app/src/main/java/org/wikipedia/Constants.kt

@@ -18,6 +18,7 @@ object Constants {
     const val ARG_TITLE = "title"
     const val ARG_WIKISITE = "wikiSite"
     const val ARG_TEXT = "text"
+    const val ARG_BOOLEAN = "boolean"
     const val INTENT_APP_SHORTCUT_CONTINUE_READING = "appShortcutContinueReading"
     const val INTENT_APP_SHORTCUT_RANDOMIZER = "appShortcutRandomizer"
     const val INTENT_APP_SHORTCUT_SEARCH = "appShortcutSearch"
@@ -105,6 +106,7 @@ object Constants {
         USER_CONTRIB_ACTIVITY("userContribActivity"),
         EDIT_ADD_IMAGE("editAddImage"),
         SUGGESTED_EDITS_RECENT_EDITS("suggestedEditsRecentEdits"),
+        RECOMMENDED_CONTENT("recommendedContent"),
     }
 
     enum class ImageEditType(name: String) {

app/src/main/java/org/wikipedia/analytics/eventplatform/ABTest.kt → app/src/main/java/org/wikipedia/analytics/ABTest.kt

@@ -1,4 +1,4 @@
-package org.wikipedia.analytics.eventplatform
+package org.wikipedia.analytics
 
 import org.wikipedia.settings.PrefsIoUtil
 import kotlin.random.Random
@@ -24,6 +24,7 @@ open class ABTest(private val abTestName: String, private val abTestGroupCount:
     companion object {
         private const val AB_TEST_KEY_PREFIX = "ab_test_"
         const val GROUP_SIZE_2 = 2
+        const val GROUP_SIZE_3 = 3
         const val GROUP_1 = 0
         const val GROUP_2 = 1
         const val GROUP_3 = 2

app/src/main/java/org/wikipedia/analytics/metricsplatform/ArticleEvent.kt

@@ -1,7 +1,10 @@
 package org.wikipedia.analytics.metricsplatform
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.wikimedia.metrics_platform.context.PageData
 import org.wikipedia.dataclient.page.PageSummary
+import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.PageFragment
 import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.Prefs
@@ -201,9 +204,14 @@ class ArticleTocInteraction(private val fragment: PageFragment, private val numS
     }
 }
 
-class ArticleLinkPreviewInteraction : TimedMetricsEvent {
+open class ArticleLinkPreviewInteraction : TimedMetricsEvent {
     private val pageData: PageData?
-    private val source: Int
+    var source: Int
+
+    constructor(source: Int) {
+        this.source = source
+        this.pageData = null
+    }
 
     constructor(fragment: PageFragment, source: Int) {
         this.source = source
@@ -221,28 +229,73 @@ class ArticleLinkPreviewInteraction : TimedMetricsEvent {
     }
 
     fun logLinkClick() {
-        submitEvent("linkclick")
+        submitEvent("linkclick", ContextData(timeSpentMillis = timer.elapsedMillis))
     }
 
-    fun logNavigate() {
-        submitEvent(if (Prefs.isLinkPreviewEnabled) "navigate" else "disabled")
+    open fun logNavigate() {
+        submitEvent(if (Prefs.isLinkPreviewEnabled) "navigate" else "disabled", ContextData(timeSpentMillis = timer.elapsedMillis))
     }
 
     fun logCancel() {
-        submitEvent("cancel")
+        submitEvent("cancel", ContextData(timeSpentMillis = timer.elapsedMillis))
     }
 
-    private fun submitEvent(action: String) {
+    protected fun submitEvent(action: String, contextData: ContextData) {
         submitEvent(
             "android.product_metrics.article_link_preview_interaction",
             "article_link_preview_interaction",
             getInteractionData(
                 action,
                 null,
                 source.toString(),
-                "time_spent_ms.${timer.elapsedMillis}",
+                JsonUtil.encodeToString(contextData)
             ),
             pageData
         )
     }
+
+    @Serializable
+    class ContextData(
+        @SerialName("group_assigned") val groupAssigned: String? = null,
+        @SerialName("time_spent_ms") val timeSpentMillis: Long? = null,
+        @SerialName("rec_shown") val recShown: Boolean? = null,
+        @SerialName("feedback_shown") val feedbackShown: Boolean? = null,
+        @SerialName("feedback_select") val feedbackSelect: String? = null,
+        @SerialName("feedback_text") val feedbackText: String? = null,
+    )
+}
+
+class ExperimentalLinkPreviewInteraction(
+    source: Int,
+    private val groupAssigned: String,
+    private val recommendationsShown: Boolean? = null
+) : ArticleLinkPreviewInteraction(source) {
+
+    fun logImpression(feedbackShown: Boolean? = null, feedbackSelect: String? = null,
+                      feedbackText: String? = null) {
+        submitEvent("impression", ContextData(
+            timeSpentMillis = timer.elapsedMillis,
+            groupAssigned = groupAssigned,
+            recShown = recommendationsShown,
+            feedbackShown = feedbackShown,
+            feedbackSelect = feedbackSelect,
+            feedbackText = feedbackText
+        ))
+    }
+
+    override fun logNavigate() {
+        logNavigate(null, null, null)
+    }
+
+    fun logNavigate(feedbackShown: Boolean? = null, feedbackSelect: String? = null,
+                             feedbackText: String? = null) {
+        submitEvent("navigate", ContextData(
+            timeSpentMillis = timer.elapsedMillis,
+            groupAssigned = groupAssigned,
+            recShown = recommendationsShown,
+            feedbackShown = feedbackShown,
+            feedbackSelect = feedbackSelect,
+            feedbackText = feedbackText
+        ))
+    }
 }

app/src/main/java/org/wikipedia/analytics/metricsplatform/RecommendedContentABCTest.kt

@@ -0,0 +1,13 @@
+package org.wikipedia.analytics.metricsplatform
+
+import org.wikipedia.analytics.ABTest
+
+class RecommendedContentABCTest : ABTest("recommendedContent", GROUP_SIZE_3) {
+    fun getGroupName(): String {
+        return when (group) {
+            GROUP_2 -> "general"
+            GROUP_3 -> "personal"
+            else -> "control"
+        }
+    }
+}

app/src/main/java/org/wikipedia/analytics/metricsplatform/RecommendedContentAnalyticsHelper.kt

@@ -0,0 +1,25 @@
+package org.wikipedia.analytics.metricsplatform
+
+import org.wikipedia.util.GeoUtil
+import org.wikipedia.util.ReleaseUtil
+import java.time.LocalDate
+
+class RecommendedContentAnalyticsHelper {
+
+    companion object {
+        val abcTest = RecommendedContentABCTest()
+
+        private val enabledCountries = listOf(
+            // sub-saharan africa
+            "AO", "BJ", "BW", "IO", "BF", "BI", "CV", "CM", "CF", "TD", "KM", "CG", "IC", "CD", "DJ", "GQ", "ER",
+            "SZ", "ET", "GA", "GM", "GH", "GN", "GW", "KE", "LS", "LR", "MG", "MW", "ML", "MR", "YT", "MZ", "NA",
+            "NE", "NG", "RE", "RW", "SH", "ST", "SN", "SC", "SL", "SO", "ZA", "SS", "TG", "UG", "TZ", "ZM", "ZW",
+            // south asia
+            "IN", "PK", "BD", "LK", "MU", "MV", "NP", "BT", "AF"
+        )
+
+        val recommendedContentEnabled get() = ReleaseUtil.isPreBetaRelease ||
+                (enabledCountries.contains(GeoUtil.geoIPCountry.orEmpty()) &&
+                LocalDate.now() <= LocalDate.of(2024, 10, 2))
+    }
+}

app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt

@@ -689,7 +689,7 @@ class ArticleEditDetailsFragment : Fragment(), WatchlistExpiryDialog.Callback, M
         if (Prefs.showOneTimeRecentEditsFeedbackForm) {
             sendPatrollerExperienceEvent("toolbar_first_feedback", "pt_feedback")
         }
-        SurveyDialog.showFeedbackOptionsDialog(requireActivity(), InvokeSource.SUGGESTED_EDITS_RECENT_EDITS)
+        SurveyDialog.showFeedbackOptionsDialog(requireActivity(), invokeSource = InvokeSource.SUGGESTED_EDITS_RECENT_EDITS)
     }
 
     private fun updateActionButtons() {

app/src/main/java/org/wikipedia/history/HistoryEntry.kt

@@ -100,5 +100,7 @@ class HistoryEntry(
         const val SOURCE_SINGLE_WEBVIEW = 40
         const val SOURCE_SUGGESTED_EDITS_RECENT_EDITS = 41
         const val SOURCE_FEED_PLACES = 42
+        const val SOURCE_RECOMMENDED_CONTENT_PERSONALIZED = 43
+        const val SOURCE_RECOMMENDED_CONTENT_GENERALIZED = 44
     }
 }

app/src/main/java/org/wikipedia/history/db/HistoryEntryWithImageDao.kt

@@ -41,14 +41,13 @@ interface HistoryEntryWithImageDao {
         else SearchResults(entries.take(3).map { SearchResult(toHistoryEntry(it).title, SearchResult.SearchResultType.HISTORY) }.toMutableList())
     }
 
+    fun filterHistoryItemsWithoutTime(searchQuery: String = ""): List<HistoryEntry> {
+        return findEntriesBySearchTerm("%${normalizedQuery(searchQuery)}%").map { toHistoryEntry(it) }
+    }
+
     fun filterHistoryItems(searchQuery: String): List<Any> {
         val list = mutableListOf<Any>()
-        val normalizedQuery = StringUtils.stripAccents(searchQuery).lowercase(Locale.getDefault())
-            .replace("\\", "\\\\")
-            .replace("%", "\\%")
-            .replace("_", "\\_")
-
-        val entries = findEntriesBySearchTerm("%$normalizedQuery%")
+        val entries = findEntriesBySearchTerm("%${normalizedQuery(searchQuery)}%")
 
         for (i in entries.indices) {
             // Check the previous item, see if the times differ enough
@@ -78,6 +77,13 @@ interface HistoryEntryWithImageDao {
         return entries.map { toHistoryEntry(it) }
     }
 
+    private fun normalizedQuery(searchQuery: String): String {
+        return StringUtils.stripAccents(searchQuery).lowercase(Locale.getDefault())
+            .replace("\\", "\\\\")
+            .replace("%", "\\%")
+            .replace("_", "\\_")
+    }
+
     private fun toHistoryEntry(entryWithImage: HistoryEntryWithImage): HistoryEntry {
         val entry = HistoryEntry(entryWithImage.authority, entryWithImage.lang, entryWithImage.apiTitle,
             entryWithImage.displayTitle, 0, entryWithImage.namespace, entryWithImage.timestamp,

app/src/main/java/org/wikipedia/page/PageFragment.kt

@@ -101,19 +101,22 @@ import org.wikipedia.theme.ThemeChooserDialog
 import org.wikipedia.util.ActiveTimer
 import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.FeedbackUtil
+import org.wikipedia.util.ReleaseUtil
 import org.wikipedia.util.ResourceUtil
 import org.wikipedia.util.ShareUtil
 import org.wikipedia.util.ThrowableUtil
 import org.wikipedia.util.UriUtil
 import org.wikipedia.util.log.L
 import org.wikipedia.views.ObservableWebView
 import org.wikipedia.views.PageActionOverflowView
+import org.wikipedia.views.SurveyDialog
 import org.wikipedia.views.ViewUtil
 import org.wikipedia.watchlist.WatchlistExpiry
 import org.wikipedia.watchlist.WatchlistExpiryDialog
 import org.wikipedia.wiktionary.WiktionaryDialog
 import java.time.Duration
 import java.time.Instant
+import java.util.concurrent.TimeUnit
 
 class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.CommunicationBridgeListener, ThemeChooserDialog.Callback,
     ReferenceDialog.Callback, WiktionaryDialog.Callback, WatchlistExpiryDialog.Callback {
@@ -685,6 +688,31 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         }
     }
 
+    private fun maybeShowRecommendedContentSurvey() {
+        if (Prefs.recommendedContentSurveyShown) {
+             return
+        }
+        historyEntry?.let {
+            val duration = if (ReleaseUtil.isDevRelease) 1L else 10L
+            binding.pageContentsContainer.postDelayed({
+                if (!isAdded) {
+                    return@postDelayed
+                }
+                if (it.source == HistoryEntry.SOURCE_RECOMMENDED_CONTENT_PERSONALIZED ||
+                    it.source == HistoryEntry.SOURCE_RECOMMENDED_CONTENT_GENERALIZED) {
+                    SurveyDialog.showFeedbackOptionsDialog(
+                        requireActivity(),
+                        titleId = R.string.recommended_content_survey_dialog_title,
+                        messageId = R.string.recommended_content_survey_dialog_message,
+                        snackbarMessageId = R.string.recommended_content_survey_dialog_submitted_message,
+                        invokeSource = InvokeSource.RECOMMENDED_CONTENT,
+                        historyEntry = it
+                    )
+                }
+            }, TimeUnit.SECONDS.toMillis(duration))
+        }
+    }
+
     private fun showFindReferenceInPage(referenceAnchor: String,
                                         backLinksList: List<String?>,
                                         referenceText: String) {
@@ -928,6 +956,7 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
             webView.visibility = View.VISIBLE
         }
         maybeShowAnnouncement()
+        maybeShowRecommendedContentSurvey()
         bridge.onMetadataReady()
         // Explicitly set the top margin (even though it might have already been set in the setup
         // handler), since the page metadata might have altered the lead image display state.