Send fundraising banner opt-in state in app_donor_experience stream. (#…

…4885) * Fix blocked message in Suggested Edits, and use coroutines. * Fix tests. * Check for banner opt-in. * Plug it in. * Plug it in. * Invert check. * Harden check. --------- Co-authored-by: Cooltey Feng <[email protected]>
wikimedia · Aug 21, 2024 · f086945 · f086945
1 parent 279c224
commit f086945
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/app/src/main/java/org/wikipedia/analytics/eventplatform/DonorExperienceEvent.kt b/app/src/main/java/org/wikipedia/analytics/eventplatform/DonorExperienceEvent.kt
@@ -1,6 +1,7 @@
 package org.wikipedia.analytics.eventplatform
 
 import org.wikipedia.WikipediaApp
+import org.wikipedia.settings.Prefs
 
 class DonorExperienceEvent {
 
@@ -15,7 +16,7 @@ class DonorExperienceEvent {
             submit(
                 action,
                 activeInterface,
-                campaignId?.let { "campaign_id: $it, " }.orEmpty(),
+                campaignId?.let { "campaign_id: $it, " }.orEmpty() + "banner_opt_in: ${Prefs.donationBannerOptIn}",
                 wikiId
             )
         }

diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/UserInfo.kt b/app/src/main/java/org/wikipedia/dataclient/mwapi/UserInfo.kt
@@ -2,6 +2,7 @@ package org.wikipedia.dataclient.mwapi
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 import org.wikipedia.dataclient.mwapi.MwServiceError.BlockInfo
 import org.wikipedia.util.DateUtil
 import java.util.*
@@ -52,5 +53,6 @@ class UserInfo : BlockInfo() {
     @Serializable
     class Options {
         @SerialName("watchdefault") val watchDefault: Int = 0
+        @SerialName("centralnotice-display-campaign-type-fundraising") val fundraisingOptIn: JsonElement? = null
     }
 }
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.kt b/app/src/main/java/org/wikipedia/settings/Prefs.kt
@@ -581,6 +581,10 @@ object Prefs {
         get() = PrefsIoUtil.getString(R.string.preference_key_user_contrib_filter_lang_code, WikipediaApp.instance.appOrSystemLanguageCode)!!
         set(value) = PrefsIoUtil.setString(R.string.preference_key_user_contrib_filter_lang_code, value)
 
+    var donationBannerOptIn
+        get() = PrefsIoUtil.getBoolean(R.string.preference_key_donation_banner_opt_in, true)
+        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_donation_banner_opt_in, value)
+
     var importReadingListsNewInstallDialogShown
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_import_reading_lists_new_install_dialog_shown, true)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_import_reading_lists_new_install_dialog_shown, value)

diff --git a/app/src/main/java/org/wikipedia/settings/RemoteConfigRefreshTask.kt b/app/src/main/java/org/wikipedia/settings/RemoteConfigRefreshTask.kt
@@ -5,6 +5,8 @@ import kotlinx.coroutines.withContext
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
+import org.wikipedia.WikipediaApp
+import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory.client
 import org.wikipedia.recurring.RecurringTask
 import org.wikipedia.util.log.L
@@ -32,6 +34,12 @@ class RemoteConfigRefreshTask : RecurringTask() {
             } finally {
                 response?.closeQuietly()
             }
+
+            val userInfo = ServiceFactory.get(WikipediaApp.instance.wikiSite).getUserInfo()
+            // This clumsy comparison is necessary because the field is an integer value when enabled, but an empty string when disabled.
+            // Since we want the default to lean towards opt-in, we check very specifically for an empty string, to make sure the user has opted out.
+            val fundraisingOptOut = userInfo.query?.userInfo?.options?.fundraisingOptIn?.toString()?.replace("\"", "")?.isEmpty()
+            Prefs.donationBannerOptIn = fundraisingOptOut != true
         }
     }
 

diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
@@ -144,6 +144,7 @@
     <string name="preference_key_edit_monospace_font">editMonospaceFont</string>
     <string name="preference_key_edit_line_numbers">editLineNumbers</string>
     <string name="preference_key_edit_typing_suggestions">editTypingSuggestions</string>
+    <string name="preference_key_donation_banner_opt_in">donationBannerOptIn</string>
     <string name="preference_key_reading_lists_share_url_shorten">useUrlShortenerForSharing</string>
     <string name="preference_key_reading_lists_share_survey_dialog_shown">readingListShareSurveyDialogShown</string>
     <string name="preference_key_reading_lists_share_survey_mode">readingListShareSurveyMode</string>