mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-21 12:25:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1358 Categories created in web UI are not shown in Android app

Browse source 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
This commit is contained in:
Stefan Niedermann 2021-09-30 14:35:28 +02:00
parent cb527367b0
commit 5997ae57f6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
View file

@ -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);

3
fastlane/metadata/android/en-US/changelogs/3004014.txt
View file

@ -1 +1,2 @@
- 🐞 Consistent timeouts when syncing (#761)
- 🐞 Consistent timeouts when syncing (#761)
- 🐞 Categories created in web UI are not shown in Android app (#1358)