Skip to content

Commit 357a4b6

Browse files
committed
Hotfix v1.2.1 release
1 parent ec42f8e commit 357a4b6

File tree

132 files changed

+111643
-736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+111643
-736
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.

Advanced Installer/Advanced Installer.aip

Lines changed: 137 additions & 12 deletions
Large diffs are not rendered by default.

AssistantComputerControl/ACC_Updater.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
using System.IO;
1+
/*
2+
* AssistantComputerControl
3+
* Made by Albert MN.
4+
* Updated: v1.2.0, 05-01-2019
5+
*
6+
* Use:
7+
* - Checks for updates
8+
*/
9+
10+
using System.IO;
211
using System.Windows.Forms;
312
using System.Net;
413
using System.Diagnostics;

AssistantComputerControl/Actions.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
using System;
1+
/*
2+
* AssistantComputerControl
3+
* Made by Albert MN.
4+
* Updated: v1.2.0, 05-01-2019
5+
*
6+
* Use:
7+
* - Functions for all the actions
8+
*/
9+
10+
using System;
211
using System.IO;
312
using System.Diagnostics;
413
using System.Runtime.InteropServices;
@@ -55,6 +64,7 @@ public void Shutdown(string parameter) {
5564

5665
if (MainProgram.testingAction) {
5766
successMessage = "Simulated shutdown";
67+
wasFatal = true;
5868
} else {
5969
if (shutdownParameters != "abort") {
6070
MainProgram.DoDebug("Shutting down computer...");
@@ -63,7 +73,7 @@ public void Shutdown(string parameter) {
6373
Process.Start("shutdown", shutdownParameters);
6474
} else {
6575
MainProgram.DoDebug("Cancelling shutdown...");
66-
wasFatal = true;
76+
wasFatal = false;
6777
Process.Start("shutdown", "/a");
6878
successMessage = "Aborted shutdown";
6979
}

AssistantComputerControl/AssistantComputerControl.csproj

Lines changed: 323 additions & 2 deletions
Large diffs are not rendered by default.

AssistantComputerControl/MainProgram.cs

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
* AssistantComputerControl
33
* Made by Albert MN.
4-
* Updated: v1.1.4, 15-11-2018
4+
* Updated: v1.2.0, 04-01-2019
55
*
66
* Use:
77
* - Main class. Starts everything.
88
*/
9-
#define HasAnalyticsClass //Uncommented for official releases where the private 'AnalyticsSettings.cs' file is present - uncommenting will result in unhandled exceptions
9+
//#define HasAnalyticsClass //Uncommented for official releases where the private 'AnalyticsSettings.cs' file is present - uncommenting will result in unhandled exceptions
1010

1111
using System;
1212
using System.IO;
@@ -24,8 +24,8 @@
2424

2525
namespace AssistantComputerControl {
2626
class MainProgram {
27-
public const string softwareVersion = "1.1.5",
28-
releaseDate = "2018-12-30 15:42:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
27+
public const string softwareVersion = "1.2.1",
28+
releaseDate = "2019-01-05 02:48:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
2929
appName = "AssistantComputerControl";
3030
static public bool debug = true,
3131
unmuteVolumeChange = true,
@@ -68,14 +68,12 @@ public enum TestStatus {
6868
static void Main(string[] args) {
6969
hasAnalyticsClass = Type.GetType("AssistantComputerControl.AnalyticsSettings") != null;
7070

71-
string sentryToken;
71+
string sentryToken = "super_secret";
7272

7373
if (hasAnalyticsClass) {
7474
#if (HasAnalyticsClass)
7575
sentryToken = AnalyticsSettings.sentryToken;
7676
#endif
77-
} else {
78-
sentryToken = "super_secret";
7977
}
8078

8179
if (sentryToken != "super_secret") {
@@ -234,14 +232,28 @@ void ActualMain() {
234232
}
235233
}
236234

237-
238-
//ShowGettingStarted();
235+
//SystemEvents.PowerModeChanged += OnPowerChange;
239236

240237
Application.Run();
241238
}
242239
}
243240
//End main function
244241

242+
/*private static void OnPowerChange(object s, PowerModeChangedEventArgs e) {
243+
switch (e.Mode) {
244+
case PowerModes.Resume:
245+
//Delete all old action files
246+
if (Directory.Exists(CheckPath())) {
247+
foreach (string file in Directory.GetFiles(CheckPath(), "*." + Properties.Settings.Default.ActionFileExtension)) {
248+
ClearFile(file);
249+
}
250+
}
251+
break;
252+
case PowerModes.Suspend:
253+
break;
254+
}
255+
}*/
256+
245257

246258
public static void UpdateAnalyticsSharing(bool theBool) {
247259
//Purpose of this function is to only define "HasAnalyticsClass" one place

AssistantComputerControl/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("")]
1313
[assembly: AssemblyProduct("AssistantComputerControl")]
14-
[assembly: AssemblyCopyright("Copyright © 2018")]
14+
[assembly: AssemblyCopyright("Copyright © 2019")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717

@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.1.5.0")]
37-
[assembly: AssemblyFileVersion("1.1.5.0")]
36+
[assembly: AssemblyVersion("1.2.1.0")]
37+
[assembly: AssemblyFileVersion("1.2.1.0")]
3838
[assembly: NeutralResourcesLanguage("en")]
3939

AssistantComputerControl/WebFiles/AboutVersion.html

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,64 @@
2323
<img style="width:125px;position:fixed;bottom:0;left:0;margin-left:20px;" src="assets/acc_logo.png">
2424
</div>
2525
<div class="col-9">
26-
<b>Version 1.1.3</b>
26+
<b>Version 1.2.1</b>
2727
<ul>
28-
<li><b>Released:</b> 11-11-2018</li>
28+
<li><b>Released:</b> 06-01-2019</li>
2929
</ul>
3030
<p>
31-
<a target="_blank" href="https://assistantcomputercontrol.com/">Website</a> |
32-
<a target="_blank" href="https://github.com/AlbertMN/AssistantComputerControl">GitHub</a> |
33-
<a target="_blank" href="https://twitter.com/ACC_HomeAlexa">Twitter</a>
31+
<a href="https://assistantcomputercontrol.com/">Website</a> |
32+
<a href="https://github.com/AlbertMN/AssistantComputerControl">GitHub</a> |
33+
<a href="https://twitter.com/ACC_HomeAlexa">Twitter</a>
3434
</p>
3535

3636
<b>New this version;</b>
3737
<div class="scroller card card-body">
3838
<ul>
39-
<li><i>Hotfix 1.1.3 fixes;</i></li>
40-
<ul>
41-
<li>Fixed endless shutdown error where PC would shut down when it started</li>
42-
<li>Minor bug-fixes</li>
43-
<li>Performance improvements</li>
44-
</ul>
45-
<li><i>Hotfix 1.1.2 fixes;</i></li>
46-
<ul>
47-
<li>Fixed bug where ACC didn't detect Dropbox if you had Dropbox Business</li>
48-
<li>Fixed "Setup Guide" bug where it tricked you to think you had Dropbox even if you didn't</li>
49-
<li>Fixed endless loop of popups that showed when Dropbox wasn't installed</li>
50-
<li>And a bunch of other crash/bug-fixes as well</li>
51-
</ul>
52-
<li><b>Version 1.1.0: 8 new actions</b>
39+
<li><i>Hotfix 1.2.1 release notes;</i>
5340
<ul>
54-
<li><i>Enable them all <a target="_blank" href="https://assistantcomputercontrol.com/?sortBy=newest#what-can-it-do">here</a></i></li>
41+
<li>Fixed bug where PC would be stuck in shutdown loop after shutdown or restart action - sorry for the inconvenience</li>
42+
<li>Please report bugs <a href="https://github.com/AlbertMN/AssistantComputerControl/issues">here</a> or in the Discord server!</li>
43+
</ul>
44+
</li>
45+
46+
<li><i>Release 1.2.0 release notes;</i></li>
47+
<ul>
48+
<li>Happy new year!</li>
49+
<li>
50+
<b>Native <u>Google Drive</u> and <u>OneDrive</u> support!</b>
51+
<ul>
52+
<li>You can now choose to use <u>Google Drive</u> or <u>OneDrive</u> as the cloud-service instead of Dropbox</li>
53+
<li>
54+
Applets have been added for <i>all</i> the cloud services - fully updated.
55+
<a href="https://assistantcomputercontrol.com/#what-can-it-do">Click here to view all the applets</a> for the different cloud services
56+
</li>
57+
</ul>
58+
</li>
59+
<li>Special thanks to community-member Gamma1991 for his invaluable help getting all 156 the IFTTT applets ready for this release!</li>
60+
<li>Fixed bug where some could only execute <i>one</i> action per. ACC-lifetime</li>
61+
<li>Fixed Git repository</li>
62+
<li>Performance improvements</li>
63+
<li>Fixed installer issues when updating from the ACC-prompt</li>
64+
<li>Thanks for using ACC! And a special thanks to those who have 'Anonymous analysis' enabled! It gives great insights in what you guys use the software for.</li>
65+
</ul>
66+
67+
<li><i>Hotfix 1.1.3 fixes;</i></li>
68+
<ul>
69+
<li>Fixed endless shutdown error where PC would shut down when it started</li>
70+
<li>Minor bug-fixes</li>
71+
<li>Performance improvements</li>
72+
</ul>
73+
<li><i>Hotfix 1.1.2 fixes;</i></li>
74+
<ul>
75+
<li>Fixed bug where ACC didn't detect Dropbox if you had Dropbox Business</li>
76+
<li>Fixed "Setup Guide" bug where it tricked you to think you had Dropbox even if you didn't</li>
77+
<li>Fixed endless loop of popups that showed when Dropbox wasn't installed</li>
78+
<li>And a bunch of other crash/bug-fixes as well</li>
79+
</ul>
80+
<li>
81+
<b>Version 1.1.0: 8 new actions</b>
82+
<ul>
83+
<li><i>Enable them all <a href="https://assistantcomputercontrol.com/?sortBy=newest#what-can-it-do">here</a></i></li>
5584
<li><code>write_out</code>: speech to text! Say a phrase, and it will be written out in the focused text field</li>
5685
<li><code>open_all</code>: opens all files & folders at a specific location</li>
5786
<li><code>monitors_off</code>: turns off all monitors connected to the PC</li>
@@ -62,12 +91,14 @@
6291
<li><code>music:previousx2</code>: Does the <code>previous</code> action twice in a row <i>(for applications like Spotify, where one "previous" isn't enough)</i></li>
6392
</ul>
6493
</li>
65-
<li><b>Anonymous analytics</b>
94+
<li>
95+
<b>Anonymous analytics</b>
6696
<ul>
67-
<li><i><b>Please read</b></i>: ACC can now gather information about your behavior within the software <i>(how many actions you do, which and what assistant you use)</i>.
97+
<li>
98+
<i><b>Please read</b></i>: ACC can now gather information about your behavior within the software <i>(how many actions you do, which and what assistant you use)</i>.
6899
This is all anonymous, and nothing personal about you is gathered.<br>The <i>only</i> purpose of this is to make ACC better, giving the developer a better idea of how the software is <i>actually</i> used.
69100
<br><br>
70-
You decide whether you want the analytics data to be sent to the developer - you can always change your mind and turn it on/off. Nothing is sent without your consent. <a href="https://acc.readme.io/v1.1.0/docs/how-analytics-work" target="_blank">Click here</a> to learn more about why analytics is gathered, how and <i>exactly</i> what.
101+
You decide whether you want the analytics data to be sent to the developer - you can always change your mind and turn it on/off. Nothing is sent without your consent. <a href="https://acc.readme.io/docs/how-analytics-work">Click here</a> to learn more about why analytics is gathered, how and <i>exactly</i> what.
71102
</li>
72103
</ul>
73104
</li>

0 commit comments

Comments
 (0)