improved memory management

Author: Lyra1337

Web/Pages/Mailbox.razor.cs

@@ -26,14 +26,13 @@ partial class Mailbox : IRecipient<MailReceivedMessage>, IDisposable
 
         protected MailModel CurrentMail { get; private set; }
 
-        protected override void OnParametersSet()
+        protected override async Task OnInitializedAsync()
         {
-            this.MailboxSessionService.MailReceived += this.MailboxSessionService_MailReceived;
-        }
+            await base.OnInitializedAsync();
 
-        protected override async Task OnAfterRenderAsync(bool firstRender)
-        {
+            this.MailboxSessionService.MailReceived += this.MailboxSessionService_MailReceived;
             await this.JsRuntime.InvokeVoidAsync("window.TempMailServer.InitializeAutoSelect");
+            this.Messenger.Register(this);
         }
 
         private void MailboxSessionService_MailReceived(object sender, EventArgs e)
@@ -78,6 +77,7 @@ public void Receive(MailReceivedMessage message)
 
         public void Dispose()
         {
+            this.Messenger.UnregisterAll(this);
             this.MailboxSessionService.MailReceived -= this.MailboxSessionService_MailReceived;
         }
     }

Web/Services/MailboxSessionService.cs

@@ -5,7 +5,7 @@
 
 namespace Lyralabs.TempMailServer.Web.Services
 {
-    public class MailboxSessionService : IRecipient<MailReceivedMessage>
+    public class MailboxSessionService : IRecipient<MailReceivedMessage>, IDisposable
     {
         public event EventHandler MailReceived;
 
@@ -115,5 +115,11 @@ internal async Task<MailModel> GetMailByIdAsync(int mailId)
             var mail = await this.mailboxService.GetDecryptedMailById(this.userState.CurrentMailbox, mailId, this.userState.Secret.Value.PrivateKey);
             return mail;
         }
+
+        public void Dispose()
+        {
+            this.messenger.UnregisterAll(this);
+            this.Mails.Clear();
+        }
     }
 }