Fixed crashes in events and notifications. Fixed caching issue for notification number in Menu

Author: thedillonb

CodeHub.Core/ViewModels/App/MenuViewModel.cs

@@ -156,9 +156,11 @@ public ICommand LoadCommand
             get { return new MvxCommand(Load);}    
         }
 
-        private async void Load()
+        private void Load()
         {
-			this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Notifications.GetAll()).ContinueWith(x =>
+			var notificationRequest = this.GetApplication().Client.Notifications.GetAll();
+			notificationRequest.RequestFromCache = false;
+			this.GetApplication().Client.ExecuteAsync(notificationRequest).ContinueWith(x =>
 			{
 				Notifications = x.Result.Data.Count;
 			}, TaskContinuationOptions.OnlyOnRanToCompletion).FireAndForget();

CodeHub.Core/ViewModels/Events/BaseEventsViewModel.cs

@@ -37,17 +37,29 @@ protected BaseEventsViewModel()
             ReportRepository = true;
         }
 
-        protected override Task Load(bool forceDataRefresh)
-        {
-            return Task.Run(() => this.RequestModel(CreateRequest(0, 100), forceDataRefresh, response => {
+        protected override Task Load(bool forceCacheInvalidation)
+        {
+			return this.RequestModel(CreateRequest(0, 100), forceCacheInvalidation, response => {
 				this.CreateMore(response, m => Events.MoreItems = m, d => Events.Items.AddRange(CreateDataFromLoad(d)));
                 Events.Items.Reset(CreateDataFromLoad(response.Data));
-            }));
+            });
         }
 
-        private IEnumerable<Tuple<EventModel, EventBlock>> CreateDataFromLoad(IEnumerable<EventModel> events)
+		private IEnumerable<Tuple<EventModel, EventBlock>> CreateDataFromLoad(List<EventModel> events)
         {
-			return events.Select(x => new Tuple<EventModel, EventBlock>(x, CreateEventTextBlocks(x)));
+			var transformedEvents = new List<Tuple<EventModel, EventBlock>>(events.Count);
+			foreach (var e in events)
+			{
+				try
+				{
+					transformedEvents.Add(new Tuple<EventModel, EventBlock>(e, CreateEventTextBlocks(e)));
+				}
+				catch (Exception ex)
+				{
+					System.Diagnostics.Debug.WriteLine(ex.ToString());
+				}
+			}
+			return transformedEvents;
         }
 
         protected abstract GitHubRequest<List<EventModel>> CreateRequest(int page, int perPage);

CodeHub.Core/ViewModels/NotificationsViewModel.cs

@@ -10,6 +10,7 @@
 using CodeHub.Core.ViewModels.PullRequests;
 using GitHubSharp.Models;
 using CodeHub.Core.Messages;
+using System.Collections.Generic;
 
 namespace CodeHub.Core.ViewModels
 {
@@ -54,12 +55,12 @@ public ICommand ReadCommand
 
 		public ICommand ReadRepositoriesCommand
 		{
-			get { return _readReposCommand ?? (_readReposCommand = new MvxCommand<string>(MarkRepoAsRead)); }
+			get { return _readReposCommand ?? (_readReposCommand = new MvxCommand<string>(x => MarkRepoAsRead(x))); }
 		}
 
         public ICommand ReadAllCommand
         {
-			get { return _readAllCommand ?? (_readAllCommand = new MvxCommand(MarkAllAsRead, () => ShownIndex != 2 && !IsLoading && !IsMarking && Notifications.Any())); }
+			get { return _readAllCommand ?? (_readAllCommand = new MvxCommand(() => MarkAllAsRead(), () => ShownIndex != 2 && !IsLoading && !IsMarking && Notifications.Any())); }
         }
 
         public ICommand GoToNotificationCommand
@@ -125,60 +126,45 @@ private async void Read(NotificationModel model)
 			// If its already read, ignore it
 			if (!model.Unread)
 				return;
-
-			var response = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Notifications[model.Id].MarkAsRead());
-            if (response.Data) 
-            {
-                //We just read it
-                model.Unread = false;
- 
-                //Update the notifications count on the account
-				Notifications.Items.Remove(model);
-                UpdateAccountNotificationsCount();
-            }
-        }
-
-		private async void MarkRepoAsRead(string repo)
-		{
-			var items = Notifications.Items.Where(x => string.Equals(x.Repository.FullName, repo, StringComparison.OrdinalIgnoreCase)).ToList();
-
 			try
 			{
-				IsMarking = true;
-
-				foreach (var notification in items)
-				{
-					try
-					{
-						await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Notifications[notification.Id].MarkAsRead());
-						notification.Unread = false;
-					}
-					catch
-					{
-						//Ignore?
-					}
-				}
-
-				Notifications.Items.RemoveRange(items);
-				UpdateAccountNotificationsCount();
+				var response = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Notifications[model.Id].MarkAsRead());
+	            if (response.Data) 
+	            {
+	                //We just read it
+	                model.Unread = false;
+	 
+	                //Update the notifications count on the account
+					Notifications.Items.Remove(model);
+	                UpdateAccountNotificationsCount();
+	            }
 			}
-			finally
+			catch (Exception e)
 			{
-				IsMarking = false;
-			}
+				ReportError(e);
+			}
+        }
+
+		private async Task MarkRepoAsRead(string repo)
+		{
+			var items = Notifications.Items.Where(x => string.Equals(x.Repository.FullName, repo, StringComparison.OrdinalIgnoreCase)).ToList();
+			await MarkNotificationsAsRead(items);
 		}
 
-		private async void MarkAllAsRead()
+		private async Task MarkAllAsRead()
 		{
 			// Make sure theres some sort of notification
-			if (!Notifications.Any())
-				return;
+			if (Notifications.Any())
+				await MarkNotificationsAsRead(Notifications);
+        }
 
+		private async Task MarkNotificationsAsRead(IEnumerable<NotificationModel> notifications)
+		{
 			try
 			{
 				IsMarking = true;
 
-				foreach (var notification in Notifications)
+				foreach (var notification in notifications)
 				{
 					try
 					{
@@ -194,11 +180,15 @@ private async void MarkAllAsRead()
 				Notifications.Items.Clear();
 				UpdateAccountNotificationsCount();
 			}
+			catch (Exception e)
+			{
+				ReportError(e);
+			}
 			finally
 			{
 				IsMarking = false;
 			}
-        }
+		}
 
         private void UpdateAccountNotificationsCount()
         {