Extract discoverHomesets() to ServiceRefresher
#1604
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sunik Kupfer <[email protected]>
There was a problem hiding this comment.
Pull Request Overview
This PR extracts service detection functionality from CollectionListRefresher into a new dedicated ServiceRefresher class to improve code organization and maintainability. The main changes separate concerns by moving home set discovery logic into its own specialized class.
- Extract
discoverHomesets()method and related properties fromCollectionListRefresherto newServiceRefresherclass - Update
RefreshCollectionsWorkerto use the newServiceRefreshervia dependency injection - Move corresponding tests from
CollectionListRefresherTestto newServiceRefresherTestclass
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| ServiceRefresher.kt | New class containing extracted home set discovery logic with assisted injection factory |
| RefreshCollectionsWorker.kt | Updated to inject and use ServiceRefresher.Factory instead of calling CollectionListRefresher directly |
| CollectionListRefresher.kt | Removed discoverHomesets() method and related properties/imports that were moved to ServiceRefresher |
| ServiceRefresherTest.kt | New test class with extracted home set discovery tests |
| CollectionListRefresherTest.kt | Removed testDiscoverHomesets() test method that was moved to ServiceRefresherTest |
app/src/main/kotlin/at/bitfire/davdroid/servicedetection/ServiceRefresher.kt
Show resolved
Hide resolved
rfc2822
reviewed
Jul 23, 2025
app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/ServiceRefresherTest.kt
Outdated
Show resolved
Hide resolved
app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/ServiceRefresherTest.kt
Outdated
Show resolved
Hide resolved
Signed-off-by: Sunik Kupfer <[email protected]>
Signed-off-by: Sunik Kupfer <[email protected]>
rfc2822
deleted the
1589-create-servicerefresher-that-contains-discoverhomesets
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Refactor to make service detection and collection list refresh easier to understand.
Short description
No code has been changed besides moving it around.
discoverHomesets()method fromCollectionListRefresherto newServiceRefresherclassRefreshCollectionsWorkerNote that we duplicate
TestDispatcheron purpose (instead of extracting it to separate file and reusing it) in order to further isolate the tests and make the smaller TestDispatcher occurrences easier to understand.Checklist