Merge branch 'main' into Remove_Date

Author: Isira-Seneviratne

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk 21
         targetSdk 34
-        versionCode 50466
+        versionCode 50467
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -168,18 +168,18 @@ dependencies {
     // use http://gradleplease.appspot.com/ or http://search.maven.org/.
     // Debug with ./gradlew -q app:dependencies --configuration compile
 
-    String okHttpVersion = '4.10.0'
+    String okHttpVersion = '4.12.0'
     String retrofitVersion = '2.9.0'
-    String glideVersion = '4.15.1'
+    String glideVersion = '4.16.0'
     String mockitoVersion = '5.2.0'
-    String leakCanaryVersion = '2.12'
+    String leakCanaryVersion = '2.13'
     String kotlinCoroutinesVersion = '1.7.3'
     String firebaseMessagingVersion = '23.4.0'
     String mlKitVersion = '17.0.4'
     String roomVersion = "2.6.1"
     String espressoVersion = '3.5.1'
-    String serialization_version = '1.5.1'
-    String metricsVersion = '2.0'
+    String serialization_version = '1.6.2'
+    String metricsVersion = '2.1'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
@@ -219,9 +219,9 @@ dependencies {
     implementation "io.reactivex.rxjava3:rxjava:3.1.8"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     implementation 'org.apache.commons:commons-lang3:3.14.0'
-    implementation 'org.jsoup:jsoup:1.17.1'
+    implementation 'org.jsoup:jsoup:1.17.2'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'com.github.skydoves:balloon:1.6.3'
+    implementation 'com.github.skydoves:balloon:1.6.4'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
 
     implementation("androidx.room:room-runtime:$roomVersion")

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

@@ -85,7 +85,7 @@ class LongPressHandler(
                         (view.rootView as ViewGroup).addView(tempView)
                         anchorView = tempView
                     }
-                    LongPressMenu(anchorView, true, callback).show(entry)
+                    LongPressMenu(anchorView, callback = callback).show(entry)
                 }
             }
         }

app/src/main/java/org/wikipedia/analytics/eventplatform/AppInteractionEvent.kt

@@ -1,20 +1,21 @@
 package org.wikipedia.analytics.eventplatform
 
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 @Suppress("unused")
 @Serializable
+@OptIn(ExperimentalSerializationApi::class)
 @SerialName("/analytics/mobile_apps/app_interaction/1.0.0")
 class AppInteractionEvent(
     private val action: String,
     private val active_interface: String,
     private val action_data: String,
     private val primary_language: String,
     private val wiki_id: String,
-    private var platform: String,
-) : MobileAppsEvent(STREAM_NAME) {
-    companion object {
-        var STREAM_NAME = "app_donor_experience"
-    }
-}
+    @Transient private val streamName: String = "",
+    @EncodeDefault(EncodeDefault.Mode.ALWAYS) private val platform: String = "android",
+) : MobileAppsEvent(streamName)

app/src/main/java/org/wikipedia/analytics/eventplatform/BreadCrumbLogEvent.kt

@@ -1,5 +1,6 @@
 package org.wikipedia.analytics.eventplatform
 
+import android.app.Activity
 import android.content.Context
 import android.view.MenuItem
 import android.view.View
@@ -8,6 +9,7 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.wikipedia.Constants
 import org.wikipedia.WikipediaApp
 import org.wikipedia.settings.SettingsActivity
 import org.wikipedia.util.log.L
@@ -54,7 +56,9 @@ class BreadCrumbLogEvent(
         }
 
         fun logScreenShown(context: Context, fragment: Fragment? = null) {
-            EventPlatformClient.submit(BreadCrumbLogEvent(BreadCrumbViewUtil.getReadableScreenName(context, fragment), "show"))
+            val invokeSource = (fragment?.activity?.intent ?: (context as? Activity)?.intent)?.getSerializableExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE) as? Constants.InvokeSource
+            EventPlatformClient.submit(BreadCrumbLogEvent(BreadCrumbViewUtil.getReadableScreenName(context, fragment),
+                "show" + invokeSource?.let { ".from." + it.value }.orEmpty()))
         }
 
         fun logBackPress(context: Context) {

app/src/main/java/org/wikipedia/analytics/eventplatform/DonorExperienceEvent.kt

@@ -5,8 +5,6 @@ import org.wikipedia.WikipediaApp
 class DonorExperienceEvent {
 
     companion object {
-        private const val STREAM_NAME = "app_donor_experience"
-
         fun logImpression(activeInterface: String, campaignId: String? = null, wikiId: String = "") {
             submitDonorExperienceEvent("impression", activeInterface, getActionDataString(campaignId), wikiId)
         }
@@ -35,15 +33,14 @@ class DonorExperienceEvent {
             actionData: String,
             wikiId: String
         ) {
-            AppInteractionEvent.STREAM_NAME = STREAM_NAME
             EventPlatformClient.submit(
                 AppInteractionEvent(
                     action,
                     activeInterface,
                     actionData,
                     WikipediaApp.instance.languageState.appLanguageCode,
                     wikiId,
-                    "android"
+                    "app_donor_experience"
                 )
             )
         }

app/src/main/java/org/wikipedia/analytics/eventplatform/EventPlatformClient.kt

@@ -151,9 +151,6 @@ object EventPlatformClient {
          * can contain events of different streams
          */
         private fun send() {
-            if (!Prefs.isEventLoggingEnabled) {
-                return
-            }
             QUEUE.groupBy { it.stream }.forEach { (stream, events) ->
                 sendEventsForStream(STREAM_CONFIGS[stream]!!, events)
             }

app/src/main/java/org/wikipedia/analytics/eventplatform/PatrollerExperienceEvent.kt

@@ -6,8 +6,6 @@ import org.wikipedia.settings.Prefs
 class PatrollerExperienceEvent {
 
     companion object {
-        private const val STREAM_NAME = "app_patroller_experience"
-
         fun logImpression(activeInterface: String) {
             submitPatrollerActivityEvent("impression", activeInterface)
         }
@@ -44,15 +42,14 @@ class PatrollerExperienceEvent {
         }
 
         private fun submitPatrollerActivityEvent(action: String, activeInterface: String, actionData: String = "") {
-            AppInteractionEvent.STREAM_NAME = STREAM_NAME
             EventPlatformClient.submit(
                 AppInteractionEvent(
                     action,
                     activeInterface,
                     actionData,
                     WikipediaApp.instance.languageState.appLanguageCode,
                     Prefs.recentEditsWikiCode,
-                    "android"
+                    "app_patroller_experience"
                 )
             )
         }

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

@@ -1,6 +1,7 @@
 package org.wikipedia.analytics.metricsplatform
 
 import org.wikimedia.metrics_platform.context.PageData
+import org.wikipedia.dataclient.page.PageSummary
 import org.wikipedia.page.PageFragment
 import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.Prefs
@@ -22,6 +23,7 @@ class ArticleFindInPageInteraction(private val fragment: PageFragment) : TimedMe
 
     fun logDone() {
         submitEvent(
+            "android.product_metrics.find_in_page_interaction",
             "/analytics/mobile_apps/product_metrics/android_find_in_page_interaction/1.0.0",
             "find_in_page_interaction",
             mapOf(
@@ -142,6 +144,7 @@ class ArticleToolbarInteraction(private val fragment: PageFragment) : TimedMetri
     private fun submitEvent(action: String) {
 
         submitEvent(
+            "android.product_metrics.article_toolbar_interaction",
             "article_toolbar_interaction",
             getInteractionData(
                 "article_toolbar_interaction",
@@ -183,6 +186,7 @@ class ArticleTocInteraction(private val fragment: PageFragment, private val numS
             return
         }
         submitEvent(
+            "android.product_metrics.article_toc_interaction",
             "/analytics/mobile_apps/product_metrics/android_article_toc_interaction/1.0.0",
             "article_toc_interaction",
             mapOf(
@@ -211,6 +215,11 @@ class ArticleLinkPreviewInteraction : TimedMetricsEvent {
         pageData = getPageData(pageTitle, pageId)
     }
 
+    constructor(pageTitle: PageTitle, summary: PageSummary, source: Int) {
+        this.source = source
+        pageData = getPageData(pageTitle, summary)
+    }
+
     fun logLinkClick() {
         submitEvent("linkclick")
     }
@@ -225,6 +234,7 @@ class ArticleLinkPreviewInteraction : TimedMetricsEvent {
 
     private fun submitEvent(action: String) {
         submitEvent(
+            "android.product_metrics.article_link_preview_interaction",
             "article_link_preview_interaction",
             getInteractionData(
                 "article_link_preview_interaction",

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

@@ -7,28 +7,31 @@ import org.wikimedia.metrics_platform.context.PerformerData
 import org.wikipedia.WikipediaApp
 import org.wikipedia.analytics.eventplatform.EventPlatformClient
 import org.wikipedia.auth.AccountUtil
+import org.wikipedia.dataclient.page.PageSummary
 import org.wikipedia.page.Namespace
 import org.wikipedia.page.PageFragment
 import org.wikipedia.page.PageTitle
-import org.wikipedia.settings.Prefs
 import org.wikipedia.util.ReleaseUtil
 
 open class MetricsEvent {
 
     /**
      * Submit an event to the Metrics Platform using a base interaction schema
      *
+     * @param streamName the name of the stream
      * @param eventName the name of the event
      * @param interactionData a data object that conforms to core interactions
      * @param pageData dynamic page data that should be added to the ClientData object
      */
     protected fun submitEvent(
+        streamName: String,
         eventName: String,
         interactionData: InteractionData?,
         pageData: PageData? = null
     ) {
-        if (ReleaseUtil.isPreProdRelease && Prefs.isEventLoggingEnabled) {
+        if (ReleaseUtil.isPreProdRelease) {
             MetricsPlatform.client.submitInteraction(
+                streamName,
                 EVENT_NAME_BASE + eventName,
                 getClientData(pageData),
                 interactionData)
@@ -38,21 +41,24 @@ open class MetricsEvent {
     /**
      * Submit an event to the Metrics Platform using a custom schema
      *
+     * @param streamName the name of the stream
      * @param schemaId the custom schema ID
      * @param eventName the name of the event
      * @param customData the custom data key-value pairs that are top-level properties
      * @param interactionData a data object that conforms to core interactions
      * @param pageData dynamic page data that should be added to the ClientData object
      */
     protected fun submitEvent(
+        streamName: String,
         schemaId: String,
         eventName: String,
         customData: Map<String, Any>,
         interactionData: InteractionData?,
         pageData: PageData? = null
     ) {
-        if (ReleaseUtil.isPreProdRelease && Prefs.isEventLoggingEnabled) {
+        if (ReleaseUtil.isPreProdRelease) {
             MetricsPlatform.client.submitInteraction(
+                streamName,
                 schemaId,
                 EVENT_NAME_BASE + eventName,
                 getClientData(pageData),
@@ -62,7 +68,7 @@ open class MetricsEvent {
         }
     }
 
-    protected fun getClientData(pageData: PageData?): ClientData {
+    private fun getClientData(pageData: PageData?): ClientData {
         return ClientData(
             MetricsPlatform.agentData,
             pageData,
@@ -98,6 +104,19 @@ open class MetricsEvent {
         )
     }
 
+    protected fun getPageData(pageTitle: PageTitle?, pageSummary: PageSummary?): PageData? {
+        if (pageTitle == null) return null
+        return PageData(
+            pageSummary?.pageId,
+            pageTitle.prefixedText,
+            pageTitle.namespace().code(),
+            Namespace.of(pageTitle.namespace().code()).toString(),
+            pageSummary?.revision,
+            pageSummary?.wikiBaseItem,
+            pageTitle.wikiSite.languageCode
+        )
+    }
+
     private fun getPerformerData(): PerformerData {
         return PerformerData(
             AccountUtil.hashCode(),

app/src/main/java/org/wikipedia/dataclient/okhttp/CommonHeaderRequestInterceptor.kt

@@ -4,7 +4,6 @@ import okhttp3.Interceptor
 import okhttp3.Response
 import org.wikipedia.WikipediaApp
 import org.wikipedia.dataclient.RestService
-import org.wikipedia.settings.Prefs.isEventLoggingEnabled
 import java.io.IOException
 
 internal class CommonHeaderRequestInterceptor : Interceptor {
@@ -13,8 +12,7 @@ internal class CommonHeaderRequestInterceptor : Interceptor {
         val app = WikipediaApp.instance
         val builder = chain.request().newBuilder()
                 .header("User-Agent", app.userAgent)
-                .header(if (isEventLoggingEnabled) "X-WMF-UUID" else "DNT",
-                        if (isEventLoggingEnabled) app.appInstallID else "1")
+                .header("X-WMF-UUID", app.appInstallID)
         if (chain.request().url.encodedPath.contains(RestService.PAGE_HTML_ENDPOINT)) {
             builder.header("Accept", RestService.ACCEPT_HEADER_MOBILE_HTML)
         }