-
-
Notifications
You must be signed in to change notification settings - Fork 5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mobile: Resolves #10245: Allow marking items as "ignored" in sync status #10261
Mobile: Resolves #10245: Allow marking items as "ignored" in sync status #10261
Conversation
…ing-sync-issues-as-ignored
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the pull request, that looks good.
Don't make ignored items prevent switching sync targets. Note that this solution could be okay for upload issues (e.g. "item too large to upload"), but could cause problems for if the item was disabled due to a download issue.
Yes let's do this for now.
By the way would it be possible to add a gap between the Retry and Ignore buttons?
| } | ||
| expect(ignoredItemCount).toBe(noteCount); | ||
| }); | ||
| }); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for adding these tests! I can't believe we never had tests for this service
…ing-sync-issues-as-ignored
…ing-sync-issues-as-ignored
| } | ||
|
|
||
| class StatusScreenComponent extends BaseScreenComponent<Props, State> { | ||
| public static navigationOptions(): any { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on the name, this seems to be related to React Navigation v1 (and should thus be safe to remove).
Edit: Removed in 7f530a9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes probably. That was added a long time ago and never removed since I wasn't sure if it did something or not.
|
|
||
| export default (): (SqlQuery|string)[] => { | ||
| return [ | ||
| 'ALTER TABLE sync_items ADD COLUMN sync_warning_dismissed INT NOT NULL DEFAULT "0"', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You use the term "ignored" in some places and "dismissed" in other places. Would it be possible to use the same term everywhere?
|
Looks good now, thanks! |
|
Thank you for this! |

Summary
Adds an "ignore" button to the mobile sync status screen.
Resolves #10245.
Notes
sync_warning_dismissedfield tosync_items, which requires upgrading the database.sync_warning_dismissed = 1, that item will not cause a "some items cannot be synchronized" warning to be shown (other items can still trigger the warning).sync_warning_dismissed = 1will still cause failures when attempting to switch sync targets.Screenshot
Testing
Although this pull request has an automated test, it should also be tested manually. This can be done by:
This has been tested successfully on an Android 12 emulator.