fix: Add back missing isReplying

Infomaniak · Jan 31, 2024 · 4631aeb · 4631aeb
1 parent da1c729
commit 4631aeb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Mail/Views/AI Writer/AIModel.swift b/Mail/Views/AI Writer/AIModel.swift
@@ -49,7 +49,6 @@ final class AIModel: ObservableObject {
     private let mailboxManager: MailboxManager
     private let draftContentManager: DraftContentManager
     private let draft: Draft
-    private var messageReply: MessageReply?
 
     private var contextId: String?
     private var recipientsList: String?
@@ -72,15 +71,13 @@ final class AIModel: ObservableObject {
         }
     }
 
-    var isReplying: Bool {
-        messageReply?.isReplying == true
-    }
+    var isReplying: Bool
 
-    init(mailboxManager: MailboxManager, draftContentManager: DraftContentManager, draft: Draft) {
+    init(mailboxManager: MailboxManager, draftContentManager: DraftContentManager, draft: Draft, isReplying: Bool) {
         self.mailboxManager = mailboxManager
         self.draftContentManager = draftContentManager
         self.draft = draft
-        messageReply = nil // editedDraft.messageReply
+        self.isReplying = isReplying
     }
 }
 
@@ -194,7 +191,7 @@ extension AIModel {
         // If the context is too long, we must remove it so that the user can use
         // the AI assistant without context for future trials
         if self.error == .contextMaxSyntaxTokensReached {
-            messageReply = nil
+            isReplying = false
         }
     }
 

diff --git a/Mail/Views/AI Writer/Prompt/AIPromptView.swift b/Mail/Views/AI Writer/Prompt/AIPromptView.swift
@@ -127,6 +127,7 @@ struct AIPromptView: View {
     AIPromptView(aiModel: AIModel(
         mailboxManager: PreviewHelper.sampleMailboxManager,
         draftContentManager: PreviewHelper.sampleDraftContentManager,
-        draft: Draft()
+        draft: Draft(),
+        isReplying: false
     ))
 }
diff --git a/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift b/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift
@@ -88,6 +88,7 @@ struct FixedMenuOrderModifier: ViewModifier {
     AIPropositionMenu(aiModel: AIModel(
         mailboxManager: PreviewHelper.sampleMailboxManager,
         draftContentManager: PreviewHelper.sampleDraftContentManager,
-        draft: Draft()
+        draft: Draft(),
+        isReplying: false
     ))
 }
diff --git a/Mail/Views/AI Writer/Proposition/AIPropositionView.swift b/Mail/Views/AI Writer/Proposition/AIPropositionView.swift
@@ -153,6 +153,7 @@ struct AIPropositionView: View {
     AIPropositionView(aiModel: AIModel(
         mailboxManager: PreviewHelper.sampleMailboxManager,
         draftContentManager: PreviewHelper.sampleDraftContentManager,
-        draft: Draft()
+        draft: Draft(),
+        isReplying: false
     ))
 }
diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift
@@ -131,7 +131,8 @@ struct ComposeMessageView: View {
         _aiModel = StateObject(wrappedValue: AIModel(
             mailboxManager: mailboxManager,
             draftContentManager: currentDraftContentManager,
-            draft: draft
+            draft: draft,
+            isReplying: messageReply?.isReplying == true
         ))
     }