2.3.2-RC1

Author: thedillonb

CodeHub.Core/ViewModels/PullRequests/PullRequestViewModel.cs

@@ -282,13 +282,20 @@ protected override Task Load(bool forceCacheInvalidation)
         }
 
         public async Task Merge()
-        {
-            var response = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Users[Username].Repositories[Repository].PullRequests[Id].Merge());
-            if (!response.Data.Merged)
-                throw new Exception(response.Data.Message);
+        {
+            try
+            {
+                var response = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Users[Username].Repositories[Repository].PullRequests[Id].Merge());
+                if (!response.Data.Merged)
+                    throw new Exception(response.Data.Message);
 
-            var pullRequest = this.GetApplication().Client.Users[Username].Repositories[Repository].PullRequests[Id].Get();
-            await this.RequestModel(pullRequest, true, r => PullRequest = r.Data);
+                var pullRequest = this.GetApplication().Client.Users[Username].Repositories[Repository].PullRequests[Id].Get();
+                await this.RequestModel(pullRequest, true, r => PullRequest = r.Data);
+            }
+            catch (Exception e)
+            {
+                this.AlertService.Alert("Unable to Merge!", e.Message);
+            }
         }
 
         public ICommand MergeCommand

CodeHub.iOS/AppDelegate.cs

@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Text;
 using CodeFramework.iOS.XCallback;
+using MonoTouch.Security;
 
 namespace CodeHub.iOS
 {
@@ -90,6 +91,30 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 
             this.window.MakeKeyAndVisible();
 
+            // Record the date this application was installed (or the date that we started recording installation date).
+            try
+            {
+                var query = new SecRecord(SecKind.GenericPassword) { Generic = NSData.FromString("codehub_install_date") };
+                SecStatusCode secStatusCode;
+                var rec = SecKeyChain.QueryAsRecord(query, out secStatusCode);
+                if (secStatusCode != SecStatusCode.Success)
+                {
+                    var newRec = new SecRecord(SecKind.GenericPassword)
+                    {
+                        Label = "CodeHub Install Date",
+                        Description = "The first date CodeHub was installed",
+                        ValueData = NSData.FromString(DateTime.UtcNow.ToString()),
+                        Generic = NSData.FromString("codehub_install_date")
+                    };
+
+                    SecKeyChain.Add(newRec);
+                }
+            }
+            catch
+            {
+                // Do nothing...
+            }
+
             InAppPurchases.Instance.PurchaseError += HandlePurchaseError;
             InAppPurchases.Instance.PurchaseSuccess += HandlePurchaseSuccess;