diff --git a/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe b/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe index 667def7..7efc008 100644 Binary files a/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe and b/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe differ diff --git a/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.zip b/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.zip deleted file mode 100644 index 2a97f12..0000000 Binary files a/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.zip and /dev/null differ diff --git a/Advanced Installer/Advanced Installer-cache/cacheIndex.txt b/Advanced Installer/Advanced Installer-cache/cacheIndex.txt index 5fe5afe..1a2038c 100644 Binary files a/Advanced Installer/Advanced Installer-cache/cacheIndex.txt and b/Advanced Installer/Advanced Installer-cache/cacheIndex.txt differ diff --git a/Advanced Installer/Advanced Installer-cache/part1/output-info.ini b/Advanced Installer/Advanced Installer-cache/part1/output-info.ini deleted file mode 100644 index f779b47..0000000 Binary files a/Advanced Installer/Advanced Installer-cache/part1/output-info.ini and /dev/null differ diff --git a/Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab b/Advanced Installer/Advanced Installer-cache/part3/ACCsetup1.cab similarity index 57% rename from Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab rename to Advanced Installer/Advanced Installer-cache/part3/ACCsetup1.cab index 8466b86..44e19b9 100644 Binary files a/Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab and b/Advanced Installer/Advanced Installer-cache/part3/ACCsetup1.cab differ diff --git a/Advanced Installer/Advanced Installer-cache/part3/output-info.ini b/Advanced Installer/Advanced Installer-cache/part3/output-info.ini new file mode 100644 index 0000000..41cdb6b Binary files /dev/null and b/Advanced Installer/Advanced Installer-cache/part3/output-info.ini differ diff --git a/Advanced Installer/Advanced Installer.aip b/Advanced Installer/Advanced Installer.aip index add8d95..c220393 100644 --- a/Advanced Installer/Advanced Installer.aip +++ b/Advanced Installer/Advanced Installer.aip @@ -10,10 +10,10 @@ - - - - + + + + @@ -37,10 +37,10 @@ - + - + diff --git a/AssistantComputerControl/ACC_Updater.cs b/AssistantComputerControl/ACC_Updater.cs index 0501ca8..a8c5d34 100644 --- a/AssistantComputerControl/ACC_Updater.cs +++ b/AssistantComputerControl/ACC_Updater.cs @@ -201,6 +201,7 @@ private static void FileDownloadedCallback(object sender, AsyncCompletedEventArg MessageBox.Show("Failed to download new version. Try again later!", "Error | " + MainProgram.messageBoxTitle); } + Thread.Sleep(500); Thread.CurrentThread.Abort(); } } diff --git a/AssistantComputerControl/App.config b/AssistantComputerControl/App.config index c42f653..43c004c 100644 --- a/AssistantComputerControl/App.config +++ b/AssistantComputerControl/App.config @@ -91,6 +91,14 @@ + + + + + + + + \ No newline at end of file diff --git a/AssistantComputerControl/AssistantComputerControl.csproj b/AssistantComputerControl/AssistantComputerControl.csproj index 3b13a5b..cb3cebe 100644 --- a/AssistantComputerControl/AssistantComputerControl.csproj +++ b/AssistantComputerControl/AssistantComputerControl.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {404B42F4-E135-4D2F-8FD0-20A590814930} - Exe + WinExe Properties AssistantComputerControl AssistantComputerControl @@ -99,19 +99,19 @@ ..\packages\Microsoft.WindowsAPICodePack.Shell.1.1.0\lib\Microsoft.WindowsAPICodePack.Shell.dll - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\Sentry.1.0.0-rc2\lib\netstandard2.0\Sentry.dll + + ..\packages\Sentry.1.1.2\lib\net461\Sentry.dll - ..\packages\Sentry.PlatformAbstractions.1.0.0-rc\lib\net45\Sentry.PlatformAbstractions.dll + ..\packages\Sentry.PlatformAbstractions.1.0.0\lib\net45\Sentry.PlatformAbstractions.dll - - ..\packages\Sentry.Protocol.1.0.0-rc2\lib\net46\Sentry.Protocol.dll + + ..\packages\Sentry.Protocol.1.0.4\lib\net46\Sentry.Protocol.dll diff --git a/AssistantComputerControl/MainProgram.cs b/AssistantComputerControl/MainProgram.cs index b358efb..177abd2 100644 --- a/AssistantComputerControl/MainProgram.cs +++ b/AssistantComputerControl/MainProgram.cs @@ -1,7 +1,7 @@ /* * AssistantComputerControl * Made by Albert MN. - * Updated: v1.2.2, 10-02-2019 + * Updated: v1.2.3, 10-02-2019 * * Use: * - Main class. Starts everything. @@ -24,8 +24,8 @@ namespace AssistantComputerControl { class MainProgram { - public const string softwareVersion = "1.2.2", - releaseDate = "2019-02-10 19:24:00", //YYYY-MM-DD H:i:s - otherwise it gives an error + public const string softwareVersion = "1.2.3", + releaseDate = "2019-03-24 19:10:00", //YYYY-MM-DD H:i:s - otherwise it gives an error appName = "AssistantComputerControl"; static public bool debug = true, unmuteVolumeChange = true, @@ -46,7 +46,6 @@ public enum TestStatus { private static FileSystemWatcher watcher; static public string currentLocationFull = Assembly.GetEntryAssembly().Location, - defaultActionFolder = CheckPath(), currentLocation = Path.GetDirectoryName(currentLocationFull), dataFolderLocation = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AssistantComputerControl"), @@ -66,60 +65,22 @@ public enum TestStatus { [STAThread] [PermissionSet(SecurityAction.Demand, Name = "FullTrust")] static void Main(string[] args) { - hasAnalyticsClass = Type.GetType("AssistantComputerControl.AnalyticsSettings") != null; - - string sentryToken = "super_secret"; - - if (hasAnalyticsClass) { -#if (HasAnalyticsClass) - sentryToken = AnalyticsSettings.sentryToken; -#endif - } - - if (sentryToken != "super_secret") { - //Tracking issues with Sentry.IO - not forked from GitHub (official version) - bool sentryOK = false; - try { - if (Properties.Settings.Default.UID != "") { - SentrySdk.ConfigureScope(scope => { - scope.User = new Sentry.Protocol.User { - Id = Properties.Settings.Default.UID - }; - }); - } - - using (SentrySdk.Init(sentryToken)) { - sentryOK = true; - } - } catch { - //Sentry failed. Error sentry's side or invalid key - don't let this stop the app from running - DoDebug("Sentry initiation failed"); - ActualMain(); - } - - if (sentryOK) { - using (SentrySdk.Init(sentryToken)) { - DoDebug("Sentry initiated"); - ActualMain(); - } - } - } else { - //Code is (most likely) forked - skip issue tracking - ActualMain(); - } + Console.WriteLine("Log location; " + logFilePath); void ActualMain() { - AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); + //AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); SetupDataFolder(); - if (File.Exists(logFilePath)) + if (File.Exists(logFilePath)) { try { File.WriteAllText(logFilePath, string.Empty); } catch { // Don't let this being DENIED crash the software } - else + } else { + Console.WriteLine("Trying to create log"); CreateLogFile(); + } //Check if software already runs, if so kill this instance var otherACCs = Process.GetProcessesByName(Path.GetFileNameWithoutExtension(currentLocationFull)); @@ -243,6 +204,48 @@ void ActualMain() { SystemEvents.SessionSwitch += new SessionSwitchEventHandler(SystemEvents_SessionSwitch); //On wake up from sleep Application.Run(); } + + hasAnalyticsClass = Type.GetType("AssistantComputerControl.AnalyticsSettings") != null; + + string sentryToken = "super_secret"; + + if (hasAnalyticsClass) { +#if (HasAnalyticsClass) + sentryToken = AnalyticsSettings.sentryToken; +#endif + } + + if (sentryToken != "super_secret") { + //Tracking issues with Sentry.IO - not forked from GitHub (official version) + bool sentryOK = false; + try { + if (Properties.Settings.Default.UID != "") { + SentrySdk.ConfigureScope(scope => { + scope.User = new Sentry.Protocol.User { + Id = Properties.Settings.Default.UID + }; + }); + } + + using (SentrySdk.Init(sentryToken)) { + sentryOK = true; + } + } catch { + //Sentry failed. Error sentry's side or invalid key - don't let this stop the app from running + DoDebug("Sentry initiation failed"); + ActualMain(); + } + + if (sentryOK) { + using (SentrySdk.Init(sentryToken)) { + DoDebug("Sentry initiated"); + ActualMain(); + } + } + } else { + //Code is (most likely) forked - skip issue tracking + ActualMain(); + } } //End main function @@ -290,7 +293,7 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc string rawWindowsVersion = Environment.OSVersion.ToString(); int totalExecutions = 0; - foreach(int action in Properties.Settings.Default.TotalActionsExecuted) { + foreach (int action in Properties.Settings.Default.TotalActionsExecuted) { totalExecutions += action; } if (File.Exists(errorLogLoc)) @@ -338,15 +341,18 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc MessageBox.Show("A critical error occurred. The developer has been notified and will resolve this issue ASAP! Try and start ACC again, and avoid whatever just made it crash (for now) :)", "ACC | Error"); } - private static void CreateLogFile() { + private static bool CreateLogFile() { try { using (var tw = new StreamWriter(logFilePath, true)) { tw.WriteLine(string.Empty); tw.Close(); } - } catch { - DoDebug("Could not clear log file."); + } catch (Exception e) { + Console.WriteLine("Could not create/clear log file; " + e.Message); + return false; } + + return true; } public static void SetupListener() { @@ -592,33 +598,35 @@ public static string CheckPath() { path = Properties.Settings.Default.ActionFilePath; } } else { - string dropboxFolder = GetDropboxFolder(); - if (dropboxFolder == "" || dropboxFolder == null || !Directory.Exists(dropboxFolder)) { - if (Properties.Settings.Default.HasCompletedTutorial && gettingStarted is null && !hasAskedForSetupAgain) { - //Dropbox not found & no custom filepath, go through setup again? - hasAskedForSetupAgain = true; - var msgBox = MessageBox.Show("Dropbox (required) doesn't seem to be installed... Do you want to go through the setup guide again?", "[ERROR] No folder specified | " + messageBoxTitle, MessageBoxButtons.YesNo); - if (msgBox == DialogResult.Yes) { - ShowGettingStarted(); - } + /*string dropboxFolder = GetDropboxFolder(); + if (dropboxFolder == "" || dropboxFolder == null || !Directory.Exists(dropboxFolder)) {*/ + if (Properties.Settings.Default.HasCompletedTutorial && gettingStarted is null && !hasAskedForSetupAgain) { + //Dropbox not found & no custom filepath, go through setup again? + hasAskedForSetupAgain = true; + var msgBox = MessageBox.Show("You do not seem to have chosen a cloud-service. Do you want to go through the setup guide again?", "[ERROR] No folder specified | AssistantComputerControl", MessageBoxButtons.YesNo); + if (msgBox == DialogResult.Yes) { + ShowGettingStarted(); } - } else { + } + /*} else { string dropboxACCpath = dropboxFolder + @"\AssistantComputerControl"; if (!Directory.Exists(dropboxACCpath)) { DirectoryInfo di = Directory.CreateDirectory(dropboxACCpath); di.Attributes = FileAttributes.Directory | FileAttributes.Hidden; } path = dropboxACCpath; - } + }*/ } - + return Path.HasExtension(path) ? Path.GetDirectoryName(path) : path; } public static void DoDebug(string str) { try { if (!File.Exists(logFilePath)) { - CreateLogFile(); + Console.WriteLine("Log file does not exist, trying to create it"); + if (!CreateLogFile()) + return; } File.AppendAllText(logFilePath, DateTime.Now.ToString() + ": " + str + Environment.NewLine); if (debug) { diff --git a/AssistantComputerControl/Properties/AssemblyInfo.cs b/AssistantComputerControl/Properties/AssemblyInfo.cs index d3eedde..0fff992 100644 --- a/AssistantComputerControl/Properties/AssemblyInfo.cs +++ b/AssistantComputerControl/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.2.0")] -[assembly: AssemblyFileVersion("1.2.2.0")] +[assembly: AssemblyVersion("1.2.3.0")] +[assembly: AssemblyFileVersion("1.2.3.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/AssistantComputerControl/WebFiles/AboutVersion.html b/AssistantComputerControl/WebFiles/AboutVersion.html index d478f46..afbf725 100644 --- a/AssistantComputerControl/WebFiles/AboutVersion.html +++ b/AssistantComputerControl/WebFiles/AboutVersion.html @@ -23,9 +23,9 @@
- Version 1.2.2 + Version 1.2.3
    -
  • Released: 06-01-2019
    • +
  • Released: 24-03-2019

Website | @@ -36,15 +36,19 @@ New this version;

    -
  • Hotfix 1.2.2 release notes; +
  • + Hotfix 1.2.2 & Hotfix 1.2.3 release notes;
      +
    • Re-release of 1.2.2 as 1.2.3
      • +
    • Fixed critial issues that made 1.2.2 crash for all new users
    • Sleep-repetition issue; fixed PC being able to go into a sleep-loop
    • Fixed links in setup guide for Google Drive and OneDrive shutdown applets (all pointed to Dropbox)
    • Please report bugs here or in the Discord server!
    • If you wish to support the development of the project, you can donate here or leave a star on GitHub!
    • -
  • Hotfix 1.2.1 release notes; +
  • + Hotfix 1.2.1 release notes;
    • Fixed bug where PC would be stuck in shutdown loop after shutdown or restart action - sorry for the inconvenience
    • Please report bugs here or in the Discord server!
      • diff --git a/AssistantComputerControl/bin/Debug/AssistantComputerControl.exe.config b/AssistantComputerControl/bin/Debug/AssistantComputerControl.exe.config index be176d5..e60c584 100644 --- a/AssistantComputerControl/bin/Debug/AssistantComputerControl.exe.config +++ b/AssistantComputerControl/bin/Debug/AssistantComputerControl.exe.config @@ -91,6 +91,14 @@ + + + + + + + + diff --git a/AssistantComputerControl/bin/Debug/AssistantComputerControl.pdb b/AssistantComputerControl/bin/Debug/AssistantComputerControl.pdb index b2fd8c5..fff38b6 100644 Binary files a/AssistantComputerControl/bin/Debug/AssistantComputerControl.pdb and b/AssistantComputerControl/bin/Debug/AssistantComputerControl.pdb differ diff --git a/AssistantComputerControl/obj/Debug/AssistantComputerControl.csprojResolveAssemblyReference.cache b/AssistantComputerControl/obj/Debug/AssistantComputerControl.csprojResolveAssemblyReference.cache index dd37d00..9b5a436 100644 Binary files a/AssistantComputerControl/obj/Debug/AssistantComputerControl.csprojResolveAssemblyReference.cache and b/AssistantComputerControl/obj/Debug/AssistantComputerControl.csprojResolveAssemblyReference.cache differ diff --git a/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe b/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe index 5496009..b2f39cd 100644 Binary files a/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe and b/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe differ diff --git a/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe.tmp b/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe.tmp index 40a1014..4075a05 100644 Binary files a/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe.tmp and b/AssistantComputerControl/obj/Debug/AssistantComputerControl.exe.tmp differ diff --git a/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb b/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb index b2fd8c5..fff38b6 100644 Binary files a/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb and b/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb differ diff --git a/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb.tmp b/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb.tmp index 10f01ab..c5c4366 100644 Binary files a/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb.tmp and b/AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb.tmp differ diff --git a/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferences.cache index c4608e4..2aa1de6 100644 Binary files a/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b1fc4ba..1c4352a 100644 Binary files a/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AssistantComputerControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AssistantComputerControl/obj/Release/AssistantComputerControl.exe b/AssistantComputerControl/obj/Release/AssistantComputerControl.exe index 333dd02..ed7153d 100644 Binary files a/AssistantComputerControl/obj/Release/AssistantComputerControl.exe and b/AssistantComputerControl/obj/Release/AssistantComputerControl.exe differ diff --git a/AssistantComputerControl/obj/Release/AssistantComputerControl.pdb b/AssistantComputerControl/obj/Release/AssistantComputerControl.pdb index dd74859..600d4fa 100644 Binary files a/AssistantComputerControl/obj/Release/AssistantComputerControl.pdb and b/AssistantComputerControl/obj/Release/AssistantComputerControl.pdb differ diff --git a/AssistantComputerControl/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/AssistantComputerControl/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index ebb64cd..6ab1034 100644 Binary files a/AssistantComputerControl/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/AssistantComputerControl/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AssistantComputerControl/packages.config b/AssistantComputerControl/packages.config index 3eb4710..84ced3a 100644 --- a/AssistantComputerControl/packages.config +++ b/AssistantComputerControl/packages.config @@ -2,10 +2,10 @@ - - - - + + + + \ No newline at end of file