Moved files around. Moved a few into the CodeFramework

thedillonb · thedillonb · commit 43d0ebb31a74 · 2013-12-31T20:23:18.000-05:00
diff --git a/CodeHub.Core/App.cs b/CodeHub.Core/App.cs
@@ -19,10 +19,29 @@ public override void Initialize()
 			Cirrious.MvvmCross.Plugins.Messenger.PluginLoader.Instance.EnsureLoaded();
 
 			var httpService = Mvx.Resolve<IHttpClientService>();
+			var jsonSerializerService = Mvx.Resolve<IJsonSerializationService>();
 			GitHubSharp.Client.ClientConstructor = httpService.Create;
+			GitHubSharp.Client.Serializer = new GitHubSharpSerializer(jsonSerializerService);
 
             // Start the app with the First View Model.
 			this.RegisterAppStart<StartupViewModel>();
         }
+
+		class GitHubSharpSerializer : GitHubSharp.ISerializer
+		{
+			readonly IJsonSerializationService _service;
+			public GitHubSharpSerializer(IJsonSerializationService service)
+			{
+				this._service = service;
+			}
+			public string Serialize(object o)
+			{
+				return _service.Serialize(o);
+			}
+			public TData Deserialize<TData>(string data)
+			{
+				return _service.Deserialize<TData>(data);
+			}
+		}
     }
 }
diff --git a/CodeHub.Core/CodeHub.Core.iOS.csproj b/CodeHub.Core/CodeHub.Core.iOS.csproj
@@ -47,7 +47,6 @@
     <Compile Include="Services\IApplicationService.cs" />
     <Compile Include="Services\ILoginService.cs" />
     <Compile Include="Services\LoginService.cs" />
-    <Compile Include="Utils\RepositoryIdentifier.cs" />
     <Compile Include="ViewModels\Accounts\AccountsViewModel.cs" />
     <Compile Include="ViewModels\Accounts\AddAccountViewModel.cs" />
     <Compile Include="ViewModels\App\SettingsViewModel.cs" />
@@ -102,7 +101,6 @@
     <Compile Include="ViewModels\Gists\GistFileViewModel.cs" />
     <Compile Include="Utils\ViewModelExtensions.cs" />
     <Compile Include="ViewModels\Source\ChangesetDiffViewModel.cs" />
-    <Compile Include="Services\JsonSerializationService.cs" />
     <Compile Include="ViewModels\App\StartupViewModel.cs" />
     <Compile Include="Bootstrap\MessengerPluginBootstrap.cs" />
     <Compile Include="ViewModels\Issues\BaseIssuesViewModel.cs" />
@@ -117,7 +115,6 @@
     <Compile Include="Messages\IssueAddMessage.cs" />
     <Compile Include="ViewModels\Issues\IssueModifyViewModel.cs" />
     <Compile Include="Messages\IssueEditMessage.cs" />
-    <Compile Include="Services\IMarkdownService.cs" />
     <Compile Include="ViewModels\App\DefaultStartupViewModel.cs" />
     <Compile Include="ViewModels\Accounts\LoginViewModel.cs" />
     <Compile Include="ViewModels\CommitsViewModel.cs" />
@@ -140,8 +137,8 @@
       <HintPath>..\lib\CodeFramework\lib\iOS\Cirrious.MvvmCross.Plugins.Messenger.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\lib\GitHubSharp\lib\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="ServiceStack.Text.MonoTouch">
+      <HintPath>..\lib\CodeFramework\lib\iOS\ServiceStack.Text.MonoTouch.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/CodeHub.Core/Services/GitHubAccountsService.cs b/CodeHub.Core/Services/GitHubAccountsService.cs
@@ -9,7 +9,6 @@ public class GitHubAccountsService : AccountsService<GitHubAccount>
         public GitHubAccountsService(IDefaultValueService defaults, IAccountPreferencesService accountPreferences) 
             : base(defaults, accountPreferences)
         {
-            Console.WriteLine("Accounts created!");
         }
     }
 }
diff --git a/CodeHub.Core/Services/IMarkdownService.cs b/CodeHub.Core/Services/IMarkdownService.cs
diff --git a/CodeHub.Core/Services/JsonSerializationService.cs b/CodeHub.Core/Services/JsonSerializationService.cs
diff --git a/CodeHub.Core/Utils/RepositoryIdentifier.cs b/CodeHub.Core/Utils/RepositoryIdentifier.cs
diff --git a/CodeHub.Core/ViewModels/App/MenuViewModel.cs b/CodeHub.Core/ViewModels/App/MenuViewModel.cs
@@ -148,7 +148,7 @@ public ICommand GoToSettingsCommand
 
 		public ICommand GoToRepositoryCommand
 		{
-			get { return new MvxCommand<Utils.RepositoryIdentifier>(x => ShowMenuViewModel<RepositoryViewModel>(new RepositoryViewModel.NavObject { Username = x.Owner, Repository = x.Name }));}
+			get { return new MvxCommand<RepositoryIdentifier>(x => ShowMenuViewModel<RepositoryViewModel>(new RepositoryViewModel.NavObject { Username = x.Owner, Repository = x.Name }));}
 		}
 
         public ICommand LoadCommand
diff --git a/CodeHub.Core/ViewModels/Events/BaseEventsViewModel.cs b/CodeHub.Core/ViewModels/Events/BaseEventsViewModel.cs
@@ -5,7 +5,6 @@
 using System.Windows.Input;
 using Cirrious.MvvmCross.ViewModels;
 using CodeFramework.Core.ViewModels;
-using CodeHub.Core.Utils;
 using CodeHub.Core.ViewModels.Gists;
 using CodeHub.Core.ViewModels.Issues;
 using CodeHub.Core.ViewModels.PullRequests;
@@ -14,6 +13,7 @@
 using CodeHub.Core.ViewModels.User;
 using GitHubSharp;
 using GitHubSharp.Models;
+using CodeFramework.Core.Utils;
 
 namespace CodeHub.Core.ViewModels.Events
 {
diff --git a/CodeHub.Core/ViewModels/Issues/BaseIssuesViewModel.cs b/CodeHub.Core/ViewModels/Issues/BaseIssuesViewModel.cs
@@ -4,7 +4,6 @@
 using CodeHub.Core.Filters;
 using System.Windows.Input;
 using Cirrious.MvvmCross.ViewModels;
-using CodeHub.Core.Utils;
 using CodeHub.Core.ViewModels.PullRequests;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/CodeHub.Core/ViewModels/Issues/IssueEditViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueEditViewModel.cs
@@ -47,10 +47,28 @@ protected override async Task Save()
 				string[] labels = Labels.Items.Select(x => x.Name).ToArray();
 				var content = Content ?? string.Empty;
 				var state = IsOpen ? "open" : "closed";
+				var retried = false;
 
 				IsSaving = true;
-				var data = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Users[Username].Repositories[Repository].Issues[Issue.Number].Update(Title, content, state, assignedTo, milestone, labels)); 
-				Messenger.Publish(new IssueEditMessage(this) { Issue = data.Data });
+
+				// For some reason github needs to try again during an internal server error
+				tryagain:
+
+				try
+				{
+					var data = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Users[Username].Repositories[Repository].Issues[Issue.Number].Update(Title, content, state, assignedTo, milestone, labels)); 
+					Messenger.Publish(new IssueEditMessage(this) { Issue = data.Data });
+				}
+				catch (GitHubSharp.InternalServerException)
+				{
+					if (retried)
+						throw;
+
+					//Do nothing. Something is wrong with github's service
+					retried = true;
+					goto tryagain;
+				}
+
 				ChangePresentation(new MvxClosePresentationHint(this));
 			}
 			catch (Exception e)
diff --git a/CodeHub.Core/ViewModels/Issues/IssueViewModel.cs b/CodeHub.Core/ViewModels/Issues/IssueViewModel.cs
@@ -7,7 +7,7 @@
 using CodeHub.Core.ViewModels.User;
 using Cirrious.MvvmCross.Plugins.Messenger;
 using CodeHub.Core.Messages;
-using CodeHub.Core.Services;
+using CodeFramework.Core.Services;
 
 namespace CodeHub.Core.ViewModels.Issues
 {
diff --git a/CodeHub.Core/ViewModels/Source/SourceTreeViewModel.cs b/CodeHub.Core/ViewModels/Source/SourceTreeViewModel.cs
@@ -5,8 +5,8 @@
 using Cirrious.MvvmCross.ViewModels;
 using CodeFramework.Core.ViewModels;
 using CodeHub.Core.Filters;
-using CodeHub.Core.Utils;
 using GitHubSharp.Models;
+using CodeFramework.Core.Utils;
 
 namespace CodeHub.Core.ViewModels.Source
 {
diff --git a/CodeHub.iOS/AppDelegate.cs b/CodeHub.iOS/AppDelegate.cs
@@ -12,6 +12,7 @@
 using Cirrious.MvvmCross.ViewModels;
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
+using CodeFramework.Core.Utils;
 
 namespace CodeHub.iOS
 {
@@ -142,7 +143,7 @@ private void HandleNotification(NSDictionary data)
 			{
 				var viewDispatcher = Mvx.Resolve<Cirrious.MvvmCross.Views.IMvxViewDispatcher>();
 				var request = MvxViewModelRequest<CodeHub.Core.ViewModels.Repositories.RepositoryViewModel>.GetDefaultRequest();
-				var repoId = new CodeHub.Core.Utils.RepositoryIdentifier(data["r"].ToString());
+				var repoId = new RepositoryIdentifier(data["r"].ToString());
 				request.ParameterValues = new Dictionary<string, string>() {{"Username", repoId.Owner}, {"Repository", repoId.Name}};
 				viewDispatcher.ShowViewModel(request);
 			}
diff --git a/CodeHub.iOS/Services/MarkdownService.cs b/CodeHub.iOS/Services/MarkdownService.cs
@@ -1,6 +1,6 @@
-using CodeHub.Core.Services;
 using MonoTouch.JavaScriptCore;
 using MonoTouch.Foundation;
+using CodeFramework.Core.Services;
 
 namespace CodeHub.iOS.Services
 {
diff --git a/CodeHub.iOS/Views/App/MenuView.cs b/CodeHub.iOS/Views/App/MenuView.cs
@@ -5,6 +5,7 @@
 using MonoTouch.Dialog;
 using MonoTouch.UIKit;
 using System.Linq;
+using CodeFramework.Core.Utils;
 
 namespace CodeHub.iOS.Views.App
 {
@@ -126,7 +127,7 @@ public CodeFramework.Core.Data.PinnedRepository PinnedRepo
 			}
 
 			public PinnedRepoElement(CodeFramework.Core.Data.PinnedRepository pinnedRepo, System.Windows.Input.ICommand command)
-				: base(pinnedRepo.Name, () => command.Execute(new CodeHub.Core.Utils.RepositoryIdentifier { Owner = pinnedRepo.Owner, Name = pinnedRepo.Name }), Images.Repo)
+				: base(pinnedRepo.Name, () => command.Execute(new RepositoryIdentifier { Owner = pinnedRepo.Owner, Name = pinnedRepo.Name }), Images.Repo)
 			{
 				PinnedRepo = pinnedRepo;
 				ImageUri = new System.Uri(PinnedRepo.ImageUri);
diff --git a/CodeHub.iOS/Views/Issues/IssueAssignedToView.cs b/CodeHub.iOS/Views/Issues/IssueAssignedToView.cs
@@ -20,12 +20,12 @@ public override void ViewDidLoad()
 			BindCollection(vm.Users, x =>
 			{
 				var el = new UserElement(x.Login, string.Empty, string.Empty, x.AvatarUrl);
-					el.Tapped += () => {
-						if (vm.SelectedUser != null && string.Equals(vm.SelectedUser.Login, x.Login))
-							vm.SelectedUser = null;
-						else
-							vm.SelectedUser = x;
-					};
+				el.Tapped += () => {
+					if (vm.SelectedUser != null && string.Equals(vm.SelectedUser.Login, x.Login))
+						vm.SelectedUser = null;
+					else
+						vm.SelectedUser = x;
+				};
 				if (vm.SelectedUser != null && string.Equals(vm.SelectedUser.Login, x.Login, StringComparison.OrdinalIgnoreCase))
 					el.Accessory = UITableViewCellAccessory.Checkmark;
 				else
@@ -38,8 +38,8 @@ public override void ViewDidLoad()
 				if (Root.Count == 0)
 					return;
 				foreach (var m in Root[0].Elements.Cast<UserElement>())
-				m.Accessory = (x != null && string.Equals(vm.SelectedUser.Login, x.Login, StringComparison.OrdinalIgnoreCase)) ? 
-					          UITableViewCellAccessory.Checkmark : UITableViewCellAccessory.None;
+					m.Accessory = (x != null && string.Equals(vm.SelectedUser.Login, m.Caption, StringComparison.OrdinalIgnoreCase)) ? 
+					          	   UITableViewCellAccessory.Checkmark : UITableViewCellAccessory.None;
 				Root.Reload(Root[0], UITableViewRowAnimation.None);
 			});
         }
diff --git a/lib/CodeFramework b/lib/CodeFramework
@@ -1 +1 @@
-Subproject commit d8860dff7a1b039fc732aa04caf03a85f961b4c4
+Subproject commit c8988585b5f5ef768e032632244f1a991d2acd80
diff --git a/lib/GitHubSharp b/lib/GitHubSharp
@@ -1 +1 @@
-Subproject commit cb4dc40acf70a6daea343e93a96543ca54f75bb3
+Subproject commit e0fc82077181cb4d5eade6753a31833fc590897f

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ public class GitHubAccountsService : AccountsService<GitHubAccount>`
`9`	`9`	`public GitHubAccountsService(IDefaultValueService defaults, IAccountPreferencesService accountPreferences)`
`10`	`10`	`: base(defaults, accountPreferences)`
`11`	`11`	`{`
`12`		`- Console.WriteLine("Accounts created!");`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public ICommand GoToSettingsCommand`
`148`	`148`
`149`	`149`	`public ICommand GoToRepositoryCommand`
`150`	`150`	`{`
`151`		`- get { return new MvxCommand<Utils.RepositoryIdentifier>(x => ShowMenuViewModel<RepositoryViewModel>(new RepositoryViewModel.NavObject { Username = x.Owner, Repository = x.Name }));}`
	`151`	`+ get { return new MvxCommand<RepositoryIdentifier>(x => ShowMenuViewModel<RepositoryViewModel>(new RepositoryViewModel.NavObject { Username = x.Owner, Repository = x.Name }));}`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public ICommand LoadCommand`