Merge branch 'master' of https://github.com/AlbertMN/AssistantComputerControl

Author: AlbertMN

Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab

@@ -1,15 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
 
 namespace AssistantComputerControl {
     class AnalyticsSettings {
-        const string sendDataUrl = "https://acc.albe.pw/api/ReceiveAnalyticsData.php";
-        const string sendSharingUrl = "https://acc.albe.pw/api/IsSharing.php";
-        public const string sentryToken = "https://[email protected]/1287269";
-        private static readonly HttpClient client = new HttpClient();
+        //ACC truly is open source, but for security reasons we will not share this one file with the whole world.
+        //This file handles sending analytics to the developers' webserver and contains a few variables that contain -
+        //sensitive access-tokens to integrations like Sentry.IO
+
+        //The public version of this file is exactly like the full version, but stripped of -
+        //API-keys and sensitive information.
+        //Cencored items have placeholders to ensure that everyone can fork and run the project without errors
+        public const string sentryToken = "super_secret";
 
         public static readonly string[] actions = new String[] { //No changing this order!
             "shutdown",         //0
@@ -43,31 +43,13 @@ class AnalyticsSettings {
             "unknown",
         };
 
-        public static void UpdateSharing(bool doShare) {
-            Properties.Settings.Default.SendAnonymousAnalytics = doShare;
-            Properties.Settings.Default.Save();
-
-            //Notify server whether
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", @"jmF}AXK6NH!#{@/:ZHV#qK6r#YxytM>K/W6#5q/}tEK!&*_Gd\_YNUBNN/$a+$r");
-
-            var parameters = new Dictionary<string, string> {
-                ["uid"] = Properties.Settings.Default.UID,
-                ["share"] = doShare ? "true" : "false"
-            };
-
-            try {
-                var response = client.PostAsync(sendSharingUrl, new FormUrlEncodedContent(parameters)).Result;
-                var contents = response.Content.ReadAsStringAsync().Result;
-                MainProgram.DoDebug("Posted user response");
-            } catch (Exception e) {
-                MainProgram.DoDebug("Failed to send analytics data - something wrong with the server?");
-                MainProgram.DoDebug(e.ToString());
-            }
-
-            SetupAnalytics();
+        class KeyHandler {
+            public bool Status { get; set; }
+            public string Message { get; set; }
+            public string Key { get; set; }
         }
 
-        public static void SetupAnalytics() {
+        public static void SetupAnalyticsAsync() {
             //Unique user-ID
             if (Properties.Settings.Default.UID == "" || Properties.Settings.Default.UID == null) {
                 string newUID = Guid.NewGuid().ToString("N");
@@ -113,22 +95,11 @@ public static void SetupAnalytics() {
                     Properties.Settings.Default.Save();
                 }
 
-                DateTime dateTime = DateTime.UtcNow.Date;
-                string thisDay = dateTime.ToString("yyyy/MM/dd");
-                if (Properties.Settings.Default.AnalyticsUnsentData && Properties.Settings.Default.AnalyticsThisDay == thisDay) {
-                    //Resume data for today
-                    ScheduleAnalyticsSend();
-                } else if (Properties.Settings.Default.AnalyticsUnsentData && Properties.Settings.Default.AnalyticsThisDay != thisDay) {
-                    //Didn't send last time - sending now
-                    SendAnalyticsData();
-                }
-
                 MainProgram.DoDebug("Annonymous analytics setup done");
             } else {
                 MainProgram.DoDebug("Annonymous analytics are not being shared");
             }
         }
-
         public static void PrintAnalytics() {
             int i = 0
                 , totalCount = 0;
@@ -149,30 +120,18 @@ public static void AddCount(string action, string type) {
             int pos = Array.IndexOf(actions, action);
             if (pos > -1) {
                 //MainProgram.DoDebug("Added +1 to " + action + " at pos " + pos);
-                if (Properties.Settings.Default.TotalActionsExecuted.Length >= pos) {
-                    Properties.Settings.Default.TotalActionsExecuted[pos]++;
-
-                    if (!Properties.Settings.Default.AnalyticsUnsentData) {
-                        Properties.Settings.Default.AnalyticsUnsentData = true;
-                        ScheduleAnalyticsSend();
-                    }
-                    Properties.Settings.Default.Save();
-                } else {
-                    MainProgram.DoDebug("Index " + pos.ToString() + " exceeds 'TotalActionsExecuted' property, which has length; " + Properties.Settings.Default.TotalActionsExecuted.Length.ToString());
-                }
+                Properties.Settings.Default.TotalActionsExecuted[pos]++;
+                Properties.Settings.Default.Save();
             } else {
                 MainProgram.DoDebug("Could not find action \"" + action + "\" in action-array (analytics)");
             }
+
+            SendAnalyticsData();
         }
         public static void AddCount(int action, string type) {
             AddTypeCount(type);
             if (actions[action] != null) {
                 Properties.Settings.Default.TotalActionsExecuted[action]++;
-
-                if (!Properties.Settings.Default.AnalyticsUnsentData) {
-                    Properties.Settings.Default.AnalyticsUnsentData = true;
-                    ScheduleAnalyticsSend();
-                }
                 Properties.Settings.Default.Save();
             } else {
                 MainProgram.DoDebug("Could not find action with index \"" + action + "\" in action-array (analytics)");
@@ -194,67 +153,14 @@ private static void AddTypeCount(string type) {
             }
         }
 
-        static void ScheduleAnalyticsSend() {
-            //Time when method needs to be called
-            MainProgram.DoDebug("Analytics scheduled to be sent at 00:00");
-
-            DateTime dateTime = DateTime.UtcNow.Date;
-            Properties.Settings.Default.AnalyticsThisDay = dateTime.ToString("yyyy/MM/dd");
-            Properties.Settings.Default.Save();
-
-            var DailyTime = "00:00:00";
-            var timeParts = DailyTime.Split(new char[1] { ':' });
-
-            var dateNow = DateTime.Now;
-            var date = new DateTime(dateNow.Year, dateNow.Month, dateNow.Day,
-                       int.Parse(timeParts[0]), int.Parse(timeParts[1]), int.Parse(timeParts[2]));
-            TimeSpan ts;
-            if (date > dateNow)
-                ts = date - dateNow;
-            else {
-                date = date.AddDays(1);
-                ts = date - dateNow;
-            }
-
-            Task.Delay(ts).ContinueWith((x) => SendAnalyticsData());
-        }
-
         public static string SendAnalyticsData() {
+            //Sends analytics data to the server
             if (Properties.Settings.Default.SendAnonymousAnalytics) {
-                if (MainProgram.HasInternet()) {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", @"jmF}AXK6NH!#{@/:ZHV#qK6r#YxytM>K/W6#5q/}tEK!&*_Gd\_YNUBNN/$a+$r");
-
-                    var parameters = new Dictionary<string, string> {
-                        ["uid"] = Properties.Settings.Default.UID,
-                        ["actions"] = string.Join(",", Properties.Settings.Default.TotalActionsExecuted),
-                        ["assistants"] = string.Join(",", Properties.Settings.Default.AssistantType),
-                        ["start_with_windows"] = Properties.Settings.Default.StartWithWindows ? "true" : "false",
-                        ["version"] = MainProgram.softwareVersion,
-                        ["beta_program"] = Properties.Settings.Default.BetaProgram ? "true" : "false",
-                        ["date"] = Properties.Settings.Default.AnalyticsThisDay
-                    };
-
-                    try {
-                        var response = client.PostAsync(sendDataUrl, new FormUrlEncodedContent(parameters)).Result;
-                        var contents = response.Content.ReadAsStringAsync().Result;
-
-                        //Success
-                        Properties.Settings.Default.AnalyticsUnsentData = false;
-                        Properties.Settings.Default.Save();
-                        MainProgram.DoDebug("Analytics successfully posted");
-                        return contents;
-                    } catch (Exception e) {
-                        MainProgram.DoDebug("Failed to send analytics data - something wrong with the server?");
-                        MainProgram.DoDebug(e.ToString());
-                        return "";
-                    }
-                } else {
-                    MainProgram.DoDebug("Failed to send analytics data; no internet connection");
-                    return "";
-                }
+                //Do it (sensitive code)
             } else {
-                return "";
+                //Don't do it (does nothing here)
             }
+            return "";
         }
     }
 }

Advanced Installer/Advanced Installer-cache/part1/output-info.ini

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssistantComputerControl {
+    public static class FlashWindow {
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool FlashWindowEx(ref FLASHWINFO pwfi);
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FLASHWINFO {
+            /// <summary>
+            /// The size of the structure in bytes.
+            /// </summary>
+            public uint cbSize;
+            /// <summary>
+            /// A Handle to the Window to be Flashed. The window can be either opened or minimized.
+            /// </summary>
+            public IntPtr hwnd;
+            /// <summary>
+            /// The Flash Status.
+            /// </summary>
+            public uint dwFlags;
+            /// <summary>
+            /// The number of times to Flash the window.
+            /// </summary>
+            public uint uCount;
+            /// <summary>
+            /// The rate at which the Window is to be flashed, in milliseconds. If Zero, the function uses the default cursor blink rate.
+            /// </summary>
+            public uint dwTimeout;
+        }
+
+        /// <summary>
+        /// Stop flashing. The system restores the window to its original stae.
+        /// </summary>
+        public const uint FLASHW_STOP = 0;
+
+        /// <summary>
+        /// Flash the window caption.
+        /// </summary>
+        public const uint FLASHW_CAPTION = 1;
+
+        /// <summary>
+        /// Flash the taskbar button.
+        /// </summary>
+        public const uint FLASHW_TRAY = 2;
+
+        /// <summary>
+        /// Flash both the window caption and taskbar button.
+        /// This is equivalent to setting the FLASHW_CAPTION | FLASHW_TRAY flags.
+        /// </summary>
+        public const uint FLASHW_ALL = 3;
+
+        /// <summary>
+        /// Flash continuously, until the FLASHW_STOP flag is set.
+        /// </summary>
+        public const uint FLASHW_TIMER = 4;
+
+        /// <summary>
+        /// Flash continuously until the window comes to the foreground.
+        /// </summary>
+        public const uint FLASHW_TIMERNOFG = 12;
+
+
+        /// <summary>
+        /// Flash the spacified Window (Form) until it recieves focus.
+        /// </summary>
+        /// <param name="form">The Form (Window) to Flash.</param>
+        /// <returns></returns>
+        public static bool Flash(System.Windows.Forms.Form form) {
+            // Make sure we're running under Windows 2000 or later
+            if (Win2000OrLater) {
+                FLASHWINFO fi = Create_FLASHWINFO(form.Handle, FLASHW_ALL | FLASHW_TIMERNOFG, uint.MaxValue, 0);
+                return FlashWindowEx(ref fi);
+            }
+            return false;
+        }
+
+        private static FLASHWINFO Create_FLASHWINFO(IntPtr handle, uint flags, uint count, uint timeout) {
+            FLASHWINFO fi = new FLASHWINFO();
+            fi.cbSize = Convert.ToUInt32(Marshal.SizeOf(fi));
+            fi.hwnd = handle;
+            fi.dwFlags = flags;
+            fi.uCount = count;
+            fi.dwTimeout = timeout;
+            return fi;
+        }
+
+        /// <summary>
+        /// Flash the specified Window (form) for the specified number of times
+        /// </summary>
+        /// <param name="form">The Form (Window) to Flash.</param>
+        /// <param name="count">The number of times to Flash.</param>
+        /// <returns></returns>
+        public static bool Flash(System.Windows.Forms.Form form, uint count) {
+            if (Win2000OrLater) {
+                FLASHWINFO fi = Create_FLASHWINFO(form.Handle, FLASHW_ALL, count, 0);
+                return FlashWindowEx(ref fi);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Start Flashing the specified Window (form)
+        /// </summary>
+        /// <param name="form">The Form (Window) to Flash.</param>
+        /// <returns></returns>
+        public static bool Start(System.Windows.Forms.Form form) {
+            if (Win2000OrLater) {
+                FLASHWINFO fi = Create_FLASHWINFO(form.Handle, FLASHW_ALL, uint.MaxValue, 0);
+                return FlashWindowEx(ref fi);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Stop Flashing the specified Window (form)
+        /// </summary>
+        /// <param name="form"></param>
+        /// <returns></returns>
+        public static bool Stop(System.Windows.Forms.Form form) {
+            if (Win2000OrLater) {
+                FLASHWINFO fi = Create_FLASHWINFO(form.Handle, FLASHW_STOP, uint.MaxValue, 0);
+                return FlashWindowEx(ref fi);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// A boolean value indicating whether the application is running on Windows 2000 or later.
+        /// </summary>
+        private static bool Win2000OrLater {
+            get { return System.Environment.OSVersion.Version.Major >= 5; }
+        }
+    }
+}

AssistantComputerControl/AnalyticsSettings.cs

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Albert Møller Nielsen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

AssistantComputerControl/FlashWindow.cs

@@ -1,10 +1,13 @@
 # AssistantComputerControl
 Control your computer using your **Google Home**, **Amazon Alexa** and **Microsoft Cortana** assistants!
 
+_The git repository is currently not up to date. Having merging issues. Download from [acc.albe.pw](https://acc.albe.pw/)_
+
 This is a simple but powerful tool that allows you to perform tasks on your Windows computer like;
 ### Supported computer actions
+* **Full and better list of what ACC can do [can be found here](https://acc.albe.pw/#what-can-it-do)**
 * Shutdown [[GH](https://ifttt.com/applets/W3b7fykE-acc-shut-down-computer)][[Alexa](https://ifttt.com/applets/pCPWA7je-acc-shut-down-computer)]
-* Open a file [[GH](https://ifttt.com/applets/Pny8DKBL-acc-open-file-example)][[Alexa](https://ifttt.com/applets/EsP6zWpe-acc-open-file-example)]
+* Open a file (or multiple) [[GH](https://ifttt.com/applets/Pny8DKBL-acc-open-file-example)][[Alexa](https://ifttt.com/applets/EsP6zWpe-acc-open-file-example)]
 * Restart [[GH](https://ifttt.com/applets/nsvdVxZ9-acc-restart-computer)][[Alexa](https://ifttt.com/applets/kkwxdE9T-acc-restart-computer)]
 * Sleep / Hibernate [[GH](https://ifttt.com/applets/mEbJCP8F-acc-sleep-computer)][[Alexa](https://ifttt.com/applets/Kagf93wH-acc-sleep-computer)]
 * Lock [[GH](https://ifttt.com/applets/epbqzfCa-acc-lock-computer)][[Alexa](https://ifttt.com/applets/Gv9Ts8ip-acc-lock-computer)]
@@ -23,7 +26,7 @@ This is a simple but powerful tool that allows you to perform tasks on your Wind
 This software only works on Windows and has yet only been tested on Windows 10, 8 & 7.
 
 ## Install
-Setting up AssistantComputerControl is a _piece of cake!_ It only takes about 2 minutes. You just [download the latest version](http://acc.albe.pw/download_latest.php?ref=https://github.com/AlbertMN/AssistantComputerControl) to your computer, open it and the setup guide will take you through the very short setup guide!
+Setting up AssistantComputerControl is a _piece of cake!_ It only takes about 2 minutes. You just [download the latest version](http://acc.albe.pw/) to your computer, open it and the setup guide will take you through the very short setup guide!
 
 _Note: [IFTTT](https://ifttt.com/) and a [Dropbox](https://www.dropbox.com/) account is required for the default setup. Dropbox will need to be running at all times for ACC to work_