Fixed #129

Author: RillJ

View/OverviewMatches.xaml.cs

@@ -21,13 +21,12 @@ public OverviewMatches()
         /// </summary>
         private void Profile_Click(object sender, RoutedEventArgs e)
         {
-            Profile profile = ((Button)sender).DataContext as Profile;
-            if (!FocusOpenedWindow<ProfileWindow>(profile))
+            if (((Button)sender).DataContext is Profile profile && !FocusOpenedWindow<ProfileWindow>(profile))
             {
                 ProfileWindow profileWindow = new ProfileWindow();
                 profileWindow.ProfileWindowFrame.Content = new ProfilePage(new ProfilePageViewModel(profile));
 
-                profileWindow.Show(); // Show the authentication window
+                profileWindow.Show();
             }
         }
 
@@ -39,13 +38,12 @@ private void MatchingProfile_Click(object sender, RoutedEventArgs e)
             ProfileWindow profileWindow = new ProfileWindow();
             profileWindow.ProfileWindowFrame.Content = new MatchingProfilePage(new MatchingProfilePageViewModel(((Button)sender).DataContext as Profile));
 
-            profileWindow.Show(); // Show the authentication window
+            profileWindow.Show();
         }
 
         private void Chat_Click(object sender, RoutedEventArgs e)
         {
-            Profile profile = ((Button)sender).DataContext as Profile;
-            if (!FocusOpenedWindow<ChatWindow>(profile))
+            if (((Button)sender).DataContext is Profile profile && !FocusOpenedWindow<ChatWindow>(profile))
             {
                 ChatWindow chatWindow = new ChatWindow
                 {
@@ -72,10 +70,10 @@ public static void Chat_Base(ChatWindow chatWindow)
         public static bool FocusOpenedWindow<T>(int userID) where T : Window
         {
             bool success = false;
-            System.Windows.Application.Current.Dispatcher.Invoke(delegate // Dispatcher delegate for threads
+            Application.Current.Dispatcher.Invoke(delegate // Dispatcher delegate for threads
             {
                 // Check if a window is already open for the user, and if so, focus it instead of opening a new window
-                foreach (T t in System.Windows.Application.Current.Windows.OfType<T>())
+                foreach (T t in Application.Current.Windows.OfType<T>())
                 {
                     if (typeof(T) == typeof(ChatWindow))
                     {

ViewModel/ChatWindowViewModel.cs

@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Windows.Input;
 using ViewModel.Commands;
+using ViewModel.Mediators;
 
 namespace ViewModel
 {
@@ -175,18 +176,21 @@ public void SeenChatMessages()
             }
         }
 
-        public bool ChatWindowHasFocus { internal get; set; }
-        #endregion
-
-        #region Construction and destruction
-        /// <summary>
-        /// Creates an empty conversation
-        /// </summary>
-        public ChatWindowViewModel()
+        public bool ChatWindowHasFocus
         {
-
+            get
+            {
+                if (!ViewModelMediators.ChatWindowFocus.ContainsKey(Receiver.UserID))
+                {
+                    ViewModelMediators.ChatWindowFocus.Add(Receiver.UserID, true);
+                }
+                return ViewModelMediators.ChatWindowFocus[Receiver.UserID];
+            }
+            set => ViewModelMediators.ChatWindowFocus[Receiver.UserID] = value;
         }
+        #endregion
 
+        #region Construction and destruction
         /// <summary>
         /// Creates a conversationViewModel with given userId
         /// </summary>
@@ -207,10 +211,11 @@ public ChatWindowViewModel(Profile otherUser)
         }
 
         /// <summary>
-        /// Destructs ChatWindowViewModel, and so stops the background timer for updating chats
+        /// Destructs ChatWindowViewModel, and so stops the background timer for updating chats and cleans up ChatWindowFocus
         /// </summary>
         ~ChatWindowViewModel()
         {
+            ViewModelMediators.ChatWindowFocus.Remove(Receiver.UserID);
             Account.BackgroundThreads[backgroundThreadName].Dispose();
             Account.BackgroundThreads.Remove(backgroundThreadName);
         }

ViewModel/Helpers/NotificationHelper.cs

@@ -190,12 +190,15 @@ private static void ChatNotifications(object state)
                     {
                         foreach (ChatMessage c in unreadChatMessages)
                         {
-                            Profile chatProfile = Account.Matches.FirstOrDefault(p => p.UserID == c.FromUserId);
-                            ThrowChatMessageNotification(chatProfile.FirstName,
-                                                         chatProfile.LastName,
-                                                         chatProfile.FirstUserMedia,
-                                                         c.Content,
-                                                         chatProfile.UserID);
+                            if (!ViewModelMediators.ChatWindowFocus[c.FromUserId])
+                            {
+                                Profile chatProfile = Account.Matches.FirstOrDefault(p => p.UserID == c.FromUserId);
+                                ThrowChatMessageNotification(chatProfile.FirstName,
+                                                             chatProfile.LastName,
+                                                             chatProfile.FirstUserMedia,
+                                                             c.Content,
+                                                             chatProfile.UserID);
+                            }
                             c.Seen = true;
                         }
                     }

ViewModel/Mediators/ViewModelMediators.cs

@@ -57,6 +57,8 @@ public static List<Profile> Likes
                 LikesChanged?.Invoke();
             }
         }
+
+        public static Dictionary<int, bool> ChatWindowFocus { get; set; } = new Dictionary<int, bool>();
         #endregion
     }
 }