[Push] Display FCM instead of DAVx⁵ in distributor settings #1468
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: Arnau Mora <arnyminerz@proton.me>
There was a problem hiding this comment.
Pull Request Overview
This PR updates the distributor settings UI to show "FCM" instead of "DAVx⁵" when the app’s own package is selected as the push distributor.
- Introduces a
LocalContextcheck to detect the app’s package name. - Conditionally displays a custom string resource for FCM or falls back to the existing distributor lookup.
Comments suppressed due to low confidence (2)
app/src/main/kotlin/at/bitfire/davdroid/ui/AppSettingsScreen.kt:746
- [nitpick] The variable name
contextis very generic; consider renaming it tolocalContextto clarify that it comes from Compose'sLocalContext.
val context = LocalContext.current
app/src/main/kotlin/at/bitfire/davdroid/ui/AppSettingsScreen.kt:747
- There’s no test covering the new branch where the distributor equals the app’s package name; consider adding a unit or UI test to verify this FCM fallback.
val pushAppName = if (pushDistributor == context.packageName) {
app/src/main/kotlin/at/bitfire/davdroid/ui/AppSettingsScreen.kt
Outdated
Show resolved
Hide resolved
sunkup
requested changes
May 15, 2025
app/src/main/kotlin/at/bitfire/davdroid/ui/AppSettingsScreen.kt
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
sunkup
approved these changes
May 19, 2025
rfc2822
deleted the
1466-push-davx5-settings-dialog-for-push-distributor-shows-davx5-even-if-google-fcm-is-selected
branch
rfc2822
changed the title
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
See #1466
Short description
When the app's package name is detected, it displays FCM instead of DAVx⁵.
Checklist