do not show all sync conflict notifications during app launch #16274
+146
−0
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
alperozturk96
force-pushed
the
do-not-show-all-sync-conflict-notifications-during-app-launch
branch
from
0474133 to
5fdcc2d
Compare
4 tasks
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
alperozturk96
force-pushed
the
do-not-show-all-sync-conflict-notifications-during-app-launch
branch
from
d8a699c to
1941bb8
Compare
Signed-off-by: alperozturk <[email protected]> # Conflicts: # app/src/main/res/values/strings.xml
Signed-off-by: alperozturk96 <[email protected]>
Signed-off-by: alperozturk96 <[email protected]>
alperozturk96
force-pushed
the
do-not-show-all-sync-conflict-notifications-during-app-launch
branch
from
70b4401 to
b0209f7
Compare
ZetaTom
reviewed
Jan 14, 2026
Collaborator
ZetaTom
left a comment
ZetaTom
left a comment
There was a problem hiding this comment.
In general it works well. From a UX perspective, I think that the app should open in the foreground when users tap on Resolve Conflicts. Currently the app opens in the background and the notification disappears.
android.16274.webm
Tested using a Pixel 2 emulator running an AOSP Android 11 image.
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16274.apk |
alperozturk96
deleted the
do-not-show-all-sync-conflict-notifications-during-app-launch
branch
Collaborator
Author
|
/backport to stable-3.35 |
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.
Issue: #16126 (comment)
When a user encounters a sync conflict through manual or automatic uploads, the
retryUploadsfunction currently triggers a separate notification for each conflicted file at app launch. This can result in multiple notifications appearing at app launch, which can be overwhelming and annoying.Changes
This PR ensures that only a single notification is shown for sync conflicts at app launch. Tapping the notification opens the Uploads screen, allowing the user to review and resolve conflicts. This eliminates the repetitive notifications during app launch while keeping the user informed.
Note: User would still see sync conflict message for each file after upload attempt via auto or manual upload.
This will be shown instead of multiple sync conflict notification at app launch