Fix: content overwritten caused by diff merge on mobile platforms #9856
Conversation
This file contains 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
andelf
commented
Jul 13, 2023
| (state/settings-open?) | ||
| (state/close-settings!) | ||
|
|
||
| (state/modal-opened?) | ||
| (state/close-modal!) | ||
|
|
||
| (state/get-left-sidebar-open?) |
There was a problem hiding this comment.
Minor fix for Android:
Settings should be closed before the left-sidebar.
andelf
commented
Jul 13, 2023
| @@ -1655,7 +1655,7 @@ | |||
| (p/catch (fn [_] nil))) | |||
| current-content (or current-content "") | |||
| incoming-content (fs/read-file repo-dir incoming-file) | |||
| merged-content (diff-merge/three-way-merge current-content current-content incoming-content format)] | |||
| merged-content (diff-merge/three-way-merge "" incoming-content current-content format)] | |||
There was a problem hiding this comment.
Use empty content as the base.
andelf
commented
Jul 13, 2023
| @@ -103,7 +104,8 @@ | |||
| (when (state/get-current-repo) | |||
| (let [is-active? (.-isActive state)] | |||
| (when-not is-active? | |||
| (editor-handler/save-current-block!)) | |||
| (editor-handler/save-current-block!) | |||
| (repo-handler/persist-db!)) | |||
There was a problem hiding this comment.
The primary fix is here.
tiensonqin
force-pushed
the
fix/diff-merge-content-overwrite
branch
from
19358f0
to
549a44b
Compare
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.
Root Cause:
On mobile platforms, DB is not persisted if the app goes inactive or gets killed. So DB(datascript transit files) will lose sync with the disk files if the App is closed by system UI or launcher.
This is very different from the Desktop version, where transit files are saved when closing-app/switching-graph.