Skip to content
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

Diff Match Patch #924

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Diff Match Patch #924

merged 1 commit into from
Jan 20, 2020

Conversation

theck13
Copy link
Contributor

@theck13 theck13 commented Jan 16, 2020

Fix

Update the simperium dependency, which includes updating the diff_match_patch class as described in Simperium/simperium-android#215 and ignoring corrupted ghost objects as described in Simperium/simperium-android#216.

Test

The test requires corrupting a note to see if Simplenote Android can handle it. In order to corrupt a note, checkout commit 9361b81 in the simplenote-ios repository to use for the Simplenote iOS steps below. The steps for Simplenote Web can be performed at https://app.simplenote.com.

  1. Android: Open app.
  2. iOS: Open app.
  3. Web: Open app.
  4. iOS: Tap New note action in top app bar.
  5. iOS: Insert 🙂🙁 in note.
  6. Android: Notice 🙂🙁 in note list.
  7. iOS: Insert 😱 between 🙂 and 🙁 in note.
  8. iOS: Notice app crashes.
  9. Android: Notice 🙂🐨null)� in note list.
  10. Web: Notice 🙂�(null)� in note list.
  11. Web: Open 🙂�(null)� note.
  12. Web: Add "test" to end of 🙂�(null)� note.
  13. Android: Open 🙂🐨null)� note.
  14. Android: Notice 🙂(null)🙁test in note.

Review

Only one developer is required to review these changes, but anyone can perform the review.

Release

These changes do not require release notes.

Note

@loremattei, these changes will require a new release candidate build once they are merged.

@theck13 theck13 added this to the 2.3 ❄️ milestone Jan 16, 2020
@theck13 theck13 requested a review from dmsnell January 16, 2020 16:14
@peril-automattic
Copy link

You can test the changes on this Pull Request by downloading the APK here.

Copy link
Member

@dmsnell dmsnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In testing I confirmed our expected behaviors. The remaining issues with the malformed content disappeared after the first update and thankfully should be rare anyway, coming only from the old corrupted iOS version.

@theck13 theck13 merged commit ecb4d0b into release/2.3 Jan 20, 2020
@theck13 theck13 deleted the diff-match-patch branch January 20, 2020 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Bug Something isn't working.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants