taler-ios

commit 42bc0ac9a48c277cb913ab97e0940ac99e10c960
parent 052a3d0f63e34db0d787b954e329500db563aed9
Author: Marc Stibane <marc@taler.net>
Date:   Sat, 31 Oct 2026 22:57:06 +0100

TalDir messages

Diffstat:
M
TalerWallet1/Controllers/Controller.swift
 | 
7
++++++-
M
TalerWallet1/Model/Model+TalDir.swift
 | 
6
+++---

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift
@@ -427,7 +427,12 @@ class Controller: ObservableObject {
         let model = WalletModel.shared
         if let mailboxConfiguration {
             if let response = try? await model.refreshMailbox(mailboxConfiguration) {
-                messages = response.messages
+                let countNew = response.messages.count
+                if let response2 = try? await model.getMailboxMessages() {
+                    messages = response2.messages
+                } else {
+                    messages = response.messages
+                }
 #if DEBUG   // TODO: tell user?
                 if let expiration = response.mailboxExpiration {
                     if expiration != mailboxConfiguration.expiration {
diff --git a/TalerWallet1/Model/Model+TalDir.swift b/TalerWallet1/Model/Model+TalDir.swift
@@ -401,17 +401,17 @@ extension WalletModel {
         return response
     }
     nonisolated func getMailboxMessages(viewHandles: Bool = false)
-      async throws -> [MailboxMessage] {   // M for MainActor
+      async throws -> MailboxMessagesResponse {   // M for MainActor
         let request = GetMailboxMessages()
         let (response, _) = try await sendRequest(request, viewHandles: viewHandles)
-        return response.messages
+        return response
     }
     nonisolated func upsertMailboxMessage(message: MailboxMessage, viewHandles: Bool = false)
       async throws {   // M for MainActor
         let request = UpsertMailboxMessage(message: message)
         let _ = try await sendRequest(request, viewHandles: viewHandles)
     }
-    nonisolated func deleteMailboxMessage(message: MailboxMessage, viewHandles: Bool = false)
+    nonisolated func deleteMailboxMessage(_ message: MailboxMessage, viewHandles: Bool = false)
       async throws {   // M for MainActor
         let request = DeleteMailboxMessage(message: message)
         let _ = try await sendRequest(request, viewHandles: viewHandles)