[pull] master from wikimedia:master

.github/workflows/android.yml

@@ -15,6 +15,8 @@ jobs:
         java-version: 1.8
     - name: Check for missing qq strings
       run: ./scripts/missing-qq.py
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
     - name: Build, test, and lint
       run: ./gradlew clean checkstyle ktlint assembleAlphaRelease lintAlphaRelease testAlphaRelease
     - name: List

.github/workflows/android_branch.yml

@@ -14,6 +14,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
     - name: Build, test, and lint
       run: ./gradlew clean assembleAlphaRelease
     - name: List

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/assets/imagerecs"]
+	path = app/src/main/assets/imagerecs
+	url = https://github.com/wikimedia/apps-android-wikipedia-imagerecs.git

app/build.gradle

@@ -43,7 +43,7 @@ android {
         applicationId 'org.wikipedia'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 50353
+        versionCode 50359
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "org.wikipedia.WikipediaTestRunner"
         vectorDrawables.useSupportLibrary = true
@@ -179,7 +179,7 @@ dependencies {
     implementation "com.google.android.material:material:1.3.0"
     implementation "androidx.core:core-ktx:1.3.2"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation "androidx.fragment:fragment-ktx:1.3.2"
+    implementation "androidx.fragment:fragment-ktx:1.3.3"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.2.0"

app/lint.xml

@@ -9,8 +9,6 @@
     <!-- Ignore the IconLocation issue in the given files -->
     <issue id="IconLocation">
         <!-- big images we don't want to duplicate multiple times: -->
-        <ignore path="res/drawable/lead_default.png" />
-        <ignore path="res/drawable/lead_default_dark.png" />
         <ignore path="res/drawable/wp_wordmark.png" />
     </issue>
 

app/src/main/AndroidManifest.xml

@@ -248,6 +248,10 @@
             android:name=".suggestededits.SuggestedEditsImageTagEditActivity"
             android:theme="@style/AppTheme.ActionBar" />
 
+        <activity
+            android:name=".suggestededits.ImageRecsOnboardingActivity"
+            android:theme="@style/AppTheme.ActionBar" />
+
         <activity
             android:name=".userprofile.ContributionsActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize"

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

@@ -29,6 +29,7 @@ public final class Constants {
     public static final int ACTIVITY_REQUEST_IMAGE_CAPTION_EDIT = 64;
     public static final int ACTIVITY_REQUEST_IMAGE_TAGS_ONBOARDING = 65;
     public static final int ACTIVITY_REQUEST_IMAGE_TAGS_EDIT = 66;
+    public static final int ACTIVITY_REQUEST_IMAGE_RECS_ONBOARDING = 67;
 
     public static final String INTENT_RETURN_TO_MAIN = "returnToMain";
     public static final String INTENT_FEATURED_ARTICLE_FROM_WIDGET = "featuredArticleFromWidget";

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

@@ -20,7 +20,7 @@ import org.wikipedia.util.UriUtil.isValidPageLink
 
 class LongPressHandler(view: View, private val historySource: Int, private val callback: LongPressMenu.Callback) : OnCreateContextMenuListener, OnTouchListener {
     interface WebViewMenuCallback : LongPressMenu.Callback {
-        val wikiSite: WikiSite
+        val wikiSite: WikiSite?
         val referrer: String?
     }
 
@@ -47,8 +47,10 @@ class LongPressHandler(view: View, private val historySource: Int, private val c
                 if (isValidPageLink(uri)) {
                     var wikiSite = WikiSite(uri)
                     // the following logic keeps the correct language code if the domain has multiple variants (e.g. zh).
-                    if (wikiSite.dbName() == (callback as WebViewMenuCallback).wikiSite.dbName() && wikiSite.languageCode() != callback.wikiSite.languageCode()) {
-                        wikiSite = callback.wikiSite
+                    (callback as WebViewMenuCallback).wikiSite?.run {
+                        if (wikiSite.dbName() == dbName() && wikiSite.languageCode() != languageCode()) {
+                            wikiSite = this
+                        }
                     }
                     title = wikiSite.titleForInternalLink(uri.path)
                     referrer = callback.referrer

app/src/main/java/org/wikipedia/analytics/ABTestFunnel.kt

@@ -0,0 +1,43 @@
+package org.wikipedia.analytics
+
+import org.json.JSONObject
+import org.wikipedia.WikipediaApp
+import org.wikipedia.settings.PrefsIoUtil
+import java.util.*
+import kotlin.random.Random
+
+class ABTestFunnel internal constructor(private val abTestName: String, private val abTestGroupCount: Int) :
+        Funnel(WikipediaApp.getInstance(), SCHEMA_NAME, REV_ID, SAMPLE_LOG_ALL) {
+
+    // initialize the group if it hasn't been yet.
+    val aBTestGroup: Int
+        get() {
+            var group = PrefsIoUtil.getInt(AB_TEST_KEY_PREFIX + abTestName, -1)
+            if (group == -1) {
+                // initialize the group if it hasn't been yet.
+                group = Random(Int.MAX_VALUE).nextInt()
+                PrefsIoUtil.setInt(AB_TEST_KEY_PREFIX + abTestName, group)
+            }
+            return group % abTestGroupCount
+        }
+
+    private val isEnrolled = PrefsIoUtil.contains(AB_TEST_KEY_PREFIX + abTestName)
+
+    override fun preprocessSessionToken(eventData: JSONObject) {}
+    fun logGroupEvent(groupEventId: String) {
+        log(
+                "test_group", groupEventId
+        )
+    }
+
+    companion object {
+        private const val SCHEMA_NAME = "MobileWikiAppABTest"
+        private const val REV_ID = 19990870
+        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/AppLanguageSearchingFunnel.kt

@@ -0,0 +1,32 @@
+package org.wikipedia.analytics
+
+import org.json.JSONObject
+import org.wikipedia.WikipediaApp
+
+class AppLanguageSearchingFunnel(private val settingsSessionToken: String) :
+        TimedFunnel(WikipediaApp.getInstance(), SCHEMA_NAME, REV_ID, SAMPLE_LOG_ALL) {
+
+    fun logLanguageAdded(languageAdded: Boolean, languageCode: String?, searchString: String?) {
+        log(
+                "language_settings_token", settingsSessionToken,
+                "added", languageAdded,
+                "language", languageCode,
+                "search_string", searchString
+        )
+    }
+
+    fun logNoLanguageAdded(languageAdded: Boolean, searchString: String?) {
+        log(
+                "language_settings_token", settingsSessionToken,
+                "added", languageAdded,
+                "search_string", searchString
+        )
+    }
+
+    override fun preprocessSessionToken(eventData: JSONObject) {}
+
+    companion object {
+        private const val SCHEMA_NAME = "MobileWikiAppLanguageSearching"
+        private const val REV_ID = 18204518
+    }
+}

app/src/main/java/org/wikipedia/analytics/AppLanguageSettingsFunnel.kt

@@ -0,0 +1,23 @@
+package org.wikipedia.analytics
+
+import org.wikipedia.Constants.InvokeSource
+import org.wikipedia.WikipediaApp
+
+class AppLanguageSettingsFunnel : TimedFunnel(WikipediaApp.getInstance(), SCHEMA_NAME, REV_ID, SAMPLE_LOG_ALL) {
+
+    fun logLanguageSetting(source: InvokeSource, initialLanguageList: String, finalLanguageList: String,
+                           interactionsCount: Int, searched: Boolean) {
+        log(
+                "source", source.getName(),
+                "initial", initialLanguageList,
+                "final", finalLanguageList,
+                "interactions", interactionsCount,
+                "searched", searched
+        )
+    }
+
+    companion object {
+        private const val SCHEMA_NAME = "MobileWikiAppLanguageSettings"
+        private const val REV_ID = 18113720
+    }
+}