Add digests field to return value of pending inbox items

mopsalarm · Feb 21, 2024 · e180f69 · e180f69
1 parent 29f2bd4
commit e180f69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/com/pr0gramm/app/DebugConfig.kt b/app/src/main/java/com/pr0gramm/app/DebugConfig.kt
@@ -19,7 +19,7 @@ var debugConfig = if (BuildConfig.DEBUG) actualDebugConfig else DebugConfig()
 
 data class DebugConfig(
         val ignoreUnreadState: Boolean = false,
-        val pendingNotifications: Api.Inbox? = null,
+        val pendingNotifications: Api.PendingInbox? = null,
         val delayApiRequests: Boolean = false,
         val mockApiUrl: String? = null,
         val versionOverride: Int? = null) {

diff --git a/app/src/main/java/com/pr0gramm/app/services/InboxService.kt b/app/src/main/java/com/pr0gramm/app/services/InboxService.kt
@@ -59,7 +59,7 @@ class InboxService(private val api: Api, private val preferences: SharedPreferen
     suspend fun pending(): List<Message> {
         val pending = debugConfig.pendingNotifications ?: api.inboxPending()
 
-        return convertInbox(pending, markAsRead = false) {
+        return convertInbox(Api.Inbox(pending.messages), markAsRead = false) {
             it.toMessage()
         }
     }

diff --git a/model/src/main/java/com/pr0gramm/app/api/pr0gramm/Api.kt b/model/src/main/java/com/pr0gramm/app/api/pr0gramm/Api.kt
@@ -138,7 +138,7 @@ interface Api {
     ): Info
 
     @GET("/api/inbox/pending")
-    suspend fun inboxPending(): Inbox
+    suspend fun inboxPending(): PendingInbox
 
     @GET("/api/inbox/conversations")
     suspend fun listConversations(
@@ -652,6 +652,12 @@ interface Api {
         )
     }
 
+    @JsonClass(generateAdapter = true)
+    class PendingInbox (
+        val messages: List<Inbox.Item> = listOf(),
+        val digests: List<DigestsInbox.Digest> = listOf(),
+    )
+
     @JsonClass(generateAdapter = true)
     class DigestsInbox(val digests: List<Digest> = listOf()) {
         @JsonClass(generateAdapter = true)