refactor(db-repository): extract folder details operations to FolderDetailsRepository by rafaeltonholo · Pull Request #11478 · thunderbird/thunderbird-android

rafaeltonholo · 2026-09-01T16:07:32Z

Contribution Summary

Linked Issue/Ticket: Part of #11470

Description

Add FolderDetailsRepository interface with findById and update methods
Add DefaultFolderDetailsRepository implementation
Remove folder details methods from FolderRepository interface
Update FolderSettingsViewModel and FolderSettingsDataStore to use FolderDetailsRepository
Update DefaultSpecialFolderUpdater to use partial updates via new repository
Add PartialUpdatableFolderDetails for granular folder property updates
Add FailedPrecondition error case to FolderError

AI Disclosure

Select one of the following (mandatory)

This contribution does not include any changes created or assisted by AI.
This contribution includes changes assisted by AI.
This contribution includes changes created by AI.

Contribution Checklist

I have read and affirm that my contribution adheres to Mozilla’s Community Participation Guidelines
This contribution is in Kotlin where possible
This contribution does not use merge commits
This contribution adheres to the existing codestyle (run gradlew spotlessCheck to check and gradlew spotlessApply to format your source code; will be checked by CI).
This contribution does not break existing unit tests (run gradlew testDebugUnitTest; will be checked by CI).
This contribution includes tests for any new functionality, and maintains tests for any updated functionality.
This contribution adheres to our Engineering process (RFC/Technical Design/ADR)
This PR has a descriptive title and body that accurately outlines all changes made, and contains a reference to any issues that it fixes (e.g. Closes #XXX or Fixes #XXX).

_{Stack created with GitHub Stacks CLI • Give Feedback 💬}

github-actions · 2026-09-01T16:07:45Z

✅ Validation Passed: All report and feature-flag labels are correctly set.

wmontwe

Please remove the duplicate property and use a single name instead, as both represent the same setting.

I like the use of the logger, but please check if sensitive data is logged when whole objects are passed to the logger.

wmontwe · 2026-09-03T12:01:37Z

+        verify(messageStore, never()).setPushEnabled(any(), any())
+        assertThat(result).isEqualTo(Outcome.success(Unit))
+    }
+


Suggested change

@Test

fun `partial update should update unified inbox inclusion when provided`() = runTest {

// Arrange

val partialUpdate = PartialUpdatableFolderDetails(

folderId = REGULAR_FOLDER_ID,

includeInUnifiedInbox = true,

)

// Act

val result = testSubject.update(accountId, partialUpdate)

// Assert

verify(messageStore).setIncludeInUnifiedInbox(REGULAR_FOLDER_ID, true)

assertThat(result).isEqualTo(Outcome.success(Unit))

}

wmontwe · 2026-09-03T12:15:46Z

+    val includeInUnifiedInbox: Boolean? = null,
+    val integrate: Boolean? = null,


I think these properties represent the same setting. In the database, the integrate column determines whether a folder is included in the unified folder. Elsewhere, the legacy name includeInUnifiedInbox is used. Since “Unified Folders” is the current terminology, includeInUnifiedFolder would be clearer and should be the only property in the partial-update model. The rename is nice to have.

Suggested change

val includeInUnifiedInbox: Boolean? = null,

val integrate: Boolean? = null,

val includeInUnifiedFolder: Boolean? = null,

Got it. I will drop the integrate property, then.

…uspend function

- Add DefaultFolderPushTrackingRepository with observeEnabled, isEnabled, and disable methods - Add FolderPushTrackingRepository interface to folder API - Add FolderError sealed interface with AccountNotFound, NotFound, and Unavailable cases

…pository - Replace FolderRepository push methods with FolderPushTrackingRepository delegation - Update PushController to use new repository methods (disable, isEnabled, observeEnabled) - Make AccountBackendPusherCallback.onPushNotSupported suspend function - Add AggregateRepositories to compose FolderRepository dependencies

…lsRepository - Add FolderDetailsRepository interface with findById and update methods - Add DefaultFolderDetailsRepository implementation - Remove folder details methods from FolderRepository interface - Update FolderSettingsViewModel and FolderSettingsDataStore to use FolderDetailsRepository - Update DefaultSpecialFolderUpdater to use partial updates via new repository - Add PartialUpdatableFolderDetails for granular folder property updates - Add FailedPrecondition error case to FolderError

- Add HasPii annotation to mark classes containing sensitive user data - Add Ignore annotation to exclude properties from logging - Add Mask annotation to redact sensitive values in log output

- Annotate Folder and FolderDetails with @LoggingPii.HasPii - Annotate Folder.name with @LoggingPii.Mask - Add toStringPiiSafe() extension functions for safe logging - Update DefaultFolderDetailsRepository to use PII-safe logging - Reformat multi-line log messages for consistency

…alUpdatableFolderDetails The `integrate` property was redundant with `includeInUnifiedInbox` and has been replaced throughout the codebase.

wmontwe

LGTM

rafaeltonholo requested a review from a team as a code owner September 1, 2026 16:07

rafaeltonholo requested a review from jbott-tbird September 1, 2026 16:07

rafaeltonholo deployed to review September 1, 2026 16:07 — with GitHub Actions Active

rafaeltonholo temporarily deployed to botmobile September 1, 2026 16:07 — with GitHub Actions Inactive

github-actions Bot added the tb-team Tasks and features handled by project maintainers label Sep 1, 2026

rafaeltonholo added the report: exclude Exclude changes from user-facing reports (internal, minor, or not relevant to users). label Sep 1, 2026

thunderbird-botmobile Bot assigned jbott-tbird Sep 1, 2026

rafaeltonholo requested a review from wmontwe September 1, 2026 16:09

rafaeltonholo temporarily deployed to botmobile September 1, 2026 16:09 — with GitHub Actions Inactive

rafaeltonholo removed the request for review from jbott-tbird September 1, 2026 16:09

rafaeltonholo assigned wmontwe and unassigned jbott-tbird Sep 1, 2026

rafaeltonholo force-pushed the chore/11470/split-folder-repository branch from 377d788 to b0b642b Compare September 2, 2026 10:50

wmontwe reviewed Sep 2, 2026

View reviewed changes

Comment thread core/outcome/src/commonMain/kotlin/net/thunderbird/core/outcome/Outcome.kt

wmontwe requested changes Sep 3, 2026

View reviewed changes

rafaeltonholo added 10 commits September 3, 2026 09:37

refactor(backend)!: make BackendPusherCallback.onPushNotSupported a s…

c689545

…uspend function

feat(outcome): add convenience function for Unit success outcome

90c15b0

chore(mailstore): remove redundant ExperimentalTime opt-in

3338a4b

feat(logging): add PII annotations for sensitive data handling

b6863d2

- Add HasPii annotation to mark classes containing sensitive user data - Add Ignore annotation to exclude properties from logging - Add Mask annotation to redact sensitive values in log output

chore(mailstore): add test for partial update of unified inbox inclusion

73f99aa

refactor(mailstore): remove duplicate integrate property from Parti…

8101bf8

…alUpdatableFolderDetails The `integrate` property was redundant with `includeInUnifiedInbox` and has been replaced throughout the codebase.

rafaeltonholo force-pushed the chore/11470/split-folder-repository branch from b0b642b to 8101bf8 Compare September 3, 2026 14:16

wmontwe self-requested a review September 4, 2026 09:12

wmontwe temporarily deployed to botmobile September 4, 2026 09:12 — with GitHub Actions Inactive

wmontwe approved these changes Sep 4, 2026

View reviewed changes

rafaeltonholo merged commit f19d7b0 into main Sep 4, 2026
20 checks passed

rafaeltonholo deleted the chore/11470/split-folder-repository branch September 4, 2026 10:49

rafaeltonholo temporarily deployed to botmobile September 4, 2026 10:49 — with GitHub Actions Inactive

thunderbird-botmobile Bot added this to the Thunderbird 25 milestone Sep 4, 2026

Navigation Menu

Uh oh!

Uh oh!

refactor(db-repository): extract folder details operations to FolderDetailsRepository - #11478

refactor(db-repository): extract folder details operations to FolderDetailsRepository#11478
rafaeltonholo merged 10 commits into
mainfrom
chore/11470/split-folder-repository

rafaeltonholo commented Sep 1, 2026

Uh oh!

github-actions Bot commented Sep 1, 2026 •

edited

Loading

Uh oh!

Uh oh!

wmontwe left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

wmontwe Sep 3, 2026

Uh oh!

wmontwe Sep 3, 2026

Uh oh!

rafaeltonholo Sep 3, 2026

Uh oh!

wmontwe left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

+    @Test
+    fun `partial update should update unified inbox inclusion when provided`() = runTest {
+        // Arrange
+        val partialUpdate = PartialUpdatableFolderDetails(
+            folderId = REGULAR_FOLDER_ID,
+            includeInUnifiedInbox = true,
+        )
+        // Act
+        val result = testSubject.update(accountId, partialUpdate)
+        // Assert
+        verify(messageStore).setIncludeInUnifiedInbox(REGULAR_FOLDER_ID, true)
+        assertThat(result).isEqualTo(Outcome.success(Unit))
+    }

		val includeInUnifiedInbox: Boolean? = null,
		val integrate: Boolean? = null,

	val includeInUnifiedInbox: Boolean? = null,
	val integrate: Boolean? = null,
	val includeInUnifiedFolder: Boolean? = null,

Uh oh!

Uh oh!

Conversation

rafaeltonholo commented Sep 1, 2026

Contribution Summary

Description

AI Disclosure

Contribution Checklist

Uh oh!

github-actions Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wmontwe left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

wmontwe Sep 3, 2026

Choose a reason for hiding this comment

Uh oh!

wmontwe Sep 3, 2026

Choose a reason for hiding this comment

Uh oh!

rafaeltonholo Sep 3, 2026

Choose a reason for hiding this comment

Uh oh!

wmontwe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Sep 1, 2026 •

edited

Loading

wmontwe left a comment •

edited

Loading