add adb kill dialog when closing ATA and fix task manager

msartore · Nov 18, 2023 · 65b5b5c · 65b5b5c
1 parent 59c3090
commit 65b5b5c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/ATA-GUI/ATA-GUI.csproj b/ATA-GUI/ATA-GUI.csproj
@@ -9,9 +9,9 @@
 		<ApplicationIcon>ATALogoGUI.ico</ApplicationIcon>
 
 		<!-- Versioning -->
-		<Version>3.3.3.0</Version>
-		<FileVersion>3.3.3.0</FileVersion>
-		<AssemblyVersion>3.3.3.0</AssemblyVersion>
+		<Version>3.3.4.0</Version>
+		<FileVersion>3.3.4.0</FileVersion>
+		<AssemblyVersion>3.3.4.0</AssemblyVersion>
 		<Copyright>© 2021-2023 Massimiliano Sartore</Copyright>
 
 		<!-- Publish settings -->

diff --git a/ATA-GUI/Classes/ATA.cs b/ATA-GUI/Classes/ATA.cs
@@ -9,7 +9,7 @@ namespace ATA_GUI.Classes
 {
     internal class ATA
     {
-        public static readonly string CURRENTVERSION = "v3.3.3";
+        public static readonly string CURRENTVERSION = "v3.3.4";
         public static readonly string IPFileName = "IPList.txt";
 
         public ATA()

diff --git a/ATA-GUI/Forms/MainForm.Designer.cs b/ATA-GUI/Forms/MainForm.Designer.cs
diff --git a/ATA-GUI/Forms/MainForm.cs b/ATA-GUI/Forms/MainForm.cs
@@ -415,7 +415,7 @@ private void loadApps(AppMode appMode)
                             {
                                 if (!allAppString.Contains(item))
                                 {
-                                    customApps.Add(item);
+                                    customApps.Add(item.Trim());
                                 }
                             }
                         }
@@ -1478,6 +1478,11 @@ private void pictureBoxMinimize_Click(object sender, EventArgs e)
         }
 
         private void pictureBoxClose_Click(object sender, EventArgs e)
+        {
+            Application.Exit();
+        }
+
+        private void closeATA()
         {
             if (Process.GetProcessesByName("adb").Length != 0)
             {
@@ -1487,7 +1492,6 @@ private void pictureBoxClose_Click(object sender, EventArgs e)
                     _ = ConsoleProcess.adbFastbootCommandR("kill-server", 0);
                 }
             }
-            Application.Exit();
         }
 
         private void pictureBoxMinimize_MouseEnter(object sender, EventArgs e)
@@ -2150,5 +2154,10 @@ private void groupBox2_DragEnter(object sender, DragEventArgs e)
         {
             e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
         }
+
+        private void MainForm_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            closeATA();
+        }
     }
 }
diff --git a/ATA-GUI/Forms/MainForm.resx b/ATA-GUI/Forms/MainForm.resx
@@ -125,7 +125,7 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAARvSURBVGhD7ZnPbhNXFMYTX16gbFBbFQiUmDiZ2I5gmwXy
-        izSRrAZIjPwCfQMvKrX7FkzoH2gcJv7DGAIEEtR9VFVdtUCc2DMxbdSUBWI45865kzvjy+iWZIQj8Um/
+        izSRrAZIjPwCfQNLXbT7FkzoH2gcJv7DGAIEEtR9VFVdtUCc2DMxbdSUBWI45865kzvjy+iWZIQj8Um/
         BfnmnvOdyTCZOzMQl9LL3cyE5fyBnLO6Wfrx4VC60c2MN9t2ttl1s81tN1trdTNW5zzZ/S0/vAXBgYzg
         MAzBwy+1bR74TpA0kMQhqn06hB9eCpxuOEHqTn8OIcKrAo/L1DxwiNF+GSIQ/i2BEaNme1Q9ktU+GSJV
         d57pBBaMLUmYW39RmfcnCJkzqk7eqHYk1IENEzwiBYyYdo7K9Jfk0Byz444CZPe/RGCf2x5k979EYCQl
@@ -143,7 +143,7 @@
         a2AtrAm1VT1hgG8olr5S9RdHjSX7N/6OX4JNL7rQzGUzTdjcL8OG/IHL5la8TT5u0BG+2ffeWHjQv4WP
         x+IaXIs1sBbWhNrhfjyD+eIjivX/NNbcPGbUnXX5q0vcA8i9RuvO79k7nU8ozruJD9Fw1sV3r7gHkL6v
         7T+8kDfE9jp+fYx7AP6Vs759cOGFxBCxDxBHeKGJWvvjxNRiMZGvFRMzVjFx6V4xMXsfeFhMFB4Ba5rA
-        sbgG12INrIU1oTb2oHYf9EHxa2DgDboHlbc5ZK/uAAAAAElFTkSuQmCC
+        sbgG12INrIU1oTb2oHYf9EHxa2DgDaixlbUPAuyFAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="openFileDialogAPK.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/ATA-GUI/Forms/TaskManager.cs b/ATA-GUI/Forms/TaskManager.cs
@@ -43,7 +43,9 @@ private void appsToolStripMenuItem_Click(object sender, EventArgs e)
 
             foreach (DataGridViewRow row in dataGridViewTasks.Rows)
             {
-                row.Visible = arrayApks.Contains(row.Cells[8].Value);
+                row.Visible = arrayApks.Any(it => ((string)row.Cells[8].Value).Contains(it.Trim()));
+
+                row.Visible = row.Visible;
             }
         }