better startup

deemoe404 · dimojang · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021
commit 38faf6626487b904f3b532fb9d29a9dbd23b4d1b
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -13,6 +13,9 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Threading;
+using System.Security.Principal;
+
+using Frogy.Methods;
 
 namespace Frogy
 {
@@ -27,6 +30,11 @@ public partial class App : Application
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            //Promote permission if not Administrator
+            var principal = new WindowsPrincipal(WindowsIdentity.GetCurrent());
+            if (!principal.IsInRole(WindowsBuiltInRole.Administrator))
+                MyDeviceHelper.PromotePermission();
+
             //Launage switch
             ResourceDictionary dict = new ResourceDictionary();
             switch (appData.LanguageSetting)
@@ -69,7 +77,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             //tray icon
             mutex = new Mutex(true, "FrogyMainProgram");
-            if (mutex.WaitOne(0, false))
+            if (mutex.WaitOne(0, false) || e.Args[0] == "restart")
             {
                 taskbarIcon = (TaskbarIcon)FindResource("icon");
 
@@ -92,10 +100,11 @@ protected override void OnStartup(StartupEventArgs e)
                     MessageBoxButton.OK,
                     MessageBoxImage.Warning);
 
-                Current.Shutdown();
+                Environment.Exit(1);
             }
         }
 
+
         private void SystemEvents_SessionEnded(object sender, SessionEndedEventArgs e)
         {
             appData.Save();

diff --git a/Methods/MyDeviceHelper.cs b/Methods/MyDeviceHelper.cs
@@ -1,11 +1,13 @@
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Frogy.Methods
 {
@@ -182,5 +184,22 @@ public static bool GetStartupStatus()
 
             return result;
         }
+
+        public static void PromotePermission()
+        {
+            ProcessStartInfo psi = new ProcessStartInfo();
+            Assembly curAssembly = Assembly.GetExecutingAssembly();
+
+            psi.FileName = curAssembly.Location;
+            psi.Verb = "runas";
+            psi.Arguments = "restart";
+
+            try
+            {
+                Process.Start(psi);
+                Environment.Exit(1);
+            }
+            catch { }
+        }
     }
 }
diff --git a/Methods/MyProcessHelper.cs b/Methods/MyProcessHelper.cs
@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices;
 using System.Drawing;
 using System.Windows.Media.Imaging;
+using System.Windows;
 
 namespace Frogy.Methods
 {
@@ -150,7 +151,7 @@ public static bool IsProcessUWP(Process process)
             }
             catch(Exception e)
             {
-                throw e;
+                throw (e);
             }
         }
     }

diff --git a/Properties/app.manifest b/Properties/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
       <applicationRequestMinimum>
         <defaultAssemblyRequest permissionSetReference="Custom" />

diff --git a/ViewModels/OverViewViewModel.cs b/ViewModels/OverViewViewModel.cs
@@ -120,32 +120,14 @@ private List<DetailViewItem> PrintSummaryView(List<MyTimeDuration> durations)
         {
             List<DetailViewItem> result = new List<DetailViewItem>();
 
-            string systemState;
-
             foreach (MyTimeDuration timeSpan in durations)
             {
-                switch (timeSpan.TimeDurationTask.ComputerStatus)
-                {
-                    case 1:
-                        systemState = "On active";
-                        break;
-
-                    case 0:
-                        systemState = "Locked";
-                        break;
-
-                    case 2:
-                        systemState = "Forgy exited";
-                        break;
-                }
-
                 DetailViewItem tmp = new DetailViewItem()
                 {
                     StartTime = timeSpan.StartTime.ToString(),
                     StopTime = timeSpan.StopTime.ToString(),
                     AppDuration = timeSpan.Duration.ToString(),
-                    AppIcon = MyDataHelper.BitmapToBitmapImage(
-                        MyDataHelper.Base64StringToImage(timeSpan.TimeDurationTask.ApplicationIcon_Base64)),
+                    AppIcon = MyDataHelper.BitmapToBitmapImage(MyDataHelper.Base64StringToImage(timeSpan.TimeDurationTask.ApplicationIcon_Base64)),
                     AppName = timeSpan.TimeDurationTask.ApplicationName,
                     WindowTitle = timeSpan.TimeDurationTask.ApplicationTitle,
                     SystemState = timeSpan.TimeDurationTask.ComputerStatus.ToString()
@@ -164,18 +146,12 @@ public OverViewViewModel()
             "13:00", "14:00", "15:00", "16:00", "17:00", "18:00",
             "19:00", "20:00", "21:00", "22:00", "23:00"};
 
-
-
             OverviewChartFormatter = value => value + "min";
         }
 
         private async void Update()
         {
-            await Task.Run(() =>
-            {
-                ((App)Application.Current).appData.Load(displayDate);
-            });
-
+            ((App)Application.Current).appData.Load(displayDate);
             MyDay today = ((App)Application.Current).appData.AllDays[displayDate];
 
             await Task.Run(() =>
@@ -191,7 +167,7 @@ await Task.Run(() =>
                 foreach (StackedColumnSeries i in OverviewChart_tmp)
                 {
                     OverviewChart.Add(i);
-                    Thread.Sleep(220);
+                    Thread.Sleep(20);
                 }
             });
         }