Merge branch 'google-analytics'

Conflicts:
	Hearthstone Deck Tracker/Core.cs
	Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj

Hearthstone Deck Tracker/App.xaml.cs

@@ -8,7 +8,9 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
+using Garlic;
 using Hearthstone_Deck_Tracker.Controls.Error;
+using Hearthstone_Deck_Tracker.Utility;
 
 #endregion
 
@@ -36,6 +38,8 @@ private void App_DispatcherUnhandledException(object sender, DispatcherUnhandled
 					return;
 				}
 			}
+
+			Analytics.Analytics.TrackEvent("UnhandledException", e.Exception.GetType().ToString().Split('.').Last(), e.Exception.TargetSite.ToString());
 #if (!DEBUG)
 			var date = DateTime.Now;
 			var fileName = "Crash Reports\\"
@@ -64,6 +68,6 @@ private void App_OnStartup(object sender, StartupEventArgs e)
         {
             ShutdownMode = ShutdownMode.OnExplicitShutdown;
             Core.Initialize();
-	    }
+        }
 	}
 }

Hearthstone Deck Tracker/Config.cs

@@ -18,7 +18,7 @@ public class Config
 
 		private static Config _config;
 
-		public readonly string AppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
+		public static readonly string AppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
 		                                     + @"\HearthstoneDeckTracker";
 
 		[DefaultValue("Blue")]
@@ -262,6 +262,9 @@ public class Config
         //move this to some data file
         public int[] GoldProgressTotal = { 0, 0, 0, 0, 0 };
 
+		[DefaultValue(true)]
+		public bool GoogleAnalytics = true;
+
 		[DefaultValue(null)]
 		public bool? HearthStatsAutoDeleteDecks = null;
 
@@ -935,9 +938,9 @@ public static void Load()
 					_config = XmlManager<Config>.Load("config.xml");
 					foundConfig = true;
 				}
-				else if(File.Exists(Instance.AppDataPath + @"\config.xml"))
+				else if(File.Exists(AppDataPath + @"\config.xml"))
 				{
-					_config = XmlManager<Config>.Load(Instance.AppDataPath + @"\config.xml");
+					_config = XmlManager<Config>.Load(AppDataPath + @"\config.xml");
 					foundConfig = true;
 				}
 				else if(!Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)))
@@ -970,10 +973,10 @@ public static void Load()
 						Logger.WriteLine("Moved config to appdata", "Config");
 					}
 				}
-				else if(File.Exists(Instance.AppDataPath + @"\config.xml"))
+				else if(File.Exists(AppDataPath + @"\config.xml"))
 				{
 					SaveBackup(true); //backup in case the file already exists
-					File.Move(Instance.AppDataPath + @"\config.xml", Instance.ConfigPath);
+					File.Move(AppDataPath + @"\config.xml", Instance.ConfigPath);
 					Logger.WriteLine("Moved config to local", "Config");
 				}
 			}

Hearthstone Deck Tracker/Core.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
+using Hearthstone_Deck_Tracker.Enums;
 using Hearthstone_Deck_Tracker.Hearthstone;
 using Hearthstone_Deck_Tracker.HearthStats.API;
 using Hearthstone_Deck_Tracker.LogReader;
@@ -41,26 +42,32 @@ public static OverlayWindow Overlay
         public static void Initialize()
         {
             Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
+	        var newUser = !Directory.Exists(Config.AppDataPath);
             Config.Load();
             ConfigManager.Run();
             Logger.Initialzie();
             Helper.UpdateAppTheme();
             var splashScreenWindow = new SplashScreenWindow();
             splashScreenWindow.ShowConditional();
-            Game = new GameV2();
-            if (!HearthStatsAPI.LoadCredentials() && Config.Instance.ShowLoginDialog)
+	        Game = new GameV2();
+	        LoginType loginType;
+	        var loggedIn = HearthStatsAPI.LoadCredentials();
+            if (!loggedIn && Config.Instance.ShowLoginDialog)
             {
                 var loginWindow = new LoginWindow();
                 splashScreenWindow.Close();
                 loginWindow.ShowDialog();
-                if (!loginWindow.LoginResult)
+                if (loginWindow.LoginResult == LoginType.None)
                 {
                     Application.Current.Shutdown();
                     return;
                 }
+	            loginType = loginWindow.LoginResult;
                 splashScreenWindow = new SplashScreenWindow();
                 splashScreenWindow.ShowConditional();
             }
+            else
+	            loginType = loggedIn ? LoginType.AutoLogin : LoginType.AutoGuest;
             MainWindow = new MainWindow();
             MainWindow.LoadConfigSettings();
             MainWindow.Show();
@@ -109,6 +116,9 @@ public static void Initialize()
 			HotKeyManager.Load();
 			Initialized = true;
 
+	        Analytics.Analytics.TrackPageView(
+	                                          string.Format("/app/v{0}/{1}{2}", Helper.GetCurrentVersion().ToVersionString(),
+	                                                        loginType.ToString().ToLower(), newUser ? "/new" : ""), "");
 		}
 
         private static async void UpdateOverlayAsync()

Hearthstone Deck Tracker/DeckList.cs

@@ -149,7 +149,7 @@ internal static void SetupDeckListFile()
         {
             if(Config.Instance.SaveDataInAppData == null)
                 return;
-            var appDataPath = Config.Instance.AppDataPath + @"\PlayerDecks.xml";
+            var appDataPath = Config.AppDataPath + @"\PlayerDecks.xml";
             var dataDirPath = Config.Instance.DataDirPath + @"\PlayerDecks.xml";
             if(Config.Instance.SaveDataInAppData.Value)
             {

Hearthstone Deck Tracker/Enums/LoginType.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hearthstone_Deck_Tracker.Enums
+{
+	public enum LoginType
+	{
+		None,
+		AutoLogin,
+		AutoGuest,
+		Login,
+		Guest,
+		Register
+	}
+}

Hearthstone Deck Tracker/FlyoutControls/Options/Tracker/TrackerSettings.xaml

@@ -10,6 +10,14 @@
         <GroupBox Header="Settings">
             <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <StackPanel>
+                    <GroupBox Header="Google Analytics">
+                        <StackPanel>
+                            <CheckBox Name="CheckBoxAnalytics" Content="Submit anonymous data" Checked="CheckBoxAnalytics_OnChecked" Unchecked="CheckBoxAnalytics_OnUnchecked"/>
+                            <TextBlock
+                                Text="This only tracks two things: App starts, where the version number and login mode is submitted, as well as information about crashes."
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </GroupBox>
                     <DockPanel Margin="10,5,10,0">
                         <Label Content="Key on game start:" HorizontalAlignment="Right"
                                                VerticalAlignment="Top" />

Hearthstone Deck Tracker/FlyoutControls/Options/Tracker/TrackerSettings.xaml.cs

@@ -50,6 +50,7 @@ public void Load()
 			CheckBoxShowLoginDialog.IsChecked = Config.Instance.ShowLoginDialog;
 			CheckBoxShowSplashScreen.IsChecked = Config.Instance.ShowSplashScreen;
 			CheckboxStartWithWindows.IsChecked = Config.Instance.StartWithWindows;
+			CheckBoxAnalytics.IsChecked = Config.Instance.GoogleAnalytics;
 
 			if(!Helper.EventKeys.Contains(Config.Instance.KeyPressOnGameStart))
 				Config.Instance.KeyPressOnGameStart = "None";
@@ -277,7 +278,7 @@ private async void SelectSaveDataPath_Click(object sender, RoutedEventArgs e)
 
 		private void ButtonOpenAppData_OnClick(object sender, RoutedEventArgs e)
 		{
-			Process.Start(Config.Instance.AppDataPath);
+			Process.Start(Config.AppDataPath);
 		}
 
 		private void CheckboxStartWithWindows_Checked(object sender, RoutedEventArgs e)
@@ -355,5 +356,20 @@ private void ButtonRestart_OnClick(object sender, RoutedEventArgs e)
 			Core.MainWindow.Restart();
 		}
 
+		private void CheckBoxAnalytics_OnChecked(object sender, RoutedEventArgs e)
+		{
+			if(!_initialized)
+				return;
+			Config.Instance.GoogleAnalytics = true;
+			Config.Save();
+		}
+
+		private void CheckBoxAnalytics_OnUnchecked(object sender, RoutedEventArgs e)
+		{
+			if(!_initialized)
+				return;
+			Config.Instance.GoogleAnalytics = false;
+			Config.Save();
+		}
 	}
 }

Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj

@@ -59,6 +59,9 @@
   <PropertyGroup />
   <ItemGroup>
     <Reference Include="Accessibility" />
+    <Reference Include="Garlic">
+      <HintPath>..\packages\Garlic.2.1.0.0\lib\net35\Garlic.dll</HintPath>
+    </Reference>
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
@@ -148,6 +151,7 @@
     <Compile Include="Enums\DeckLayout.cs" />
     <Compile Include="Enums\Hearthstone\TAG_CLASS.cs" />
     <Compile Include="Enums\IconStyle.cs" />
+    <Compile Include="Enums\LoginType.cs" />
     <Compile Include="Errors\ErrorItem.xaml.cs">
       <DependentUpon>ErrorItem.xaml</DependentUpon>
     </Compile>
@@ -277,6 +281,7 @@
     <Compile Include="Protocol\JsonDeck.cs" />
     <Compile Include="Protocol\JsonDecksWrapper.cs" />
     <Compile Include="Replay\TurnViewItem.cs" />
+    <Compile Include="Utility\Analytics.cs" />
     <Compile Include="Utility\HotKeys\HotKey.cs" />
     <Compile Include="Utility\HotKeys\PredefinedHotKeyActionAttribute.cs" />
     <Compile Include="Utility\HotKeys\HotKeyConfig.cs" />
@@ -3760,6 +3765,7 @@
     xcopy /Y "HDTHelper.exe" "..\Hearthstone Deck Tracker"
     xcopy /Y "HDTUpdate.exe" "..\Hearthstone Deck Tracker"
     xcopy /Y "HDTUninstaller.exe" "..\Hearthstone Deck Tracker"
+    xcopy /Y "Garlic.dll" "..\Hearthstone Deck Tracker"
     xcopy /Y "HtmlAgilityPack.dll" "..\Hearthstone Deck Tracker"
     xcopy /Y "MahApps.Metro.dll" "..\Hearthstone Deck Tracker"
     xcopy /Y "Newtonsoft.Json.dll" "..\Hearthstone Deck Tracker"

Hearthstone Deck Tracker/Stats/DeckStatsList.cs

@@ -83,8 +83,8 @@ internal static void SetupDeckStatsFile()
         {
             if(Config.Instance.SaveDataInAppData == null)
                 return;
-            var appDataPath = Config.Instance.AppDataPath + @"\DeckStats.xml";
-            var appDataGamesDirPath = Config.Instance.AppDataPath + @"\Games";
+            var appDataPath = Config.AppDataPath + @"\DeckStats.xml";
+            var appDataGamesDirPath = Config.AppDataPath + @"\Games";
             var dataDirPath = Config.Instance.DataDirPath + @"\DeckStats.xml";
             var dataGamesDirPath = Config.Instance.DataDirPath + @"\Games";
             if(Config.Instance.SaveDataInAppData.Value)

Hearthstone Deck Tracker/Stats/DefaultDeckStats.cs

@@ -98,7 +98,7 @@ internal static void SetupDefaultDeckStatsFile()
         {
             if(Config.Instance.SaveDataInAppData == null)
                 return;
-            var appDataPath = Config.Instance.AppDataPath + @"\DefaultDeckStats.xml";
+            var appDataPath = Config.AppDataPath + @"\DefaultDeckStats.xml";
             var dataDirPath = Config.Instance.DataDirPath + @"\DefaultDeckStats.xml";
             if(Config.Instance.SaveDataInAppData.Value)
             {

Hearthstone Deck Tracker/Utility/Analytics.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Garlic;
+
+//using Garlic;
+
+namespace Hearthstone_Deck_Tracker.Analytics
+{
+	internal class Analytics
+	{
+		private const string Domain = "app.hsdecktracker.net";
+		private const string GACode = "UA-68659282-3";
+		private static readonly AnalyticsSession Session = new AnalyticsSession(Domain, GACode);
+		private static IAnalyticsPageViewRequest _pageViewRequest;
+
+		public static void TrackEvent(string category, string action, string label = "", string value = "")
+		{
+			if(!Config.Instance.GoogleAnalytics)
+				return;
+			if(_pageViewRequest == null)
+				return;
+			_pageViewRequest.SendEvent(category, action, label, value);
+		}
+
+		public static void TrackPageView(string page, string title)
+		{
+			if(!Config.Instance.GoogleAnalytics)
+				return;
+			_pageViewRequest = Session.CreatePageViewRequest(page, title);
+			_pageViewRequest.Send();
+		}
+	}
+}

Hearthstone Deck Tracker/Utility/Helper.cs

@@ -679,7 +679,7 @@ public static void CopyReplayFiles()
         {
             if(Config.Instance.SaveDataInAppData == null)
                 return;
-            var appDataReplayDirPath = Config.Instance.AppDataPath + @"\Replays";
+            var appDataReplayDirPath = Config.AppDataPath + @"\Replays";
             var dataReplayDirPath = Config.Instance.DataDirPath + @"\Replays";
             if(Config.Instance.SaveDataInAppData.Value)
             {

Hearthstone Deck Tracker/Windows/LoginWindow.xaml.cs

@@ -9,8 +9,10 @@
 using System.Windows;
 using System.Windows.Navigation;
 using Hearthstone_Deck_Tracker.Annotations;
+using Hearthstone_Deck_Tracker.Enums;
 using Hearthstone_Deck_Tracker.Hearthstone;
 using Hearthstone_Deck_Tracker.HearthStats.API;
+using Hearthstone_Deck_Tracker.Utility;
 using MahApps.Metro.Controls.Dialogs;
 
 #endregion
@@ -26,19 +28,17 @@ public partial class LoginWindow : INotifyPropertyChanged
 	    private readonly bool _initialized;
 		private ProgressDialogController _controller;
 		private Visibility _loginRegisterVisibility;
-        public bool LoginResult { get; private set; }
+		private LoginType _loginResult = LoginType.None;
+
+		public LoginType LoginResult
+		{
+			get { return _loginResult; }
+			private set { _loginResult = value; }
+		}
 
 		public LoginWindow()
 		{
-			//Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
-			//Config.Load();
-			//Logger.Initialzie();
-			//_game = new GameV2();
-            //Card.SetGame(_game);
-			//API.Core.Game = _game;
 		    InitializeComponent();
-			//if(HearthStatsAPI.LoadCredentials() || !Config.Instance.ShowLoginDialog)
-			//	StartMainApp();
 			CheckBoxRememberLogin.IsChecked = Config.Instance.RememberHearthStatsLogin;
 			_initialized = true;
 		}
@@ -71,21 +71,6 @@ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e
 			Process.Start(e.Uri.AbsoluteUri);
 		}
 
-		/*private void StartMainApp()
-		{
-			IsEnabled = false;
-			var mainWindow = new MainWindow(_game);
-			try
-			{
-				mainWindow.Show();
-			}
-			catch(Exception ex)
-			{
-				Logger.WriteLine("Error showing main window: " + ex, "LoginWindow");
-			}
-			Close();
-		}*/
-
 		private async void BtnLogin_Click(object sender, RoutedEventArgs e)
 		{
 			var email = TextBoxEmail.Text;
@@ -105,7 +90,7 @@ private async void BtnLogin_Click(object sender, RoutedEventArgs e)
 			TextBoxPassword.Clear();
 		    if (result.Success)
 		    {
-		        LoginResult = true;
+		        LoginResult = LoginType.Login;
                 Close();
 		    }
 			else if(result.Message.Contains("401"))
@@ -201,7 +186,7 @@ private async void BtnRegister_Click(object sender, RoutedEventArgs e)
 			TextBoxRegisterPasswordConfirm.Clear();
 			if(result.Success)
 			{
-			    LoginResult = true;
+			    LoginResult = LoginType.Register;
                 Close();
 			}
 		}
@@ -231,7 +216,7 @@ private void ButtonBack_OnClick(object sender, RoutedEventArgs e)
 		private void Button_ContinueAnyway(object sender, RoutedEventArgs e)
 		{
 			Logger.WriteLine("Continuing as guest...");
-		    LoginResult = true;
+		    LoginResult = LoginType.Guest;
 		    Close();
 		}
 

Hearthstone Deck Tracker/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Garlic" version="2.1.0.0" targetFramework="net45" />
   <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
 </packages>