From a589e1c5b7b25120580fd17a4cd517b0328897a0 Mon Sep 17 00:00:00 2001
From: Geoffroy BONNEVILLE <geoffroy.bonneville@younited-credit.fr>
Date: Tue, 27 Apr 2021 15:48:45 +0200
Subject: [PATCH] Fix multiple messenger instance registrations in entry view
 models

---
 ModernKeePass/Package.appxmanifest                          | 2 +-
 ModernKeePass/ViewModels/EntryDetailVm.cs                   | 6 ++++++
 ModernKeePass/Views/EntryDetailPage.xaml.cs                 | 1 +
 .../appMetadata/en-us/baselisting/releaseNotes.txt          | 3 +--
 .../appMetadata/fr-fr/baselisting/releaseNotes.txt          | 3 +--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index 9ecb330..71a429c 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.20.0.12" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.21.0.12" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/ViewModels/EntryDetailVm.cs b/ModernKeePass/ViewModels/EntryDetailVm.cs
index 7d273fe..cb26769 100644
--- a/ModernKeePass/ViewModels/EntryDetailVm.cs
+++ b/ModernKeePass/ViewModels/EntryDetailVm.cs
@@ -445,5 +445,11 @@ namespace ModernKeePass.ViewModels
             };
             RaisePropertyChanged(string.Empty);
         }
+
+        public override void Cleanup()
+        {
+            MessengerInstance.Unregister(this);
+            base.Cleanup();
+        }
     }
 }
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml.cs b/ModernKeePass/Views/EntryDetailPage.xaml.cs
index 5aada28..0ee9817 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Views/EntryDetailPage.xaml.cs
@@ -34,6 +34,7 @@ namespace ModernKeePass.Views
         protected override async void OnNavigatedFrom(NavigationEventArgs e)
         {
             await Model.AddHistory();
+            Model.Cleanup();
         }
 
         #endregion
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
index 8edfb5a..b6b76e8 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -1,2 +1 @@
-(Re-)Added a breadcrumb to help with navigation
-Design improvements
\ No newline at end of file
+Fixed a duplication issue with additional fields
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
index 563ef03..d098234 100644
--- a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
@@ -1,2 +1 @@
-(R)Ajout du fil d'Ariane pour aider a la navigation
-Ameliorations de design
\ No newline at end of file
+Correction d'un probleme de duplication des champs additionnels
\ No newline at end of file