Merge pull request #126 from Standaard-boos/Notifications

Bug fixes

Author: BastogneBas

View/MainWindow.xaml.cs

@@ -40,6 +40,9 @@ public MainWindow()
 
             // Subscribe for the opening of a chat window once a chat notification is clicked
             ToastNotificationManagerCompat.OnActivated += Chat_Notification;
+
+            // Clear all windows once the authentication has finished
+            ViewModelMediators.AuthenticationStateChanged += CloseOpenProfileAndChatWindows;
         }
 
         protected override void OnStateChanged(EventArgs e)
@@ -95,5 +98,19 @@ private void Chat_Notification(ToastNotificationActivatedEventArgsCompat toastAr
                 }
             }
         }
+
+        /// <summary>
+        /// Closes all open chat and profile windows.
+        /// </summary>
+        private void CloseOpenProfileAndChatWindows()
+        {
+            foreach (Window w in System.Windows.Application.Current.Windows)
+            {
+                if (w.GetType() == typeof(ChatWindow) || w.GetType() == typeof(ProfileWindow))
+                {
+                    w.Close();
+                }
+            }
+        }
     }
 }

View/ServerError.xaml

@@ -0,0 +1,12 @@
+<Page x:Class="View.ServerError"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      mc:Ignorable="d" 
+      Title="Fout">
+
+    <Grid>
+        <Label Content="Er ging iets mis met de verbinding met de server. Neem contact op met de administrators van Stugether." HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+</Page>

View/ServerError.xaml.cs

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace View
+{
+    /// <summary>
+    /// Interaction logic for ServerError.xaml
+    /// </summary>
+    public partial class ServerError : Page
+    {
+        public ServerError()
+        {
+            InitializeComponent();
+        }
+    }
+}

ViewModel/Helpers/NotificationHelper.cs

@@ -53,18 +53,9 @@ public static void SetAllNotificationTimers(bool set, bool reRun)
             }
             if (set)
             {
-                if (Account.NotificationSettings.Matches)
-                {
-                    Account.BackgroundThreads[keyArray[0]] = new Timer(MatchOrLikeNotification, MatchOrLike.Matched, 0, 5000);
-                }
-                if (Account.NotificationSettings.Likes)
-                {
-                    Account.BackgroundThreads[keyArray[1]] = new Timer(MatchOrLikeNotification, MatchOrLike.Liked, 0, 5000);
-                }
-                if (Account.NotificationSettings.Chat)
-                {
-                    Account.BackgroundThreads[keyArray[2]] = new Timer(ChatNotifications, null, 0, 1000);
-                }
+                Account.BackgroundThreads[keyArray[0]] = new Timer(MatchOrLikeNotification, MatchOrLike.Matched, 0, 5000);
+                Account.BackgroundThreads[keyArray[1]] = new Timer(MatchOrLikeNotification, MatchOrLike.Liked, 0, 5000);
+                Account.BackgroundThreads[keyArray[2]] = new Timer(ChatNotifications, null, 0, 1000);
             }
         }
 
@@ -125,18 +116,21 @@ private static void MatchOrLikeNotification(object matchOrLike)
             // If the amounts are different OR there is at least 1 new user...
             if (current.Count != previous.Count || current.Count > 0)
             {
+                bool notificationsOn;
                 // ...reload the profiles
                 if ((MatchOrLike)matchOrLike == MatchOrLike.Matched)
                 {
                     ViewModelMediators.Matches = MatchHelper.LoadProfilesOfMatches(Account.UserID.Value);
+                    notificationsOn = Account.NotificationSettings.Matches;
                 }
                 else
                 {
                     ViewModelMediators.Likes = MatchHelper.LoadProfilesOfLikes(Account.UserID.Value);
+                    notificationsOn = Account.NotificationSettings.Likes;
                 }
 
-                // If the current amount are more (so there is a new user instead of an user who removed you)...
-                if (current.Count > 0)
+                // If the current amount are more (so there is a new user instead of an user who removed you) and notifications are turned on...
+                if (notificationsOn && current.Count > 0)
                 {
                     // Throw new notification with amount of new matches or likes
                     ThrowMatchOrLikeNotification((MatchOrLike)matchOrLike, current.Count);
@@ -185,18 +179,22 @@ private static void ChatNotifications(object state)
                     ViewModelMediators.Matches = MatchHelper.LoadProfilesOfMatches(Account.UserID.Value);
                 }
 
-                // Throw notifications for every new chat message
-                foreach (ChatMessage c in unreadChatMessages)
+                // Throw notifications for every new chat message if notifications are on
+                if (Account.NotificationSettings.Chat)
                 {
-                    Profile chatProfile = Account.Matches.FirstOrDefault(p => p.UserID == c.FromUserId);
-                    ThrowChatMessageNotification(chatProfile.FirstName,
-                                                 chatProfile.LastName,
-                                                 chatProfile.FirstUserMedia,
-                                                 c.Content,
-                                                 chatProfile.UserID);
-                    c.Seen = true;
+                    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);
+                        c.Seen = true;
+                    }
                 }
 
+                // Set the NotifiedChatMessages to the newly obtained chat messages list
                 Account.NotifiedChatMessages = newChatMessages;
             }
         }

ViewModel/MainPageViewModel.cs

@@ -25,8 +25,17 @@ public class MainPageViewModel : ObservableObject
         /// </summary>
         public MainPageViewModel()
         {
-            SSHService.Initialize(); // Initialize SSH for the database connection and logging in
-            MainNavigationItems = SetObservableCollection(false); // Initialize the default page list
+            // Initialize the default page list
+            MainNavigationItems = SetObservableCollection(false);
+
+            try
+            {
+                SSHService.Initialize(); // Initialize SSH for the database connection and logging in
+            }
+            catch (Exception)
+            {
+                MainWindowPage = "ServerError.xaml";
+            }
 
             // Subscribe a bunch of events to make certain other functions work
             ViewModelMediators.AuthenticationStateChanged += OnAuthenticationStateChanged;