diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-04-09 10:55:22 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-04-09 10:55:22 +0300 |
| commit | 3f72a4a91e76849ae45cda7de9b21fb01a2fc73d (patch) | |
| tree | 55cd38289fa8e28709d4ce8ceb2c4a2abba85692 /app/src/main | |
| parent | 941e5439a01cee24487362fca75fb38e8f71aefc (diff) | |
Ensure we have the up to date eTag
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java index 8c1b89f1..b528941c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java @@ -32,8 +32,8 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil; import it.niedermann.owncloud.notes.main.navigation.NavigationAdapter; import it.niedermann.owncloud.notes.main.navigation.NavigationItem; import it.niedermann.owncloud.notes.persistence.CapabilitiesClient; -import it.niedermann.owncloud.notes.persistence.NotesServerSyncHelper; import it.niedermann.owncloud.notes.persistence.NotesDatabase; +import it.niedermann.owncloud.notes.persistence.NotesServerSyncHelper; import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.persistence.entity.CategoryWithNotesCount; import it.niedermann.owncloud.notes.persistence.entity.Note; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java index 054e6a63..01f86475 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java @@ -166,7 +166,8 @@ abstract class NotesServerSyncTask extends Thread { final Map<Long, Long> idMap = db.getIdMap(localAccount.getId()); final Calendar modified = localAccount.getModified(); final long modifiedForServer = modified == null ? 0 : modified.getTimeInMillis() / 1_000; - final ServerResponse.NotesResponse response = notesClient.getNotes(ssoAccount, modifiedForServer, localAccount.getETag()); + // FIXME re-reading the localAccount is only a workaround for a not-up-to-date eTag in localAccount. + final ServerResponse.NotesResponse response = notesClient.getNotes(ssoAccount, modifiedForServer, db.getAccountDao().getAccountById(localAccount.getId()).getETag()); List<Note> remoteNotes = response.getNotes(); Set<Long> remoteIDs = new HashSet<>(); // pull remote changes: update or create each remote note |