RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ordering of query responses

pull/653/merge
Varun Patil 2023-10-03 09:06:07 -07:00
parent 500fe57e49
commit d4765fef1a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/gallery/memories/NativeX.kt
View File

@ -177,6 +177,7 @@ class NativeX(private val mCtx: MainActivity) {
} }
fun handleRequest(request: WebResourceRequest): WebResourceResponse { fun handleRequest(request: WebResourceRequest): WebResourceResponse {
Log.v(TAG, "handleRequest: ${request.url}")
val path = request.url.path ?: return makeErrorResponse() val path = request.url.path ?: return makeErrorResponse()
val response = try { val response = try {

14
app/src/main/java/gallery/memories/dao/PhotoDao.kt
View File

@ -12,21 +12,21 @@ interface PhotoDao {
@Query("SELECT 1") @Query("SELECT 1")
fun ping(): Int 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> 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)") @Query("SELECT * FROM photos WHERE local_id IN (:fileIds)")
fun getPhotosByFileIds(fileIds: List<Long>): List<Photo> fun getPhotosByFileIds(fileIds: List<Long>): List<Photo>
@Query("SELECT * FROM photos WHERE auid IN (:auids)") @Query("SELECT * FROM photos WHERE auid IN (:auids)")
fun getPhotosByAUIDs(auids: List<Long>): List<Photo> 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") @Query("UPDATE photos SET flag=1")
fun flagAll() fun flagAll()