diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-10-11 12:24:37 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-10-11 12:24:37 +0300 |
commit | 95afd472ce75f009365c24393cc4054450a2c015 (patch) | |
tree | 53e33b819b995f83f1ff3146ac9fac53832825e6 /app/src | |
parent | 220bc52cc4651f1bcbe389cc0c0ebeada4146ff1 (diff) |
Fix #1272 Notes created via Android's "Share Link" feature are not synced
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java | 7 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java index 426d1463..5616daec 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java @@ -114,9 +114,9 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego requireActivity().runOnUiThread(() -> onNoteLoaded(note)); requireActivity().invalidateOptionsMenu(); } else { - final var cloudNote = (Note) requireArguments().getSerializable(PARAM_NEWNOTE); + final var paramNote = (Note) requireArguments().getSerializable(PARAM_NEWNOTE); final var content = requireArguments().getString(PARAM_CONTENT); - if (cloudNote == null) { + if (paramNote == null) { if (content == null) { throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing."); } else { @@ -125,7 +125,8 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego requireActivity().invalidateOptionsMenu(); } } else { - note = repo.addNote(localAccount.getId(), cloudNote); + paramNote.setStatus(DBStatus.LOCAL_EDITED); + note = repo.addNote(localAccount.getId(), paramNote); originalNote = null; requireActivity().runOnUiThread(() -> onNoteLoaded(note)); requireActivity().invalidateOptionsMenu(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java index 06d3d6f5..3f5ba31e 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java @@ -423,7 +423,6 @@ public class NotesRepository { @NonNull @WorkerThread public Note addNote(long accountId, @NonNull Note note) { - note.setStatus(note.getId() > 0 ? DBStatus.LOCAL_EDITED : DBStatus.VOID); note.setAccountId(accountId); note.setExcerpt(generateNoteExcerpt(note.getContent(), note.getTitle())); return db.getNoteDao().getNoteById(db.getNoteDao().addNote(note)); @@ -432,12 +431,9 @@ public class NotesRepository { @MainThread public LiveData<Note> moveNoteToAnotherAccount(Account account, @NonNull Note note) { final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null); + fullNote.setStatus(DBStatus.LOCAL_EDITED); deleteNoteAndSync(account, note.getId()); - return map(addNoteAndSync(account, fullNote), (createdNote) -> { - db.getNoteDao().updateStatus(createdNote.getId(), DBStatus.LOCAL_EDITED); - createdNote.setStatus(DBStatus.LOCAL_EDITED); - return createdNote; - }); + return addNoteAndSync(account, fullNote); } /** |