Fix: send event when assigning group to a or b for Donation Reminder (#6160)

Author: cooltey

app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderHelper.kt

@@ -25,8 +25,8 @@ object DonationReminderHelper {
     val defaultReadFrequencyOptions = listOf(5, 10, 15, 25, 50)
 
     val isEnabled
-        get() = ReleaseUtil.isDevRelease || isInEligibleCountry &&
-                LocalDate.now() <= LocalDate.of(2026, 3, 15) && isTestGroupUser
+        get() = (ReleaseUtil.isDevRelease || isInEligibleCountry &&
+                LocalDate.now() <= LocalDate.of(2026, 3, 15)) && isTestGroupUser
 
     val hasActiveReminder get() = Prefs.donationReminderConfig.userEnabled && Prefs.donationReminderConfig.isReminderReady && isInEligibleCountry
 

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

@@ -75,7 +75,6 @@ import org.wikipedia.dataclient.okhttp.HttpStatusException
 import org.wikipedia.dataclient.okhttp.OkHttpWebViewClient
 import org.wikipedia.descriptions.DescriptionEditActivity
 import org.wikipedia.diff.ArticleEditDetailsActivity
-import org.wikipedia.donate.donationreminder.DonationReminderAbTest
 import org.wikipedia.donate.donationreminder.DonationReminderActivity
 import org.wikipedia.donate.donationreminder.DonationReminderHelper
 import org.wikipedia.edit.EditHandler
@@ -710,13 +709,7 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
                         val campaignId = it.getIdForLang(app.appOrSystemLanguageCode)
                         if (!Prefs.announcementShownDialogs.contains(campaignId)) {
                             DonorExperienceEvent.logAction("impression", "article_banner", pageTitle.wikiSite.languageCode, campaignId)
-                            campaignDialog = CampaignDialog(requireActivity(), it, onNeutralButtonClick = { campaignIdForAnalytics ->
-                                DonorExperienceEvent.logDonationReminderAction(
-                                    action = "group_assigned",
-                                    activeInterface = "article_banner",
-                                    groupAssigned = if (DonationReminderAbTest().isTestGroupUser()) "android_remind_b" else "android_remind_a",
-                                    campaignId = campaignIdForAnalytics
-                                )
+                            campaignDialog = CampaignDialog(requireActivity(), it, onNeutralButtonClick = {
                                 donationReminderLauncher.launch(DonationReminderActivity.newIntent(requireContext()))
                             })
                             campaignDialog?.setCancelable(false)

app/src/main/java/org/wikipedia/page/campaign/CampaignDialog.kt

@@ -18,7 +18,7 @@ import java.time.Instant
 import java.time.LocalDateTime
 import java.util.Date
 
-class CampaignDialog internal constructor(private val context: Context, val campaign: Campaign, val onNeutralButtonClick: ((campaignId: String) -> Unit)? = null) : AlertDialog.Builder(context), CampaignDialogView.Callback {
+class CampaignDialog internal constructor(private val context: Context, val campaign: Campaign, val onNeutralButtonClick: (() -> Unit)? = null) : AlertDialog.Builder(context), CampaignDialogView.Callback {
     private var dialog: AlertDialog? = null
     private val campaignIdOriginal = campaign.getIdForLang(WikipediaApp.instance.appOrSystemLanguageCode)
     private val campaignId = campaignIdOriginal + if (DonationReminderHelper.isInEligibleCountry) {
@@ -74,14 +74,22 @@ class CampaignDialog internal constructor(private val context: Context, val camp
     override fun onNeutralAction() {
         DonorExperienceEvent.logAction("later_click", "article_banner", campaignId = campaignId)
         DonorExperienceEvent.logAction("reminder_toast", "article_banner", campaignId = campaignId)
+        if (DonationReminderHelper.isInEligibleCountry) {
+            DonorExperienceEvent.logDonationReminderAction(
+                action = "group_assigned",
+                activeInterface = "article_banner",
+                groupAssigned = if (DonationReminderAbTest().isTestGroupUser()) "android_remind_b" else "android_remind_a",
+                campaignId = campaignId
+            )
+        }
         if (!DonationReminderHelper.isEnabled) {
             Prefs.announcementPauseTime = Date().time
             FeedbackUtil.showMessage(context as Activity, R.string.donation_campaign_maybe_later_snackbar)
             dismissDialog(false)
             return
         }
         Prefs.announcementShownDialogs = setOf(campaignIdOriginal)
-        onNeutralButtonClick?.invoke(campaignId)
+        onNeutralButtonClick?.invoke()
     }
 
     override fun onClose() {