Refactoring

Author: thedillonb

CodeHub.Core/Services/IFeaturesService.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace CodeHub.Core.Services
 {
@@ -7,7 +8,15 @@ public interface IFeaturesService
         bool IsPushNotificationsActivated { get; set; }
 
         void Activate(string id);
+
         bool IsActivated(string id);
+
+        Task<IEnumerable<string>> GetAvailableFeatureIds();
+    }
+
+    public static class FeatureIds
+    {
+        public const string PushNotifications = "com.dillonbuchanan.codehub.push";
     }
 }
 

CodeHub.Core/ViewModels/Accounts/LoginViewModel.cs

@@ -7,6 +7,8 @@
 using System.Threading.Tasks;
 using CodeHub.Core.Factories;
 using Cirrious.CrossCore;
+using CodeFramework.Core.Services;
+using System.Linq;
 
 namespace CodeHub.Core.ViewModels.Accounts
 {
@@ -16,6 +18,7 @@ public class LoginViewModel : BaseViewModel
         public const string ClientSecret = "9253ab615f8c00738fff5d1c665ca81e581875cb";
         public static readonly string RedirectUri = "http://dillonbuchanan.com/";
         private readonly ILoginFactory _loginFactory;
+        private readonly IFeaturesService _featuresService;
 
         private bool _isLoggingIn;
         public bool IsLoggingIn
@@ -57,9 +60,10 @@ public ICommand GoBackCommand
             get { return new MvxCommand(() => ChangePresentation(new MvxClosePresentationHint(this))); }
         }
 
-        public LoginViewModel(ILoginFactory loginFactory)
+        public LoginViewModel(ILoginFactory loginFactory, IFeaturesService featuresService)
         {
             _loginFactory = loginFactory;
+            _featuresService = featuresService;
         }
 
         public void Init(NavObject navObject)
@@ -112,12 +116,25 @@ public async Task Login(string code)
             }
 
             LoginData loginData = null;
+            bool shouldPromptPush = false;
 
             try
             {
                 IsLoggingIn = true;
                 var account = AttemptedAccount;
                 loginData = await _loginFactory.LoginWithToken(ClientId, ClientSecret, code, RedirectUri, WebDomain, apiUrl, account);
+
+                if (!_featuresService.IsPushNotificationsActivated && !IsEnterprise)
+                {
+                    try
+                    {
+                        var ids = await _featuresService.GetAvailableFeatureIds();
+                        shouldPromptPush = ids.Contains(FeatureIds.PushNotifications);
+                    }
+                    catch
+                    {
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -131,16 +148,11 @@ public async Task Login(string code)
 
             try
             {
-                if (!IsEnterprise)
-                {
-                    var features = Mvx.Resolve<IFeaturesService>();
-                    if (!features.IsPushNotificationsActivated)
-                    {
-                        await Mvx.Resolve<IFeatureFactory>().PromptPushNotificationFeature();
-                    }
-                }
+                // Only prompt if we're allowing that to be enabled.
+                if (shouldPromptPush)
+                    await Mvx.Resolve<IFeatureFactory>().PromptPushNotificationFeature();
             }
-            catch 
+            catch
             {
                 // Don't do anything...
             }

CodeHub.Core/ViewModels/App/UpgradesViewModel.cs

@@ -1,15 +1,13 @@
-using System;
 using CodeFramework.Core.ViewModels;
 using System.Threading.Tasks;
-using CodeFramework.Core.Services;
-using System.Collections.Generic;
+using CodeHub.Core.Services;
+using System.Linq;
 
 namespace CodeHub.Core.ViewModels.App
 {
     public class UpgradesViewModel : LoadableViewModel
     {
-        private readonly IHttpClientService _httpClientService;
-        private readonly IJsonSerializationService _jsonSerializationService;
+        private readonly IFeaturesService _featuresService;
         private string[] _keys;
 
         public string[] Keys
@@ -22,19 +20,14 @@ private set
             }
         }
 
-        public UpgradesViewModel(IHttpClientService httpClientService, IJsonSerializationService jsonSerializationService)
+        public UpgradesViewModel(IFeaturesService featuresService)
         {
-            _httpClientService = httpClientService;
-            _jsonSerializationService = jsonSerializationService;
+            _featuresService = featuresService;
         }
 
         protected override async Task Load(bool forceCacheInvalidation)
         {
-            var client = _httpClientService.Create();
-            client.Timeout = new TimeSpan(0, 0, 30);
-            var response = await client.GetAsync("http://162.243.15.10/in-app");
-            var data = await response.Content.ReadAsStringAsync();
-            Keys = _jsonSerializationService.Deserialize<List<string>>(data).ToArray();
+            Keys = (await _featuresService.GetAvailableFeatureIds()).ToArray();
         }
     }
 }

CodeHub.iOS/AppDelegate.cs

@@ -97,7 +97,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 
             // Automatic activations in debug mode!
             #if DEBUG
-            Mvx.Resolve<CodeFramework.Core.Services.IDefaultValueService>().Set(InAppPurchases.PushNotificationsId, true);
+            Mvx.Resolve<CodeFramework.Core.Services.IDefaultValueService>().Set(FeatureIds.PushNotifications, true);
             #endif
 
 
@@ -121,7 +121,7 @@ void HandlePurchaseSuccess (object sender, string e)
         {
             Mvx.Resolve<CodeFramework.Core.Services.IDefaultValueService>().Set(e, true);
 
-            if (string.Equals(e, InAppPurchases.PushNotificationsId))
+            if (string.Equals(e, FeatureIds.PushNotifications))
             {
                 const UIRemoteNotificationType notificationTypes = UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge;
                 UIApplication.SharedApplication.RegisterForRemoteNotificationTypes(notificationTypes);

CodeHub.iOS/InAppPurchases.cs

@@ -8,7 +8,6 @@ namespace CodeHub.iOS
     public class InAppPurchases 
     {
         private static InAppPurchases _instance;
-        public const string PushNotificationsId = "com.dillonbuchanan.codehub.push";
         private readonly TransactionObserver _observer;
 
         public event EventHandler<string> PurchaseSuccess;

CodeHub.iOS/Services/FeaturesService.cs

@@ -1,26 +1,34 @@
 using CodeHub.Core.Services;
 using CodeFramework.Core.Services;
+using System.Collections.Generic;
+using System;
+using System.Threading.Tasks;
 
 namespace CodeHub.iOS.Services
 {
     public class FeaturesService : IFeaturesService
     {
         private readonly IDefaultValueService _defaultValueService;
+        private readonly IHttpClientService _httpClientService;
+        private readonly IJsonSerializationService _jsonSerializationService;
 
-        public FeaturesService(IDefaultValueService defaultValueService)
+
+        public FeaturesService(IDefaultValueService defaultValueService, IHttpClientService httpClientService, IJsonSerializationService jsonSerializationService)
         {
             _defaultValueService = defaultValueService;
+            _httpClientService = httpClientService;
+            _jsonSerializationService = jsonSerializationService;
         }
 
         public bool IsPushNotificationsActivated
         {
             get
             {
-                return IsActivated(InAppPurchases.PushNotificationsId);
+                return IsActivated(FeatureIds.PushNotifications);
             }
             set
             {
-                _defaultValueService.Set(InAppPurchases.PushNotificationsId, value);
+                _defaultValueService.Set(FeatureIds.PushNotifications, value);
             }
         }
 
@@ -34,6 +42,15 @@ public bool IsActivated(string id)
             bool value;
             return _defaultValueService.TryGet<bool>(id, out value) && value;
         }
+
+        public async Task<IEnumerable<string>> GetAvailableFeatureIds()
+        {
+            var client = _httpClientService.Create();
+            client.Timeout = new TimeSpan(0, 0, 15);
+            var response = await client.GetAsync("http://push.codehub-app.com/in-app");
+            var data = await response.Content.ReadAsStringAsync();
+            return _jsonSerializationService.Deserialize<List<string>>(data).ToArray();
+        }
     }
 }
 

CodeHub.iOS/Views/App/EnablePushNotificationsViewController.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Drawing;
-using MonoTouch.Foundation;
 using MonoTouch.UIKit;
 using Cirrious.CrossCore;
 using CodeHub.Core.Services;
 using CodeFramework.iOS.Utils;
-using CodeFramework.Core.Services;
 
 namespace CodeHub.iOS.Views.App
 {
@@ -90,7 +88,7 @@ private void EnablePushNotifications(object sender, EventArgs e)
         {
             _hud.Show("Enabling...");
             var featureService = Mvx.Resolve<IFeaturesService>();
-            featureService.Activate(InAppPurchases.PushNotificationsId);
+            featureService.Activate(FeatureIds.PushNotifications);
         }
     }
 }

CodeHub.iOS/Views/Gists/GistView.cs

@@ -128,7 +128,7 @@ private void ShareButtonPress()
 						ViewModel.GoToHtmlUrlCommand.Execute(null);
 	                }
 				}
-				catch (Exception ex)
+				catch
 				{
 				}
             };

CodeHub.iOS/Views/Source/ChangesetView.cs

@@ -196,7 +196,7 @@ private void ShowExtraMenu()
 	//					ViewModel.GoToHtmlUrlCommand.Execute(null);
 	//				}
 				}
-				catch (Exception ex)
+				catch
 				{
 				}
 			};

CodeHub.iOS/Views/Source/FileSourceView.cs

@@ -76,7 +76,7 @@ private void ShowExtraMenu()
 						ViewModel.GoToHtmlUrlCommand.Execute(null);
 					}
 				}
-				catch (Exception ex)
+				catch
 				{
 				}
 			};