From 827494ac8cd43e05fb01533d6c2d79076b7c1325 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 22 Sep 2026 12:19:04 -0300
Subject: [PATCH] Event driven opt-in.

---
 .../securesms/avatar/picker/AvatarPickerViewModel.kt            | 2 +-
 .../subscription/MessageBackupsSignalLoginDetailsViewModel.kt   | 2 +-
 .../org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt  | 2 +-
 .../components/settings/app/account/AccountSettingsViewModel.kt | 2 +-
 .../app/account/LinkedDeviceAccountSettingsViewModel.kt         | 2 +-
 .../app/account/authenticator/TotpCodeEntryViewModel.kt         | 2 +-
 .../app/account/authenticator/TotpNameEntryViewModel.kt         | 2 +-
 .../settings/app/account/authenticator/TotpSetupViewModel.kt    | 2 +-
 .../account/signallogin/SettingsSignalLoginDetailsViewModel.kt  | 2 +-
 .../settings/app/notifications/MutedNotificationsViewModel.kt   | 2 +-
 .../settings/conversation/group/GroupSettingsViewModel.kt       | 2 +-
 .../conversation/grouppermissions/GroupPermissionsViewModel.kt  | 2 +-
 .../conversation/individual/IndividualSettingsViewModel.kt      | 2 +-
 .../sounds/custom/CustomNotificationsSettingsViewModel.kt       | 2 +-
 .../screens/details/SharedContactDetailsViewModel.kt            | 2 +-
 .../contactshare/screens/editname/EditContactNameViewModel.kt   | 2 +-
 .../screens/selectcontact/SelectContactViewModel.kt             | 2 +-
 .../contactshare/screens/share/ShareContactViewModel.kt         | 2 +-
 .../org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt | 2 +-
 .../securesms/stickers/preview/StickerPackPreviewViewModelV2.kt | 2 +-
 .../java/org/signal/core/ui/compose/EventDrivenViewModel.kt     | 2 +-
 .../src/main/java/org/signal/listdetail/demo/DemoViewModel.kt   | 2 +-
 .../signal/mediasend/screens/capture/MediaCaptureViewModel.kt   | 2 +-
 .../org/signal/mediasend/screens/edit/MediaEditViewModel.kt     | 2 +-
 .../org/signal/mediasend/screens/select/MediaSelectViewModel.kt | 2 +-
 .../main/java/org/signal/registration/RegistrationViewModel.kt  | 2 +-
 .../registration/screens/addusername/AddUsernameViewModel.kt    | 2 +-
 .../screens/aepentry/EnterAepForLocalBackupViewModel.kt         | 2 +-
 .../EnterAepForRemoteBackupPostRegistrationViewModel.kt         | 2 +-
 .../aepentry/EnterAepForRemoteBackupPreRegistrationViewModel.kt | 2 +-
 .../screens/countrycode/CountryCodePickerViewModel.kt           | 2 +-
 .../screens/createprofile/CreateProfileViewModel.kt             | 2 +-
 .../devicetransfer/complete/DeviceTransferCompleteViewModel.kt  | 2 +-
 .../instructions/DeviceTransferInstructionsViewModel.kt         | 2 +-
 .../devicetransfer/progress/DeviceTransferProgressViewModel.kt  | 2 +-
 .../devicetransfer/setup/DeviceTransferSetupViewModel.kt        | 2 +-
 .../discoverability/PhoneNumberDiscoverabilityViewModel.kt      | 2 +-
 .../registration/screens/linkaccount/LinkAccountViewModel.kt    | 2 +-
 .../screens/localbackuprestore/LocalBackupRestoreViewModel.kt   | 2 +-
 .../registration/screens/messagesync/MessageSyncViewModel.kt    | 2 +-
 .../screens/phonenumber/PhoneNumberEntryViewModel.kt            | 2 +-
 .../registration/screens/pincreation/PinCreationViewModel.kt    | 2 +-
 .../screens/pinentry/PinEntryForRegistrationLockViewModel.kt    | 2 +-
 .../screens/pinentry/PinEntryForSmsBypassViewModel.kt           | 2 +-
 .../screens/pinentry/PinEntryForSvrRestoreViewModel.kt          | 2 +-
 .../screens/quickrestore/QuickRestoreQrViewModel.kt             | 2 +-
 .../screens/remotebackuprestore/RemoteBackupRestoreViewModel.kt | 2 +-
 .../restoreselection/ArchiveRestoreSelectionViewModel.kt        | 2 +-
 .../registration/screens/shared/ContactSupportViewModel.kt      | 2 +-
 .../SignalLoginCredentialEntryViewModel.kt                      | 2 +-
 .../SignalLoginManualSaveConfirmationViewModel.kt               | 2 +-
 .../RegistrationSignalLoginDetailsViewModel.kt                  | 2 +-
 .../screens/signallogininfo/SignalLoginInfoViewModel.kt         | 2 +-
 .../SignalLoginViewDetailsForManualSaveViewModel.kt             | 2 +-
 .../screens/signalloginpayment/SignalLoginPaymentViewModel.kt   | 2 +-
 .../signal/registration/screens/totpentry/TotpEntryViewModel.kt | 2 +-
 .../screens/twofactorselection/TwoFactorSelectionViewModel.kt   | 2 +-
 .../screens/verificationcode/VerificationCodeViewModel.kt       | 2 +-
 .../registration/screens/welcome/WelcomeScreenViewModel.kt      | 2 +-
 59 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerViewModel.kt
index 3a60b294c2..46cb3c3d43 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerViewModel.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.groups.GroupId
 
 private val TAG = Log.tag(AvatarPickerViewModel::class.java)
 
-sealed class AvatarPickerViewModel : EventDrivenViewModel<AvatarPickerEvents>(TAG) {
+sealed class AvatarPickerViewModel : EventDrivenViewModel<AvatarPickerEvents>(TAG, shouldLogEvents = false) {
 
   private val internalState = MutableStateFlow(AvatarPickerState())
   val state: StateFlow<AvatarPickerState> = internalState
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsSignalLoginDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsSignalLoginDetailsViewModel.kt
index aa87a11874..2436a44659 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsSignalLoginDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsSignalLoginDetailsViewModel.kt
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.components.settings.app.account.signallogin.Si
 class MessageBackupsSignalLoginDetailsViewModel(
   repository: SignalLoginViewDetailsRepository = SignalLoginViewDetailsRepository(),
   isPasswordManagerAvailable: Boolean = true
-) : EventDrivenViewModel<SignalLoginViewDetailsScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginViewDetailsScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(MessageBackupsSignalLoginDetailsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt
index ef32c078b0..cb13d28669 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt
@@ -24,7 +24,7 @@ import java.util.TimeZone
 class ClockSkewViewModel(
   private val clock: () -> Long = { System.currentTimeMillis() },
   detected: StateFlow<Boolean> = ClockSkewDetector.detected
-) : EventDrivenViewModel<ClockSkewScreenEvent>(TAG) {
+) : EventDrivenViewModel<ClockSkewScreenEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(ClockSkewViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
index ea5f6c5a3f..925f9c2dc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.lock.v2.SvrConstants
  */
 class AccountSettingsViewModel(
   private val repository: AccountSettingsRepository = AccountSettingsRepository()
-) : EventDrivenViewModel<AccountSettingsEvent>(TAG) {
+) : EventDrivenViewModel<AccountSettingsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(AccountSettingsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/LinkedDeviceAccountSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/LinkedDeviceAccountSettingsViewModel.kt
index aac29cbd53..ccf88985dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/LinkedDeviceAccountSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/LinkedDeviceAccountSettingsViewModel.kt
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.linkdevice.LinkDeviceRepository
 class LinkedDeviceAccountSettingsViewModel(
   private val selfDeviceId: () -> Int = { SignalStore.account.deviceId },
   private val removeDevice: suspend (Int) -> Boolean = LinkDeviceRepository::removeDevice
-) : EventDrivenViewModel<LinkedDeviceAccountSettingsEvent>(TAG) {
+) : EventDrivenViewModel<LinkedDeviceAccountSettingsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(LinkedDeviceAccountSettingsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpCodeEntryViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpCodeEntryViewModel.kt
index 9bcab7a5d5..6b84fa410b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpCodeEntryViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpCodeEntryViewModel.kt
@@ -30,7 +30,7 @@ import org.signal.uicomponents.codeentryfield.CodeEntryFieldPresenter
  */
 class TotpCodeEntryViewModel(
   private val repository: TotpRepository = TotpRepository()
-) : EventDrivenViewModel<TotpCodeEntryEvent>(TAG) {
+) : EventDrivenViewModel<TotpCodeEntryEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(TotpCodeEntryViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpNameEntryViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpNameEntryViewModel.kt
index 9c6d9eefab..3d9e486925 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpNameEntryViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpNameEntryViewModel.kt
@@ -28,7 +28,7 @@ class TotpNameEntryViewModel(
   private val appId: Long,
   private val renamedApp: TotpApp? = null,
   private val repository: TotpRepository = TotpRepository()
-) : EventDrivenViewModel<TotpNameEntryEvent>(TAG) {
+) : EventDrivenViewModel<TotpNameEntryEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(TotpNameEntryViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpSetupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpSetupViewModel.kt
index 86c1a808a3..ec08d59ad1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpSetupViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/authenticator/TotpSetupViewModel.kt
@@ -27,7 +27,7 @@ import java.time.format.DateTimeFormatter
 class TotpSetupViewModel(
   private val repository: TotpRepository = TotpRepository(),
   private val accountName: String = accountNameFor(LocalDateTime.now())
-) : EventDrivenViewModel<TotpSetupEvent>(TAG) {
+) : EventDrivenViewModel<TotpSetupEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(TotpSetupViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/signallogin/SettingsSignalLoginDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/signallogin/SettingsSignalLoginDetailsViewModel.kt
index d0bb23d6ed..94c610c5b8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/signallogin/SettingsSignalLoginDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/signallogin/SettingsSignalLoginDetailsViewModel.kt
@@ -31,7 +31,7 @@ class SettingsSignalLoginDetailsViewModel(
   private val repository: SignalLoginViewDetailsRepository = SignalLoginViewDetailsRepository(),
   showResetRecoveryKeyButton: Boolean = false,
   isPasswordManagerAvailable: Boolean = true
-) : EventDrivenViewModel<SettingsSignalLoginDetailsEvent>(TAG) {
+) : EventDrivenViewModel<SettingsSignalLoginDetailsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SettingsSignalLoginDetailsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/MutedNotificationsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/MutedNotificationsViewModel.kt
index 771a97e32b..8e573200d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/MutedNotificationsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/MutedNotificationsViewModel.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 
-class MutedNotificationsViewModel(private val recipientId: RecipientId? = null) : EventDrivenViewModel<MutedNotificationsEvent>(TAG) {
+class MutedNotificationsViewModel(private val recipientId: RecipientId? = null) : EventDrivenViewModel<MutedNotificationsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(MutedNotificationsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/group/GroupSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/group/GroupSettingsViewModel.kt
index 7e88f66d64..9b6cf53e87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/group/GroupSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/group/GroupSettingsViewModel.kt
@@ -43,7 +43,7 @@ class GroupSettingsViewModel(
   private val groupId: GroupId,
   private val callMessageIds: LongArray,
   private val repository: ConversationSettingsRepository
-) : EventDrivenViewModel<GroupSettingsEvent>(TAG) {
+) : EventDrivenViewModel<GroupSettingsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(GroupSettingsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/grouppermissions/GroupPermissionsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/grouppermissions/GroupPermissionsViewModel.kt
index ba7753a79e..3f2c774b88 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/grouppermissions/GroupPermissionsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/grouppermissions/GroupPermissionsViewModel.kt
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.groups.ui.GroupErrors
 class GroupPermissionsViewModel(
   private val groupId: GroupId,
   private val repository: GroupPermissionsRepository = GroupPermissionsRepository()
-) : EventDrivenViewModel<GroupPermissionsEvents>(TAG) {
+) : EventDrivenViewModel<GroupPermissionsEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(GroupPermissionsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
index c302de28b3..b42999de6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
@@ -43,7 +43,7 @@ class IndividualSettingsViewModel(
   private val kind: ConversationSettingsKind,
   private val callMessageIds: LongArray,
   private val repository: ConversationSettingsRepository
-) : EventDrivenViewModel<IndividualSettingsEvent>(TAG) {
+) : EventDrivenViewModel<IndividualSettingsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(IndividualSettingsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
index 05a64fc39d..3c88bfdddf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 
 class CustomNotificationsSettingsViewModel(
   private val recipientId: RecipientId
-) : EventDrivenViewModel<CustomNotificationsEvents>(TAG), RecipientForeverObserver {
+) : EventDrivenViewModel<CustomNotificationsEvents>(TAG, shouldLogEvents = true), RecipientForeverObserver {
 
   companion object {
     private val TAG = Log.tag(CustomNotificationsSettingsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/details/SharedContactDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/details/SharedContactDetailsViewModel.kt
index be80647581..0407bdabd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/details/SharedContactDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/details/SharedContactDetailsViewModel.kt
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 class SharedContactDetailsViewModel(
   private val contact: Contact,
   private val repository: SharedContactDetailsRepository
-) : EventDrivenViewModel<SharedContactDetailsEvent>(TAG) {
+) : EventDrivenViewModel<SharedContactDetailsEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SharedContactDetailsViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/editname/EditContactNameViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/editname/EditContactNameViewModel.kt
index 23c431ed9d..99cd961559 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/editname/EditContactNameViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/editname/EditContactNameViewModel.kt
@@ -20,7 +20,7 @@ import org.signal.core.util.logging.Log
 
 class EditContactNameViewModel(
   private val savedState: SavedStateHandle
-) : EventDrivenViewModel<EditContactNameEvent>(TAG) {
+) : EventDrivenViewModel<EditContactNameEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(EditContactNameViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/selectcontact/SelectContactViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/selectcontact/SelectContactViewModel.kt
index 85f78df062..0a3a673812 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/selectcontact/SelectContactViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/selectcontact/SelectContactViewModel.kt
@@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.contactshare.screens.selectcontact.SelectConta
 class SelectContactViewModel(
   private val source: ContactIndexSource,
   private val savedState: SavedStateHandle = SavedStateHandle()
-) : EventDrivenViewModel<SelectContactEvent>(TAG) {
+) : EventDrivenViewModel<SelectContactEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SelectContactViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/share/ShareContactViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/share/ShareContactViewModel.kt
index 9604c6ab7d..b258dc6589 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/share/ShareContactViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/screens/share/ShareContactViewModel.kt
@@ -42,7 +42,7 @@ class ShareContactViewModel(
   private val recipientId: RecipientId?,
   private val repository: ShareContactRepository,
   private val savedState: SavedStateHandle
-) : EventDrivenViewModel<ShareContactEvent>(TAG) {
+) : EventDrivenViewModel<ShareContactEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(ShareContactViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
index d030153516..e75b45ee50 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
@@ -29,7 +29,7 @@ import org.signal.core.util.logging.Log
  */
 class DeleteAccountViewModel(
   private val repository: DeleteAccountRepository = DeleteAccountRepository()
-) : EventDrivenViewModel<DeleteAccountEvent>(TAG) {
+) : EventDrivenViewModel<DeleteAccountEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DeleteAccountViewModel::class)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
index ba7f8fc194..05a0277b12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
@@ -31,7 +31,7 @@ import kotlin.coroutines.resume
 
 class StickerPackPreviewViewModelV2(
   private val params: StickerPackParams?
-) : EventDrivenViewModel<StickerPackPreviewEvent>(TAG) {
+) : EventDrivenViewModel<StickerPackPreviewEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(StickerPackPreviewViewModelV2::class)
diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/EventDrivenViewModel.kt b/core/ui/src/main/java/org/signal/core/ui/compose/EventDrivenViewModel.kt
index 9ae6da9fe2..7fecff394c 100644
--- a/core/ui/src/main/java/org/signal/core/ui/compose/EventDrivenViewModel.kt
+++ b/core/ui/src/main/java/org/signal/core/ui/compose/EventDrivenViewModel.kt
@@ -18,7 +18,7 @@ import org.signal.core.util.logging.Log
  */
 abstract class EventDrivenViewModel<E : Any>(
   private val tag: String,
-  private val shouldLogEvents: Boolean = true
+  private val shouldLogEvents: Boolean = false
 ) : ViewModel() {
 
   private val eventChannel = Channel<E>(Channel.UNLIMITED)
diff --git a/demo/list-detail/src/main/java/org/signal/listdetail/demo/DemoViewModel.kt b/demo/list-detail/src/main/java/org/signal/listdetail/demo/DemoViewModel.kt
index f34aa22fc5..be9ba10038 100644
--- a/demo/list-detail/src/main/java/org/signal/listdetail/demo/DemoViewModel.kt
+++ b/demo/list-detail/src/main/java/org/signal/listdetail/demo/DemoViewModel.kt
@@ -18,7 +18,7 @@ import org.signal.core.util.logging.Log
  * Owns the navigation. Every event here is answered by a one-liner into [ListDetailNavigator], which is
  * the point: you keep your screens' rules, and it keeps the stacks, the pane anchor, and the saved state.
  */
-class DemoViewModel(savedStateHandle: SavedStateHandle) : EventDrivenViewModel<DemoEvents>(TAG) {
+class DemoViewModel(savedStateHandle: SavedStateHandle) : EventDrivenViewModel<DemoEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DemoViewModel::class)
diff --git a/feature/media-send/src/main/java/org/signal/mediasend/screens/capture/MediaCaptureViewModel.kt b/feature/media-send/src/main/java/org/signal/mediasend/screens/capture/MediaCaptureViewModel.kt
index a7c153f8b5..2841ba5934 100644
--- a/feature/media-send/src/main/java/org/signal/mediasend/screens/capture/MediaCaptureViewModel.kt
+++ b/feature/media-send/src/main/java/org/signal/mediasend/screens/capture/MediaCaptureViewModel.kt
@@ -41,7 +41,7 @@ internal class MediaCaptureViewModel(
   private val parentEventEmitter: (MediaSendFlowEvent) -> Unit,
   selectedCaptureScreen: MediaSendRoute.Capture,
   private val repository: MediaCaptureRepository = MediaCaptureRepository()
-) : EventDrivenViewModel<MediaCaptureScreenEvents>(TAG) {
+) : EventDrivenViewModel<MediaCaptureScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(MediaCaptureViewModel::class)
diff --git a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditViewModel.kt b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditViewModel.kt
index 67e3c34687..68294442a1 100644
--- a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditViewModel.kt
+++ b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditViewModel.kt
@@ -41,7 +41,7 @@ internal class MediaEditViewModel(
   parentState: StateFlow<MediaSendFlowState>,
   private val parentEventEmitter: (MediaSendFlowEvent) -> Unit,
   private val repository: MediaSendRepository = MediaSendDependencies.mediaSendRepository
-) : EventDrivenViewModel<MediaEditScreenEvents>(TAG) {
+) : EventDrivenViewModel<MediaEditScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(MediaEditViewModel::class)
diff --git a/feature/media-send/src/main/java/org/signal/mediasend/screens/select/MediaSelectViewModel.kt b/feature/media-send/src/main/java/org/signal/mediasend/screens/select/MediaSelectViewModel.kt
index fbe68eb36f..fd7bd1a07c 100644
--- a/feature/media-send/src/main/java/org/signal/mediasend/screens/select/MediaSelectViewModel.kt
+++ b/feature/media-send/src/main/java/org/signal/mediasend/screens/select/MediaSelectViewModel.kt
@@ -44,7 +44,7 @@ internal class MediaSelectViewModel(
   /** Passed straight through: the rail follows it, and nothing about it is this screen's to decide. */
   val selectionAdditions: Flow<Media>,
   private val repository: MediaSendRepository = MediaSendDependencies.mediaSendRepository
-) : EventDrivenViewModel<MediaSelectScreenEvents>(TAG) {
+) : EventDrivenViewModel<MediaSelectScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(MediaSelectViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt
index 7597be1de5..05b2e29f5c 100644
--- a/feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt
@@ -31,7 +31,7 @@ class RegistrationViewModel(
   private val savedStateHandle: SavedStateHandle,
   startDestination: RegistrationRoute? = null,
   private val startFresh: Boolean = false
-) : EventDrivenViewModel<RegistrationFlowEvent>(TAG) {
+) : EventDrivenViewModel<RegistrationFlowEvent>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(RegistrationViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
index 134484812a..74f4c1b35b 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
@@ -44,7 +44,7 @@ import kotlin.time.Duration.Companion.milliseconds
 class AddUsernameViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<AddUsernameScreenEvents>(TAG) {
+) : EventDrivenViewModel<AddUsernameScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(AddUsernameViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForLocalBackupViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForLocalBackupViewModel.kt
index 6019c846bd..e12460a887 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForLocalBackupViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForLocalBackupViewModel.kt
@@ -46,7 +46,7 @@ class EnterAepForLocalBackupViewModel(
   private val resultBus: ResultEventBus,
   private val resultKey: String,
   isPasswordManagerAvailable: Boolean = false
-) : EventDrivenViewModel<EnterAepEvents>(TAG) {
+) : EventDrivenViewModel<EnterAepEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(EnterAepForLocalBackupViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPostRegistrationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPostRegistrationViewModel.kt
index 23b15c9e48..49b21a0a99 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPostRegistrationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPostRegistrationViewModel.kt
@@ -23,7 +23,7 @@ class EnterAepForRemoteBackupPostRegistrationViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   isPasswordManagerAvailable: Boolean = false
-) : EventDrivenViewModel<EnterAepEvents>(TAG) {
+) : EventDrivenViewModel<EnterAepEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(EnterAepForRemoteBackupPostRegistrationViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPreRegistrationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPreRegistrationViewModel.kt
index f40c8c3cd5..83066c9a5c 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPreRegistrationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/aepentry/EnterAepForRemoteBackupPreRegistrationViewModel.kt
@@ -27,7 +27,7 @@ class EnterAepForRemoteBackupPreRegistrationViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   isPasswordManagerAvailable: Boolean = false
-) : EventDrivenViewModel<EnterAepEvents>(TAG) {
+) : EventDrivenViewModel<EnterAepEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(EnterAepForRemoteBackupPreRegistrationViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/countrycode/CountryCodePickerViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/countrycode/CountryCodePickerViewModel.kt
index 078b42af11..4182fc7bbf 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/countrycode/CountryCodePickerViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/countrycode/CountryCodePickerViewModel.kt
@@ -29,7 +29,7 @@ class CountryCodePickerViewModel(
   private val resultBus: ResultEventBus,
   private val resultKey: String,
   initialCountry: Country? = null
-) : EventDrivenViewModel<CountryCodePickerScreenEvents>(TAG) {
+) : EventDrivenViewModel<CountryCodePickerScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(CountryCodePickerViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/createprofile/CreateProfileViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/createprofile/CreateProfileViewModel.kt
index 55a56dbf2a..7b9455a866 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/createprofile/CreateProfileViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/createprofile/CreateProfileViewModel.kt
@@ -25,7 +25,7 @@ import org.signal.registration.screens.util.navigateTo
 class CreateProfileViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<CreateProfileScreenEvents>(TAG) {
+) : EventDrivenViewModel<CreateProfileScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(CreateProfileViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/complete/DeviceTransferCompleteViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/complete/DeviceTransferCompleteViewModel.kt
index 44efa63369..a9bb76dbda 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/complete/DeviceTransferCompleteViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/complete/DeviceTransferCompleteViewModel.kt
@@ -20,7 +20,7 @@ import org.signal.registration.RestoreDecision
 class DeviceTransferCompleteViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<DeviceTransferCompleteScreenEvents>(TAG) {
+) : EventDrivenViewModel<DeviceTransferCompleteScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DeviceTransferCompleteViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/instructions/DeviceTransferInstructionsViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/instructions/DeviceTransferInstructionsViewModel.kt
index 72d19ca6a9..21b0c68b7d 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/instructions/DeviceTransferInstructionsViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/instructions/DeviceTransferInstructionsViewModel.kt
@@ -20,7 +20,7 @@ import org.signal.registration.screens.util.navigateTo
 
 class DeviceTransferInstructionsViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<DeviceTransferInstructionsScreenEvents>(TAG) {
+) : EventDrivenViewModel<DeviceTransferInstructionsScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DeviceTransferInstructionsViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/progress/DeviceTransferProgressViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/progress/DeviceTransferProgressViewModel.kt
index 1cbe6f3b34..bdca722e5e 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/progress/DeviceTransferProgressViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/progress/DeviceTransferProgressViewModel.kt
@@ -35,7 +35,7 @@ class DeviceTransferProgressViewModel(
   private val context: Context,
   private val progressEvents: Flow<NewDeviceRestoreStatus>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<DeviceTransferProgressScreenEvents>(TAG) {
+) : EventDrivenViewModel<DeviceTransferProgressScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DeviceTransferProgressViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/setup/DeviceTransferSetupViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/setup/DeviceTransferSetupViewModel.kt
index 1a8d5b11cc..7c2df8ca1a 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/setup/DeviceTransferSetupViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/devicetransfer/setup/DeviceTransferSetupViewModel.kt
@@ -48,7 +48,7 @@ class DeviceTransferSetupViewModel(
   private val setupEvents: Flow<TransferStatus>,
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<DeviceTransferSetupScreenEvents>(TAG) {
+) : EventDrivenViewModel<DeviceTransferSetupScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(DeviceTransferSetupViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/discoverability/PhoneNumberDiscoverabilityViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/discoverability/PhoneNumberDiscoverabilityViewModel.kt
index 6a57b2d89b..17be1df750 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/discoverability/PhoneNumberDiscoverabilityViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/discoverability/PhoneNumberDiscoverabilityViewModel.kt
@@ -22,7 +22,7 @@ class PhoneNumberDiscoverabilityViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val resultBus: ResultEventBus,
   private val resultKey: String
-) : EventDrivenViewModel<PhoneNumberDiscoverabilityScreenEvents>(TAG) {
+) : EventDrivenViewModel<PhoneNumberDiscoverabilityScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(PhoneNumberDiscoverabilityViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountViewModel.kt
index 72b270c377..16441d18a6 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountViewModel.kt
@@ -40,7 +40,7 @@ class LinkAccountViewModel(
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   showCreateAccount: Boolean = true
-) : EventDrivenViewModel<LinkAccountScreenEvent>(TAG) {
+) : EventDrivenViewModel<LinkAccountScreenEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(LinkAccountViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/localbackuprestore/LocalBackupRestoreViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/localbackuprestore/LocalBackupRestoreViewModel.kt
index ad2d49f735..f241b11ae8 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/localbackuprestore/LocalBackupRestoreViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/localbackuprestore/LocalBackupRestoreViewModel.kt
@@ -39,7 +39,7 @@ class LocalBackupRestoreViewModel(
   private val resultBus: ResultEventBus,
   private val resultKey: String,
   private val knownAep: AccountEntropyPool? = null
-) : EventDrivenViewModel<LocalBackupRestoreEvents>(TAG) {
+) : EventDrivenViewModel<LocalBackupRestoreEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(LocalBackupRestoreViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncViewModel.kt
index 54c344a57d..acbc529416 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncViewModel.kt
@@ -38,7 +38,7 @@ class MessageSyncViewModel(
   private val repository: RegistrationRepository,
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<MessageSyncScreenEvent>(TAG) {
+) : EventDrivenViewModel<MessageSyncScreenEvent>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(MessageSyncViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
index aa814d5b11..03843684ca 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
@@ -47,7 +47,7 @@ class PhoneNumberEntryViewModel(
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val clock: () -> Long = { System.currentTimeMillis() }
-) : EventDrivenViewModel<PhoneNumberEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<PhoneNumberEntryScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(PhoneNumberEntryViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
index 4f252d865e..713898f4cc 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
@@ -35,7 +35,7 @@ class PinCreationViewModel(
   private val repository: RegistrationRepository,
   parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<PinCreationScreenEvents>(TAG) {
+) : EventDrivenViewModel<PinCreationScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(PinCreationViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
index d296c6d01d..10264d5108 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
@@ -40,7 +40,7 @@ class PinEntryForRegistrationLockViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val timeRemaining: Long,
   private val svrCredentials: SvrCredentials
-) : EventDrivenViewModel<PinEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<PinEntryScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(PinEntryForRegistrationLockViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
index 49fe3427d3..f81f8206ff 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
@@ -37,7 +37,7 @@ class PinEntryForSmsBypassViewModel(
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val svrCredentials: SvrCredentials
-) : EventDrivenViewModel<PinEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<PinEntryScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(PinEntryForSmsBypassViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
index 1ebe7a7624..2fbdf639a4 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
@@ -34,7 +34,7 @@ class PinEntryForSvrRestoreViewModel(
   private val repository: RegistrationRepository,
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<PinEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<PinEntryScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(PinEntryForSvrRestoreViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
index 1ee5ddc4b7..fd28f478e7 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
@@ -30,7 +30,7 @@ import org.signal.registration.screens.util.navigateTo
 class QuickRestoreQrViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<QuickRestoreQrEvents>(TAG) {
+) : EventDrivenViewModel<QuickRestoreQrEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(QuickRestoreQrViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/remotebackuprestore/RemoteBackupRestoreViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/remotebackuprestore/RemoteBackupRestoreViewModel.kt
index f21f930081..8c350198bd 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/remotebackuprestore/RemoteBackupRestoreViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/remotebackuprestore/RemoteBackupRestoreViewModel.kt
@@ -39,7 +39,7 @@ class RemoteBackupRestoreViewModel(
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val ioDispatcher: CoroutineContext = Dispatchers.IO
-) : EventDrivenViewModel<RemoteBackupRestoreScreenEvents>(TAG) {
+) : EventDrivenViewModel<RemoteBackupRestoreScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(RemoteBackupRestoreViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/restoreselection/ArchiveRestoreSelectionViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/restoreselection/ArchiveRestoreSelectionViewModel.kt
index c3ca07c62a..42e1db0243 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/restoreselection/ArchiveRestoreSelectionViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/restoreselection/ArchiveRestoreSelectionViewModel.kt
@@ -38,7 +38,7 @@ class ArchiveRestoreSelectionViewModel(
   parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val knownAep: AccountEntropyPool? = null
-) : EventDrivenViewModel<ArchiveRestoreSelectionScreenEvents>(TAG) {
+) : EventDrivenViewModel<ArchiveRestoreSelectionScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(ArchiveRestoreSelectionViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/shared/ContactSupportViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/shared/ContactSupportViewModel.kt
index 59e6d88a27..feccd65e72 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/shared/ContactSupportViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/shared/ContactSupportViewModel.kt
@@ -12,7 +12,7 @@ import org.signal.registration.ContactSupportController
  */
 class ContactSupportViewModel(
   private val controller: ContactSupportController
-) : EventDrivenViewModel<ContactSupportEvents>(TAG) {
+) : EventDrivenViewModel<ContactSupportEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(ContactSupportViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryViewModel.kt
index 7f08e0a730..ea9a9bc7f5 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryViewModel.kt
@@ -42,7 +42,7 @@ class SignalLoginCredentialEntryViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   prefilledAccountId: String? = null
-) : EventDrivenViewModel<SignalLoginCredentialEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginCredentialEntryScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SignalLoginCredentialEntryViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginManualSaveConfirmationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginManualSaveConfirmationViewModel.kt
index ad30d48857..ba1d02fd65 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginManualSaveConfirmationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginManualSaveConfirmationViewModel.kt
@@ -32,7 +32,7 @@ import org.signal.registration.screens.util.navigateTo
 class SignalLoginManualSaveConfirmationViewModel(
   private val parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<SignalLoginCredentialEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginCredentialEntryScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SignalLoginManualSaveConfirmationViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogindetails/RegistrationSignalLoginDetailsViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogindetails/RegistrationSignalLoginDetailsViewModel.kt
index f071da3975..aaefb72097 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signallogindetails/RegistrationSignalLoginDetailsViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogindetails/RegistrationSignalLoginDetailsViewModel.kt
@@ -30,7 +30,7 @@ import org.signal.signallogin.viewdetails.SignalLoginViewDetailsState
 class RegistrationSignalLoginDetailsViewModel(
   parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<SignalLoginViewDetailsScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginViewDetailsScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(RegistrationSignalLoginDetailsViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoViewModel.kt
index 962c1a6af2..7fe35ab253 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoViewModel.kt
@@ -36,7 +36,7 @@ class SignalLoginInfoViewModel(
   parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   isPasswordManagerAvailable: Boolean
-) : EventDrivenViewModel<SignalLoginInfoScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginInfoScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(SignalLoginInfoViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signalloginmanualsave/SignalLoginViewDetailsForManualSaveViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signalloginmanualsave/SignalLoginViewDetailsForManualSaveViewModel.kt
index fda483684a..84f0b28447 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signalloginmanualsave/SignalLoginViewDetailsForManualSaveViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signalloginmanualsave/SignalLoginViewDetailsForManualSaveViewModel.kt
@@ -29,7 +29,7 @@ import org.signal.registration.screens.util.navigateTo
 class SignalLoginViewDetailsForManualSaveViewModel(
   parentState: StateFlow<RegistrationFlowState>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<SignalLoginViewDetailsForManualSaveScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginViewDetailsForManualSaveScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(SignalLoginViewDetailsForManualSaveViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentViewModel.kt
index 98bfc004d9..3f6a6055ed 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentViewModel.kt
@@ -32,7 +32,7 @@ import org.signal.registration.screens.util.navigateTo
 class SignalLoginPaymentViewModel(
   private val repository: RegistrationRepository,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<SignalLoginPaymentScreenEvents>(TAG) {
+) : EventDrivenViewModel<SignalLoginPaymentScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(SignalLoginPaymentViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/totpentry/TotpEntryViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/totpentry/TotpEntryViewModel.kt
index e2dfcf954d..7b75229b8d 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/totpentry/TotpEntryViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/totpentry/TotpEntryViewModel.kt
@@ -29,7 +29,7 @@ class TotpEntryViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val resultBus: ResultEventBus,
   private val resultKey: String
-) : EventDrivenViewModel<TotpEntryScreenEvents>(TAG) {
+) : EventDrivenViewModel<TotpEntryScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(TotpEntryViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/twofactorselection/TwoFactorSelectionViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/twofactorselection/TwoFactorSelectionViewModel.kt
index e4f535c4a3..248abe0542 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/twofactorselection/TwoFactorSelectionViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/twofactorselection/TwoFactorSelectionViewModel.kt
@@ -27,7 +27,7 @@ import org.signal.registration.screens.util.navigateTo
 class TwoFactorSelectionViewModel(
   methods: List<TwoFactorMethod>,
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit
-) : EventDrivenViewModel<TwoFactorSelectionScreenEvents>(TAG) {
+) : EventDrivenViewModel<TwoFactorSelectionScreenEvents>(TAG, shouldLogEvents = true) {
 
   companion object {
     private val TAG = Log.tag(TwoFactorSelectionViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
index 90de65b5e8..47ef627c06 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
@@ -51,7 +51,7 @@ class VerificationCodeViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   smsCodeEvents: Flow<String> = emptyFlow(),
   private val clock: () -> Long = { System.currentTimeMillis() }
-) : EventDrivenViewModel<VerificationCodeScreenEvents>(TAG) {
+) : EventDrivenViewModel<VerificationCodeScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(VerificationCodeViewModel::class)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenViewModel.kt
index 9e91c0db55..adde353fe9 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenViewModel.kt
@@ -33,7 +33,7 @@ class WelcomeScreenViewModel(
   private val parentEventEmitter: (RegistrationFlowEvent) -> Unit,
   private val hasPermissions: () -> Boolean,
   private val getRequiredLinkedDevicePermission: () -> String?
-) : EventDrivenViewModel<WelcomeScreenEvents>(TAG) {
+) : EventDrivenViewModel<WelcomeScreenEvents>(TAG, shouldLogEvents = false) {
 
   companion object {
     private val TAG = Log.tag(WelcomeScreenViewModel::class)