#1100 fix order of comments at upload

1 files changed, 3 insertions, 2 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CommentDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CommentDao.java
index 31b195c3f..463cf4617 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CommentDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CommentDao.java
@@ -19,7 +19,8 @@ public interface CommentDao extends GenericDao<DeckComment> {
     @Query("SELECT * FROM DeckComment where accountId = :accountId and localId = :id")
     DeckComment getCommentByLocalIdDirectly(long accountId, Long id);
 
-    @Query("SELECT * FROM DeckComment WHERE accountId = :accountId and objectId = :localCardId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
+    @Query("SELECT * FROM DeckComment WHERE accountId = :accountId and objectId = :localCardId " +
+            "and (status<>1 or id is null or lastModified <> lastModifiedLocal) order by localId asc")
     List<DeckComment> getLocallyChangedCommentsByLocalCardIdDirectly(long accountId, long localCardId);
 
     @Query("SELECT * FROM DeckComment WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
@@ -35,7 +36,7 @@ public interface CommentDao extends GenericDao<DeckComment> {
     LiveData<List<DeckComment>> getCommentByLocalCardId(Long localCardId);
 
     @Transaction
-    @Query("SELECT * FROM DeckComment where objectId = :localCardId order by creationDateTime desc")
+    @Query("SELECT * FROM DeckComment where objectId = :localCardId order by creationDateTime desc, localId desc")
     LiveData<List<FullDeckComment>> getFullCommentByLocalCardId(Long localCardId);
 
     @Query("SELECT id FROM DeckComment where localId = :localId")