diff options
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java | 2 | ||||
| -rw-r--r-- | fastlane/metadata/android/en-US/changelogs/3004014.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java index ca111727..89a2a900 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java @@ -175,7 +175,7 @@ public interface NoteDao { /** * used by: {@link it.niedermann.owncloud.notes.persistence.NotesServerSyncTask#pullRemoteChanges()} update only, if not modified locally (i.e. STATUS="") and if modified remotely (i.e. any (!) column has changed) */ - @Query("UPDATE NOTE SET title = :title, modified = :modified, favorite = :favorite, etag = :eTag, content = :content, status = '', excerpt = :excerpt " + + @Query("UPDATE NOTE SET title = :title, modified = :modified, favorite = :favorite, etag = :eTag, content = :content, status = '', excerpt = :excerpt, category = :category " + "WHERE id = :id AND status = '' AND (title != :title OR modified != :modified OR favorite != :favorite OR category != :category OR (eTag IS NULL OR eTag != :eTag) OR content != :content)") int updateIfNotModifiedLocallyAndAnyRemoteColumnHasChanged(long id, Long modified, String title, boolean favorite, String category, String eTag, String content, String excerpt); diff --git a/fastlane/metadata/android/en-US/changelogs/3004014.txt b/fastlane/metadata/android/en-US/changelogs/3004014.txt index 2f7b7716..c839a845 100644 --- a/fastlane/metadata/android/en-US/changelogs/3004014.txt +++ b/fastlane/metadata/android/en-US/changelogs/3004014.txt @@ -1 +1,2 @@ -- 🐞 Consistent timeouts when syncing (#761)
\ No newline at end of file +- 🐞 Consistent timeouts when syncing (#761) +- 🐞 Categories created in web UI are not shown in Android app (#1358)
\ No newline at end of file |