Refactoring and error corrections

thedillonb · thedillonb · commit e1754e2ce6f0 · 2014-04-01T21:32:33.000-04:00
diff --git a/CodeHub.Core/ViewModels/Accounts/AccountsViewModel.cs b/CodeHub.Core/ViewModels/Accounts/AccountsViewModel.cs
@@ -52,15 +52,16 @@ protected async override void SelectAccount(IAccount account)
 			}
 			catch (GitHubSharp.UnauthorizedException e)
 			{
-				ReportError(e);
+                DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);
+
 				if (isEnterprise)
 					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = githubAccount.Id });
 				else
 					ShowViewModel<LoginViewModel>(LoginViewModel.NavObject.CreateDontRemember(githubAccount));
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                ReportException(e);
 			}
 			finally
 			{
diff --git a/CodeHub.Core/ViewModels/Accounts/AddAccountViewModel.cs b/CodeHub.Core/ViewModels/Accounts/AddAccountViewModel.cs
@@ -111,7 +111,7 @@ private async Task Login()
                 if (!(e is LoginService.TwoFactorRequiredException))
                 {
                     Password = null;
-					DisplayException(e);
+                    DisplayAlert(e.Message);
                 }
             }
             finally
diff --git a/CodeHub.Core/ViewModels/Accounts/LoginViewModel.cs b/CodeHub.Core/ViewModels/Accounts/LoginViewModel.cs
@@ -118,7 +118,7 @@ public async Task Login(string code)
             }
             catch (Exception e)
             {
-                ReportError(e);
+                DisplayAlert(e.Message);
             }
             finally
             {
diff --git a/CodeHub.Core/ViewModels/App/SettingsViewModel.cs b/CodeHub.Core/ViewModels/App/SettingsViewModel.cs
@@ -100,7 +100,7 @@ private async Task RegisterPushNotifications(bool enabled)
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                ReportException(e);
 			}
             finally
             {
diff --git a/CodeHub.Core/ViewModels/App/StartupViewModel.cs b/CodeHub.Core/ViewModels/App/StartupViewModel.cs
@@ -60,7 +60,8 @@ protected async override void Startup()
 			}
 			catch (GitHubSharp.UnauthorizedException e)
 			{
-				ReportError(e);
+                DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);
+
 				ShowViewModel<Accounts.AccountsViewModel>();
 				if (isEnterprise)
 					ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
@@ -69,7 +70,7 @@ protected async override void Startup()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                ReportException(e);
 				ShowViewModel<Accounts.AccountsViewModel>();
 			}
 			finally
diff --git a/CodeHub.Core/ViewModels/Gists/GistCreateViewModel.cs b/CodeHub.Core/ViewModels/Gists/GistCreateViewModel.cs
@@ -83,7 +83,7 @@ private async Task Save()
         {
             if (_files.Count == 0)
             {
-                DisplayException(new Exception("You cannot create a Gist without atleast one file"));
+                DisplayAlert("You cannot create a Gist without atleast one file! Please correct and try again.");
                 return;
             }
 
@@ -103,7 +103,7 @@ private async Task Save()
             }
             catch (Exception e)
             {
-                ReportError(e);
+                DisplayAlert("Unable to create new gist! Please try again.");
             }
             finally
             {
diff --git a/CodeHub.Core/ViewModels/Gists/GistViewModel.cs b/CodeHub.Core/ViewModels/Gists/GistViewModel.cs
@@ -110,7 +110,7 @@ private async Task ToggleStarred()
             }
 			catch (Exception e)
             {
-				ReportError(e);
+                DisplayAlert("Unable to start gist. Please try again.");
             }
         }
 
diff --git a/CodeHub.Core/ViewModels/Issues/IssueAddViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueAddViewModel.cs
@@ -10,11 +10,14 @@ public class IssueAddViewModel : IssueModifyViewModel
     {
 		protected override async Task Save()
 		{
+            if (string.IsNullOrEmpty(Title))
+            {
+                DisplayAlert("Unable to save the issue: you must provide a title!");
+                return;
+            }
+
 			try
 			{
-				if (string.IsNullOrEmpty(Title))
-					throw new Exception("Issue must have a title!");
-
 				string assignedTo = AssignedTo == null ? null : AssignedTo.Login;
 				int? milestone = null;
 				if (Milestone != null) 
@@ -29,7 +32,7 @@ protected override async Task Save()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to save new issue! Please try again.");
 			}
 			finally
 			{
diff --git a/CodeHub.Core/ViewModels/Issues/IssueAssignedToViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueAssignedToViewModel.cs
@@ -73,7 +73,7 @@ private async Task SelectUser(BasicUserModel x)
 				}
 				catch (Exception e)
 				{
-					DisplayException(e);
+                    DisplayAlert("Unable to assign issue to selected user! Please try again.");
 				}
 				finally
 				{
diff --git a/CodeHub.Core/ViewModels/Issues/IssueEditViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueEditViewModel.cs
@@ -73,7 +73,7 @@ protected override async Task Save()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to save the issue! Please try again");
 			}
 			finally
 			{
diff --git a/CodeHub.Core/ViewModels/Issues/IssueLabelsViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueLabelsViewModel.cs
@@ -81,7 +81,7 @@ private async Task SelectLabels(IEnumerable<LabelModel> x)
 				}
 				catch (Exception e)
 				{
-					DisplayException(e);
+                    DisplayAlert("Unable to save labels! Please try again.");
 				}
 				finally
 				{
diff --git a/CodeHub.Core/ViewModels/Issues/IssueMilestonesViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueMilestonesViewModel.cs
@@ -73,7 +73,8 @@ private async Task SelectMilestone(MilestoneModel x)
 				}
 				catch (Exception e)
 				{
-					DisplayException(e);
+                    DisplayAlert("Unable to to save milestone! Please try again.");
+                    ReportException(e);
 				}
 				finally
 				{
diff --git a/CodeHub.Core/ViewModels/NotificationsViewModel.cs b/CodeHub.Core/ViewModels/NotificationsViewModel.cs
@@ -148,7 +148,7 @@ private async Task Read(NotificationModel model)
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to mark notification as read. Please try again.");
 			}
         }
 
@@ -164,7 +164,7 @@ private async Task MarkRepoAsRead(string repo)
             }
             catch (Exception e)
             {
-                ReportError(e);
+                DisplayAlert("Unable to mark repositories' notifications as read. Please try again.");
             }
             finally
             {
@@ -187,7 +187,7 @@ private async Task MarkAllAsRead()
             }
             catch (Exception e)
             {
-                ReportError(e);
+                DisplayAlert("Unable to mark all notifications as read. Please try again.");
             }
             finally
             {
diff --git a/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs b/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs
@@ -11,13 +11,22 @@ namespace CodeHub.Core.ViewModels.Repositories
 {
 	public class ReadmeViewModel : LoadableViewModel
     {
+        private readonly IMarkdownService _markdownService;
         private string _data;
         private string _path;
 		private GitHubSharp.Models.ContentModel _contentModel;
 
-        public string Username { get; private set; }
+        public string Username 
+        {
+            get;
+            private set; 
+        }
 
-        public string Repository { get; private set; }
+        public string Repository 
+        {
+            get;
+            private set; 
+        }
 
         public string Data
         {
@@ -43,18 +52,20 @@ public ICommand GoToLinkCommand
 
 		public ICommand ShareCommand
 		{
-			get
-			{
-				return new MvxCommand(() => GetService<IShareService>().ShareUrl(_contentModel.HtmlUrl), () => _contentModel != null);
-			}
+            get { return new MvxCommand(() => GetService<IShareService>().ShareUrl(_contentModel.HtmlUrl), () => _contentModel != null); }
 		}
 
+        public ReadmeViewModel(IMarkdownService markdownService)
+        {
+            _markdownService = markdownService;
+        }
+
 		protected override Task Load(bool forceCacheInvalidation)
 		{
             return this.RequestModel(this.GetApplication().Client.Users[Username].Repositories[Repository].GetReadme(), forceCacheInvalidation, x =>
             {
-                var markdownService = GetService<IMarkdownService>();
-                var data = markdownService.Convert(Encoding.UTF8.GetString(Convert.FromBase64String(x.Data.Content)));
+                _contentModel = x.Data;
+                var data = _markdownService.Convert(Encoding.UTF8.GetString(Convert.FromBase64String(x.Data.Content)));
                 Path = CreateHtmlFile(data);
             });
 		}
diff --git a/CodeHub.Core/ViewModels/Repositories/RepositoriesExploreViewModel.cs b/CodeHub.Core/ViewModels/Repositories/RepositoriesExploreViewModel.cs
@@ -63,7 +63,7 @@ private async Task Search()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to search for repositories. Please try again.");
 			}
 			finally
 			{
diff --git a/CodeHub.Core/ViewModels/Repositories/RepositoryViewModel.cs b/CodeHub.Core/ViewModels/Repositories/RepositoryViewModel.cs
@@ -208,7 +208,7 @@ private async Task ToggleWatch()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to toggle repository as " + (IsWatched.Value ? "unwatched" : "watched") + "! Please try again.");
 			}
         }
 
@@ -237,7 +237,7 @@ private async Task ToggleStar()
 			}
 			catch (Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to " + (IsStarred.Value ? "unstar" : "star") + " this repository! Please try again.");
 			}
         }
 
diff --git a/CodeHub.Core/ViewModels/User/ProfileViewModel.cs b/CodeHub.Core/ViewModels/User/ProfileViewModel.cs
@@ -91,7 +91,7 @@ private async Task ToggleFollowing()
 			}
 			catch (System.Exception e)
 			{
-				ReportError(e);
+                DisplayAlert("Unable to follow user! Please try again.");
 			}
 		}
   
diff --git a/CodeHub.Core/ViewModels/User/TeamMembersViewModel.cs b/CodeHub.Core/ViewModels/User/TeamMembersViewModel.cs
@@ -4,11 +4,7 @@ namespace CodeHub.Core.ViewModels.User
 {
     public class TeamMembersViewModel : BaseUserCollectionViewModel
     {
-        public long Id
-        {
-            get;
-            private set;
-        }
+        public long Id { get; private set; }
 
         public void Init(NavObject navObject)
         {
diff --git a/CodeHub.Core/ViewModels/User/UserFollowersViewModel.cs b/CodeHub.Core/ViewModels/User/UserFollowersViewModel.cs
@@ -4,11 +4,7 @@ namespace CodeHub.Core.ViewModels.User
 {
     public class UserFollowersViewModel : BaseUserCollectionViewModel
     {
-        public string Name
-        {
-            get;
-            private set;
-        }
+        public string Name { get; private set; }
 
         public void Init(NavObject navObject)
         {
diff --git a/CodeHub.Core/ViewModels/User/UserFollowingsViewModel.cs b/CodeHub.Core/ViewModels/User/UserFollowingsViewModel.cs
@@ -4,11 +4,7 @@ namespace CodeHub.Core.ViewModels.User
 {
     public class UserFollowingsViewModel : BaseUserCollectionViewModel
     {
-        public string Name
-        {
-            get;
-            private set;
-        }
+        public string Name { get; private set; }
 
         public void Init(NavObject navObject)
         {
diff --git a/lib/CodeFramework b/lib/CodeFramework
@@ -1 +1 @@
-Subproject commit 4e7c7a4771e665c632af49680f83e18ffdd91516
+Subproject commit 6b45d4d665a10722a2e5c4739cde8f13d73d0985

Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,16 @@ protected async override void SelectAccount(IAccount account)`
`52`	`52`	`}`
`53`	`53`	`catch (GitHubSharp.UnauthorizedException e)`
`54`	`54`	`{`
`55`		`- ReportError(e);`
	`55`	`+ DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);`
	`56`	`+`
`56`	`57`	`if (isEnterprise)`
`57`	`58`	`ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = githubAccount.Id });`
`58`	`59`	`else`
`59`	`60`	`ShowViewModel<LoginViewModel>(LoginViewModel.NavObject.CreateDontRemember(githubAccount));`
`60`	`61`	`}`
`61`	`62`	`catch (Exception e)`
`62`	`63`	`{`
`63`		`- ReportError(e);`
	`64`	`+ ReportException(e);`
`64`	`65`	`}`
`65`	`66`	`finally`
`66`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private async Task Login()`
`111`	`111`	`if (!(e is LoginService.TwoFactorRequiredException))`
`112`	`112`	`{`
`113`	`113`	`Password = null;`
`114`		`- DisplayException(e);`
	`114`	`+ DisplayAlert(e.Message);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public async Task Login(string code)`
`118`	`118`	`}`
`119`	`119`	`catch (Exception e)`
`120`	`120`	`{`
`121`		`- ReportError(e);`
	`121`	`+ DisplayAlert(e.Message);`
`122`	`122`	`}`
`123`	`123`	`finally`
`124`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private async Task RegisterPushNotifications(bool enabled)`
`100`	`100`	`}`
`101`	`101`	`catch (Exception e)`
`102`	`102`	`{`
`103`		`- ReportError(e);`
	`103`	`+ ReportException(e);`
`104`	`104`	`}`
`105`	`105`	`finally`
`106`	`106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ protected async override void Startup()`
`60`	`60`	`}`
`61`	`61`	`catch (GitHubSharp.UnauthorizedException e)`
`62`	`62`	`{`
`63`		`- ReportError(e);`
	`63`	`+ DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);`
	`64`	`+`
`64`	`65`	`ShowViewModel<Accounts.AccountsViewModel>();`
`65`	`66`	`if (isEnterprise)`
`66`	`67`	`ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });`
`@@ -69,7 +70,7 @@ protected async override void Startup()`
`69`	`70`	`}`
`70`	`71`	`catch (Exception e)`
`71`	`72`	`{`
`72`		`- ReportError(e);`
	`73`	`+ ReportException(e);`
`73`	`74`	`ShowViewModel<Accounts.AccountsViewModel>();`
`74`	`75`	`}`
`75`	`76`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private async Task Save()`
`83`	`83`	`{`
`84`	`84`	`if (_files.Count == 0)`
`85`	`85`	`{`
`86`		`- DisplayException(new Exception("You cannot create a Gist without atleast one file"));`
	`86`	`+ DisplayAlert("You cannot create a Gist without atleast one file! Please correct and try again.");`
`87`	`87`	`return;`
`88`	`88`	`}`
`89`	`89`
`@@ -103,7 +103,7 @@ private async Task Save()`
`103`	`103`	`}`
`104`	`104`	`catch (Exception e)`
`105`	`105`	`{`
`106`		`- ReportError(e);`
	`106`	`+ DisplayAlert("Unable to create new gist! Please try again.");`
`107`	`107`	`}`
`108`	`108`	`finally`
`109`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private async Task ToggleStarred()`
`110`	`110`	`}`
`111`	`111`	`catch (Exception e)`
`112`	`112`	`{`
`113`		`- ReportError(e);`
	`113`	`+ DisplayAlert("Unable to start gist. Please try again.");`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,14 @@ public class IssueAddViewModel : IssueModifyViewModel`
`10`	`10`	`{`
`11`	`11`	`protected override async Task Save()`
`12`	`12`	`{`
	`13`	`+ if (string.IsNullOrEmpty(Title))`
	`14`	`+ {`
	`15`	`+ DisplayAlert("Unable to save the issue: you must provide a title!");`
	`16`	`+ return;`
	`17`	`+ }`
	`18`	`+`
`13`	`19`	`try`
`14`	`20`	`{`
`15`		`- if (string.IsNullOrEmpty(Title))`
`16`		`- throw new Exception("Issue must have a title!");`
`17`		`-`
`18`	`21`	`string assignedTo = AssignedTo == null ? null : AssignedTo.Login;`
`19`	`22`	`int? milestone = null;`
`20`	`23`	`if (Milestone != null)`
`@@ -29,7 +32,7 @@ protected override async Task Save()`
`29`	`32`	`}`
`30`	`33`	`catch (Exception e)`
`31`	`34`	`{`
`32`		`- ReportError(e);`
	`35`	`+ DisplayAlert("Unable to save new issue! Please try again.");`
`33`	`36`	`}`
`34`	`37`	`finally`
`35`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private async Task SelectUser(BasicUserModel x)`
`73`	`73`	`}`
`74`	`74`	`catch (Exception e)`
`75`	`75`	`{`
`76`		`- DisplayException(e);`
	`76`	`+ DisplayAlert("Unable to assign issue to selected user! Please try again.");`
`77`	`77`	`}`
`78`	`78`	`finally`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected override async Task Save()`
`73`	`73`	`}`
`74`	`74`	`catch (Exception e)`
`75`	`75`	`{`
`76`		`- ReportError(e);`
	`76`	`+ DisplayAlert("Unable to save the issue! Please try again");`
`77`	`77`	`}`
`78`	`78`	`finally`
`79`	`79`	`{`