Merge pull request #137 from Unabashed-Development/bugfixing

Fixed #136

Author: RillJ

ViewModel/Authentication/HomePageAfterLoginViewModel.cs

@@ -16,6 +16,7 @@ private void Logout()
         {
             Account.Email = null;
             Account.UserID = null;
+            Account.NotifiedChatMessages = null;
             ViewModelMediators.Authenticated = false;
         }
 

ViewModel/Helpers/NotificationHelper.cs

@@ -93,16 +93,20 @@ private static void MatchOrLikeNotification(object matchOrLike)
             List<Profile> profileList;
 
             // Prepares data depending on the match or like handling
-            if ((MatchOrLike)matchOrLike == MatchOrLike.Matched)
+            if ((MatchOrLike)matchOrLike == MatchOrLike.Matched && Account.UserID != null)
             {
                 current = new HashSet<int>(MatchDataAccess.GetAllMatchesFromUser(Account.UserID.Value, MatchOrLike.Matched));
                 profileList = ViewModelMediators.Matches;
             }
-            else
+            else if ((MatchOrLike)matchOrLike == MatchOrLike.Liked && Account.UserID != null)
             {
                 current = new HashSet<int>(MatchDataAccess.GetReceivedLikesFromUser(Account.UserID.Value));
                 profileList = ViewModelMediators.Likes;
             }
+            else
+            {
+                throw new Exception("Match or like notification MatchOrLike enum not set correctly");
+            }
 
             // Add the user ID's to the HashSet
             foreach (Profile p in profileList)
@@ -120,15 +124,21 @@ private static void MatchOrLikeNotification(object matchOrLike)
                 // ...reload the profiles
                 if ((MatchOrLike)matchOrLike == MatchOrLike.Matched)
                 {
-                    ViewModelMediators.Matches = MatchHelper.LoadProfilesOfMatches(Account.UserID.Value);
+                    if (Account.UserID != null)
+                    {
+                        ViewModelMediators.Matches = MatchHelper.LoadProfilesOfMatches(Account.UserID.Value);
+                    }
                     if (Account.NotificationSettings != null)
                     {
                         notificationsOn = Account.NotificationSettings.Matches;
                     }
                 }
                 else
                 {
-                    ViewModelMediators.Likes = MatchHelper.LoadProfilesOfLikes(Account.UserID.Value);
+                    if (Account.UserID != null)
+                    {
+                        ViewModelMediators.Likes = MatchHelper.LoadProfilesOfLikes(Account.UserID.Value);
+                    }
                     if (Account.NotificationSettings != null)
                     {
                         notificationsOn = Account.NotificationSettings.Likes;