Fixed a "bug" where issues would always group by repository

Author: thedillonb

CodeHub.Core/CodeHub.Core.iOS.csproj

@@ -123,6 +123,7 @@
     <Compile Include="ViewModels\App\AboutViewModel.cs" />
     <Compile Include="ViewModels\Source\EditSourceViewModel.cs" />
     <Compile Include="Messages\SourceEditMessage.cs" />
+    <Compile Include="Services\JsonSerializationService.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

CodeHub.Core/Services/JsonSerializationService.cs

@@ -0,0 +1,26 @@
+using System;
+using CodeFramework.Core.Services;
+
+namespace CodeHub.Core.Services
+{
+    public class JsonSerializationService : IJsonSerializationService
+    {
+        private readonly GitHubSharp.SimpleJsonSerializer _serializer;
+
+        public JsonSerializationService()
+        {
+            _serializer = new GitHubSharp.SimpleJsonSerializer();
+        }
+
+        public string Serialize(object o)
+        {
+            return _serializer.Serialize(o);
+        }
+
+        public TData Deserialize<TData>(string data)
+        {
+            return _serializer.Deserialize<TData>(data);
+        }
+    }
+}
+

CodeHub.Core/ViewModels/Issues/BaseIssuesViewModel.cs

@@ -38,7 +38,7 @@ public ICommand GoToIssueCommand
 			}
 		}
 
-		protected List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> model)
+        protected virtual List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> model)
 		{
 			var order = Issues.Filter.SortType;
 			if (order == BaseIssuesFilterModel<TFilterModel>.Sort.Comments)
@@ -60,15 +60,7 @@ protected List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> mode
 				return FilterGroup.CreateNumberedGroup(g, "Days Ago", "Created");
 			}
 
-			try
-			{
-				var regex = new System.Text.RegularExpressions.Regex("repos/(.+)/issues/");
-				return model.GroupBy(x => regex.Match(x.Url).Groups[1].Value).ToList();
-			}
-			catch (Exception e)
-			{
-				return null;
-			}
+            return null;
 		}
     }
 

CodeHub.Core/ViewModels/Issues/MyIssuesViewModel.cs

@@ -2,6 +2,9 @@
 using CodeFramework.Core.ViewModels;
 using CodeHub.Core.Filters;
 using GitHubSharp.Models;
+using System.Collections.Generic;
+using System.Linq;
+using System;
 
 namespace CodeHub.Core.ViewModels.Issues
 {
@@ -32,6 +35,25 @@ public MyIssuesViewModel()
 				else if (x == 1)
 					_issues.Filter = MyIssuesFilterModel.CreateClosedFilter();
 			});
+        }
+
+        protected override List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> model)
+        {
+            var group = base.Group(model);
+            if (group == null)
+            {
+                try
+                {
+                    var regex = new System.Text.RegularExpressions.Regex("repos/(.+)/issues/");
+                    return model.GroupBy(x => regex.Match(x.Url).Groups[1].Value).ToList();
+                }
+                catch (Exception e)
+                {
+                    return null;
+                }
+            }
+
+            return group;
         }
 
         protected override Task Load(bool forceCacheInvalidation)

CodeHub.iOS/Info.plist

@@ -21,9 +21,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.dillonbuchanan.codehub</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0</string>
+	<string>2.1.1</string>
 	<key>CFBundleIconFiles</key>
 	<array>
 		<string>Icon-Small-50</string>

CodeHub.iOS/Views/Issues/IssuesView.cs

@@ -1,6 +1,5 @@
 using System;
 using Cirrious.CrossCore;
-using CodeFramework.iOS.Views;
 using CodeHub.Core.Filters;
 using CodeHub.Core.Services;
 using CodeHub.Core.ViewModels.Issues;