From d4765fef1ad35f58f1d9ac5079b353053a2aa4ef Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Tue, 3 Oct 2023 09:06:07 -0700
Subject: [PATCH] Fix ordering of query responses

---
 app/src/main/java/gallery/memories/NativeX.kt      |  1 +
 app/src/main/java/gallery/memories/dao/PhotoDao.kt | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/gallery/memories/NativeX.kt b/app/src/main/java/gallery/memories/NativeX.kt
index 4064eede..b7e51363 100644
--- a/app/src/main/java/gallery/memories/NativeX.kt
+++ b/app/src/main/java/gallery/memories/NativeX.kt
@@ -177,6 +177,7 @@ class NativeX(private val mCtx: MainActivity) {
     }
 
     fun handleRequest(request: WebResourceRequest): WebResourceResponse {
+        Log.v(TAG, "handleRequest: ${request.url}")
         val path = request.url.path ?: return makeErrorResponse()
 
         val response = try {
diff --git a/app/src/main/java/gallery/memories/dao/PhotoDao.kt b/app/src/main/java/gallery/memories/dao/PhotoDao.kt
index 53cc2312..abc4c457 100644
--- a/app/src/main/java/gallery/memories/dao/PhotoDao.kt
+++ b/app/src/main/java/gallery/memories/dao/PhotoDao.kt
@@ -12,21 +12,21 @@ interface PhotoDao {
     @Query("SELECT 1")
     fun ping(): Int
 
-    @Query("SELECT * FROM photos WHERE dayid=:dayId AND bucket_id IN (:buckets) AND server_id = 0")
+    @Query("SELECT dayid, COUNT(local_id) AS count FROM photos WHERE bucket_id IN (:bucketIds) AND server_id = 0 GROUP BY dayid ORDER BY dayid DESC")
+    fun getDays(bucketIds: List<String>): List<Day>
+
+    @Query("SELECT * FROM photos WHERE dayid=:dayId AND bucket_id IN (:buckets) AND server_id = 0 ORDER BY date_taken DESC")
     fun getPhotosByDay(dayId: Long, buckets: List<String>): List<Photo>
 
+    @Query("DELETE FROM photos WHERE local_id IN (:fileIds)")
+    fun deleteFileIds(fileIds: List<Long>)
+
     @Query("SELECT * FROM photos WHERE local_id IN (:fileIds)")
     fun getPhotosByFileIds(fileIds: List<Long>): List<Photo>
 
     @Query("SELECT * FROM photos WHERE auid IN (:auids)")
     fun getPhotosByAUIDs(auids: List<Long>): List<Photo>
 
-    @Query("SELECT dayid, COUNT(local_id) AS count FROM photos WHERE bucket_id IN (:bucketIds) AND server_id = 0 GROUP BY dayid")
-    fun getDays(bucketIds: List<String>): List<Day>
-
-    @Query("DELETE FROM photos WHERE local_id IN (:fileIds)")
-    fun deleteFileIds(fileIds: List<Long>)
-
     @Query("UPDATE photos SET flag=1")
     fun flagAll()