From 07077a6733473316b81fb2c4bd080bb5b61e657b Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Wed, 29 May 2019 15:40:11 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adbGUI/Forms/BackupRestore.cs | 5 +- adbGUI/Forms/Density.cs | 2 +- adbGUI/Forms/FileOps.cs | 10 ++-- adbGUI/Forms/InstallUninstall.cs | 5 +- adbGUI/Forms/LogcatAdvanced.cs | 29 ++++-------- adbGUI/Forms/MainForm.cs | 46 +++++++++++-------- adbGUI/Forms/ResolutionChange.cs | 2 +- adbGUI/Forms/ScreenRecord.cs | 3 +- adbGUI/Forms/SetProp.cs | 2 +- adbGUI/Forms/Sideload.cs | 2 +- adbGUI/Forms/SpoofMac.cs | 2 +- adbGUI/Methods/AdbDeviceWatcher.cs | 1 + .../Methods/CheckAndDownloadDependencies.cs | 9 +++- adbGUI/Methods/CmdProcess.cs | 5 +- adbGUI/Methods/FormMethods.cs | 2 +- adbGUI/Program.cs | 4 +- adbGUI/Properties/AssemblyInfo.cs | 10 ++-- 17 files changed, 68 insertions(+), 71 deletions(-) diff --git a/adbGUI/Forms/BackupRestore.cs b/adbGUI/Forms/BackupRestore.cs index f859cd4..772c4f8 100644 --- a/adbGUI/Forms/BackupRestore.cs +++ b/adbGUI/Forms/BackupRestore.cs @@ -3,10 +3,10 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Globalization; using System.Windows.Forms; - using Methods; public partial class BackupRestore : Form { @@ -40,7 +40,6 @@ private void Btn_BackupStart_Click(object sender, EventArgs e) const string all = " -all"; var system = " -system"; - if (cbo_BackupPackage.Checked == false) { if (txt_BackupPathTo.Text == "") @@ -91,7 +90,7 @@ private void Cbo_BackupPackage_CheckedChanged(object sender, EventArgs e) if (!string.IsNullOrEmpty(output)) { - foreach (var item in output.Split(new[] {"\n"}, StringSplitOptions.RemoveEmptyEntries)) + foreach (var item in output.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries)) cbx_BackupPackage.Items.Add(item.Remove(0, 8)); cbx_BackupPackage.Sorted = true; diff --git a/adbGUI/Forms/Density.cs b/adbGUI/Forms/Density.cs index 81669a9..3e5d132 100644 --- a/adbGUI/Forms/Density.cs +++ b/adbGUI/Forms/Density.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class Density : Form { diff --git a/adbGUI/Forms/FileOps.cs b/adbGUI/Forms/FileOps.cs index 27580ad..de7c325 100644 --- a/adbGUI/Forms/FileOps.cs +++ b/adbGUI/Forms/FileOps.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class FileOps : Form { @@ -37,14 +37,14 @@ private void Btn_FileOpsPushBrowse_Click(object sender, EventArgs e) private void Btn_FileOpsPushPush_Click(object sender, EventArgs e) { - if (txt_FileOpsPushTo.Text == "" || txt_FileOpsPushFrom.Text == "") + if (txt_FileOpsPushTo.Text?.Length == 0 || txt_FileOpsPushFrom.Text?.Length == 0) { MessageBox.Show(@"Please select a file and chose destination!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } else { - var s = "adb push \"" + txt_FileOpsPushFrom.Text + "\"" + " \"" + txt_FileOpsPushTo.Text + "\""; + var s = "adb push \"" + txt_FileOpsPushFrom.Text + "\" \"" + txt_FileOpsPushTo.Text + "\""; _adb.StartProcessing(s, _formMethods.SelectedDevice()); } } @@ -65,14 +65,14 @@ private void Btn_FileOpsPullBrowse_Click(object sender, EventArgs e) private void Btn_FileOpsPullPull_Click(object sender, EventArgs e) { - if (txt_FileOpsPullTo.Text == "" || txt_FileOpsPullFrom.Text == "") + if (txt_FileOpsPullTo.Text?.Length == 0 || txt_FileOpsPullFrom.Text?.Length == 0) { MessageBox.Show(@"Please select a file and chose destination!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } else { - var s = "adb pull \"" + txt_FileOpsPullFrom.Text + "\"" + " \"" + txt_FileOpsPullTo.Text + "\""; + var s = "adb pull \"" + txt_FileOpsPullFrom.Text + "\" \"" + txt_FileOpsPullTo.Text + "\""; _adb.StartProcessing(s, _formMethods.SelectedDevice()); } } diff --git a/adbGUI/Forms/InstallUninstall.cs b/adbGUI/Forms/InstallUninstall.cs index afb247e..a5dc56d 100644 --- a/adbGUI/Forms/InstallUninstall.cs +++ b/adbGUI/Forms/InstallUninstall.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class InstallUninstall : Form { @@ -76,7 +76,7 @@ private void RefreshInstalledApps() if (!string.IsNullOrEmpty(output)) { - foreach (var item in output.Split(new[] {"\n"}, StringSplitOptions.RemoveEmptyEntries)) + foreach (var item in output.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries)) cbx_InstallUninstallPackageUninstall.Items.Add(item.Remove(0, 8)); cbx_InstallUninstallPackageUninstall.Sorted = true; @@ -85,7 +85,6 @@ private void RefreshInstalledApps() cbx_InstallUninstallPackageUninstall.SelectedIndex = 0; } - cbx_InstallUninstallPackageUninstall.Enabled = true; } } diff --git a/adbGUI/Forms/LogcatAdvanced.cs b/adbGUI/Forms/LogcatAdvanced.cs index 352d091..44c00f1 100644 --- a/adbGUI/Forms/LogcatAdvanced.cs +++ b/adbGUI/Forms/LogcatAdvanced.cs @@ -3,11 +3,11 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Diagnostics; using System.Threading; using System.Windows.Forms; - using Methods; public partial class LogcatAdvanced : Form, IDisposable { @@ -40,13 +40,12 @@ public LogcatAdvanced(CmdProcess adbFrm, FormMethods formMethodsFrm) GC.SuppressFinalize(this); } - private void AltAdb_CommandExecutionStarted() { - BeginInvoke((MethodInvoker) delegate - { - if (FormMethods.AlwaysClearConsole()) _lOut.rtb_console.Clear(); - }); + BeginInvoke((MethodInvoker)delegate + { + if (FormMethods.AlwaysClearConsole()) _lOut.rtb_console.Clear(); + }); } private void Btn_LogcatAdvancedStart_Click(object sender, EventArgs e) @@ -61,7 +60,6 @@ private void Btn_LogcatAdvancedStart_Click(object sender, EventArgs e) var outputFormat = GetOutputFormat(); var outputFilter = GetOutputFilter(); - if (cbo_LogcatAdvancedSeparateWindow.Checked) { _lOut.Show(); @@ -83,7 +81,7 @@ private void GetProcess_OutputDataReceived(object sender, DataReceivedEventArgs { try { - BeginInvoke((MethodInvoker) delegate { _lOut.rtb_console.AppendText(e.Data + Environment.NewLine); }); + BeginInvoke((MethodInvoker)delegate { _lOut.rtb_console.AppendText(e.Data + Environment.NewLine); }); } catch (Exception ex) { @@ -202,15 +200,10 @@ private string GetAlternativeBufferString() private string GetRegularExpressionString() { - var regEx = ""; + const string regEx = ""; if (string.IsNullOrEmpty(txt_LogcatAdvancedRegularExpressions.Text.Trim())) return regEx; - if (txt_LogcatAdvancedRegularExpressions.Text.Contains("|")) - regEx = " -e \"" + txt_LogcatAdvancedRegularExpressions.Text.Trim() + "\""; - else - regEx = " -e " + txt_LogcatAdvancedRegularExpressions.Text.Trim(); - - return regEx; + return (txt_LogcatAdvancedRegularExpressions.Text.Contains("|")) ? " -e \"" + txt_LogcatAdvancedRegularExpressions.Text.Trim() + "\"" : " -e " + txt_LogcatAdvancedRegularExpressions.Text.Trim(); } private string GetQuitAfterNumberOfLines() @@ -272,22 +265,16 @@ private string GetOutputFilter() if (opt_LogcatAdvancedFilterVerbose.Checked) outputFilter += " *:V"; - else if (opt_LogcatAdvancedFilterDebug.Checked) outputFilter += " *:D"; - else if (opt_LogcatAdvancedFilterInfo.Checked) outputFilter += " *:I"; - else if (opt_LogcatAdvancedFilterWarning.Checked) outputFilter += " *:W"; - else if (opt_LogcatAdvancedFilterError.Checked) outputFilter += " *:E"; - else if (opt_LogcatAdvancedFilterFatal.Checked) outputFilter += " *:F"; - else if (opt_LogcatAdvancedFilterSilent.Checked) outputFilter += " *:S"; return outputFilter; diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index 4994ecc..ecd9099 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -3,13 +3,13 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Diagnostics; using System.Globalization; using System.Text.RegularExpressions; using System.Threading; using System.Windows.Forms; - using Methods; public partial class MainForm : Form, IDisposable { @@ -48,7 +48,7 @@ public MainForm() rtb_console.Clear(); _cmdProcess.CommandExecutionStarted += CommandExecutionStarted; - _cmdProcess.ClearConsole += () => { rtb_console.Clear(); }; + _cmdProcess.ClearConsole += () => rtb_console.Clear(); // Select custom command control cbx_customCommand.Select(); @@ -56,6 +56,7 @@ public MainForm() // Start the watcher which fires if adb devices changed AdbDeviceWatcher.DeviceChanged += DwAdb_DeviceChanged; AdbDeviceWatcher.StartDeviceWatcher(); + Text = "ADBGUI build at 29/05/2019"; } public new void Dispose() @@ -76,18 +77,18 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) private void CommandExecutionStarted() { - BeginInvoke((MethodInvoker) delegate { rtb_console.Clear(); }); + BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); } private void DwAdb_DeviceChanged(AdbDeviceList e) { try { - BeginInvoke((MethodInvoker) delegate - { - _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); - txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); - }); + BeginInvoke((MethodInvoker)delegate + { + _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); + txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); + }); } catch (Exception ex) { @@ -120,7 +121,7 @@ private void AppendReceivedData(object sender, DataReceivedEventArgs e) { try { - BeginInvoke((MethodInvoker) delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); + BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); Thread.Sleep(2); } catch (Exception ex) @@ -150,7 +151,6 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) if (string.IsNullOrEmpty(tag = trv_commandTreeView.SelectedNode.Tag.ToString())) return; if (tag.StartsWith("adb ") || tag.StartsWith("fastboot ")) _cmdProcess.StartProcessing(tag, _formMethods.SelectedDevice()); - else if (tag.StartsWith("#")) switch (tag) { @@ -174,7 +174,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#screenrecord": - if (_screenRecord == null || _screenRecord.IsDisposed) + if (_screenRecord?.IsDisposed != false) { _screenRecord = new ScreenRecord(_cmdProcess, _formMethods); _screenRecord.Show(); @@ -187,7 +187,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#spoofmac": - if (_spoofMac == null || _spoofMac.IsDisposed) + if (_spoofMac?.IsDisposed != false) { _spoofMac = new SpoofMac(_cmdProcess, _formMethods); _spoofMac.Show(); @@ -200,7 +200,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#resolution": - if (_resolutionChange == null || _resolutionChange.IsDisposed) + if (_resolutionChange?.IsDisposed != false) { _resolutionChange = new ResolutionChange(_cmdProcess, _formMethods); _resolutionChange.Show(); @@ -213,7 +213,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#density": - if (_densityChange == null || _densityChange.IsDisposed) + if (_densityChange?.IsDisposed != false) { _densityChange = new Density(_cmdProcess, _formMethods); _densityChange.Show(); @@ -226,7 +226,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#files": - if (_fileOps == null || _fileOps.IsDisposed) + if (_fileOps?.IsDisposed != false) { _fileOps = new FileOps(_cmdProcess, _formMethods); _fileOps.Show(); @@ -239,7 +239,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#installuninstall": - if (_installUninstall == null || _installUninstall.IsDisposed) + if (_installUninstall?.IsDisposed != false) { _installUninstall = new InstallUninstall(_cmdProcess, _formMethods); _installUninstall.Show(); @@ -252,7 +252,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#sideload": - if (_sideLoad == null || _sideLoad.IsDisposed) + if (_sideLoad?.IsDisposed != false) { _sideLoad = new Sideload(_cmdProcess, _formMethods); _sideLoad.Show(); @@ -265,7 +265,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#backuprestore": - if (_backupRestore == null || _backupRestore.IsDisposed) + if (_backupRestore?.IsDisposed != false) { _backupRestore = new BackupRestore(_cmdProcess, _formMethods); _backupRestore.Show(); @@ -278,7 +278,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) break; case "#logcatadvanced": - if (_logcatAdvanced == null || _logcatAdvanced.IsDisposed) + if (_logcatAdvanced?.IsDisposed != false) { _logcatAdvanced = new LogcatAdvanced(_cmdProcess, _formMethods); _logcatAdvanced.Show(); @@ -293,6 +293,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) case "#credits": new Credits().ShowDialog(); break; + default: throw new ArgumentOutOfRangeException(); } @@ -390,24 +391,31 @@ private void Tsb_Power_Click(object sender, EventArgs e) case "Reboot Normal": _cmdProcess.StartProcessing("adb reboot", _formMethods.SelectedDevice()); break; + case "Reboot Recovery": _cmdProcess.StartProcessing("adb reboot recovery", _formMethods.SelectedDevice()); break; + case "Reboot Bootloader": _cmdProcess.StartProcessing("adb reboot bootloader", _formMethods.SelectedDevice()); break; + case "Reboot Fastboot": _cmdProcess.StartProcessing("adb reboot fastboot", _formMethods.SelectedDevice()); break; + case "Sideload Mode": _cmdProcess.StartProcessing("adb reboot sideload", _formMethods.SelectedDevice()); break; + case "Shutdown": _cmdProcess.StartProcessing("adb shell reboot -p", _formMethods.SelectedDevice()); break; + case "Sleep": _cmdProcess.StartProcessing("adb shell input keyevent POWER", _formMethods.SelectedDevice()); break; + default: throw new ArgumentOutOfRangeException(); } diff --git a/adbGUI/Forms/ResolutionChange.cs b/adbGUI/Forms/ResolutionChange.cs index 38a5553..d8c631c 100644 --- a/adbGUI/Forms/ResolutionChange.cs +++ b/adbGUI/Forms/ResolutionChange.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class ResolutionChange : Form { diff --git a/adbGUI/Forms/ScreenRecord.cs b/adbGUI/Forms/ScreenRecord.cs index 45b903c..c523e2c 100644 --- a/adbGUI/Forms/ScreenRecord.cs +++ b/adbGUI/Forms/ScreenRecord.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class ScreenRecord : Form { @@ -52,7 +52,6 @@ private void Btn_screenRecordStart_Click(object sender, EventArgs e) if (txt_ScreenRecordBitrate.Text != "") bitrate = " --bit-rate " + txt_ScreenRecordBitrate.Text + " "; - saveFileDialog.FileName = "record"; saveFileDialog.Filter = @"Video File (*.mp4)|*.mp4"; diff --git a/adbGUI/Forms/SetProp.cs b/adbGUI/Forms/SetProp.cs index 63ad191..b84a360 100644 --- a/adbGUI/Forms/SetProp.cs +++ b/adbGUI/Forms/SetProp.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class SetProp : Form { diff --git a/adbGUI/Forms/Sideload.cs b/adbGUI/Forms/Sideload.cs index c7bdaad..36b50bc 100644 --- a/adbGUI/Forms/Sideload.cs +++ b/adbGUI/Forms/Sideload.cs @@ -3,9 +3,9 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Windows.Forms; - using Methods; public partial class Sideload : Form { diff --git a/adbGUI/Forms/SpoofMac.cs b/adbGUI/Forms/SpoofMac.cs index 11e53e5..643731e 100644 --- a/adbGUI/Forms/SpoofMac.cs +++ b/adbGUI/Forms/SpoofMac.cs @@ -3,10 +3,10 @@ namespace adbGUI.Forms { + using Methods; using System; using System.Text.RegularExpressions; using System.Windows.Forms; - using Methods; public partial class SpoofMac : Form { diff --git a/adbGUI/Methods/AdbDeviceWatcher.cs b/adbGUI/Methods/AdbDeviceWatcher.cs index b65ae40..abafac8 100644 --- a/adbGUI/Methods/AdbDeviceWatcher.cs +++ b/adbGUI/Methods/AdbDeviceWatcher.cs @@ -19,6 +19,7 @@ public static class AdbDeviceWatcher private static int _connectedDevices; private static Thread _tr; + public static event DeviceChangedHandler DeviceChanged; public static void StartDeviceWatcher() diff --git a/adbGUI/Methods/CheckAndDownloadDependencies.cs b/adbGUI/Methods/CheckAndDownloadDependencies.cs index 8db196a..1d96ede 100644 --- a/adbGUI/Methods/CheckAndDownloadDependencies.cs +++ b/adbGUI/Methods/CheckAndDownloadDependencies.cs @@ -40,21 +40,29 @@ public static void Start() } break; + case DialogResult.No: Environment.Exit(0); break; + case DialogResult.None: break; + case DialogResult.OK: break; + case DialogResult.Cancel: break; + case DialogResult.Abort: break; + case DialogResult.Retry: break; + case DialogResult.Ignore: break; + default: throw new ArgumentOutOfRangeException(); } @@ -99,7 +107,6 @@ private static void DependenciesChecker_ExtractionCompleted() { var extractedFilesPath = Path.GetTempPath() + "platform-tools"; - foreach (var item in StrFiles) try { diff --git a/adbGUI/Methods/CmdProcess.cs b/adbGUI/Methods/CmdProcess.cs index da6b462..bdc85d2 100644 --- a/adbGUI/Methods/CmdProcess.cs +++ b/adbGUI/Methods/CmdProcess.cs @@ -21,7 +21,6 @@ public class CmdProcess : IDisposable // Thanks to Vitaliy Fedorchenko private const int CtrlCEvent = 0; - public CmdProcess() { GetProcess.EnableRaisingEvents = true; @@ -87,12 +86,10 @@ public void StartProcessing(string command, string serialnumber) @"Error - No Device Found", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - else if (command.StartsWith("cls")) { ClearConsole?.Invoke(); } - else { StopProcessing(); @@ -104,7 +101,7 @@ public void StartProcessing(string command, string serialnumber) public bool StopProcessing() { - if (!AttachConsole((uint) GetProcess.Id)) return false; + if (!AttachConsole((uint)GetProcess.Id)) return false; SetConsoleCtrlHandler(null, true); try { diff --git a/adbGUI/Methods/FormMethods.cs b/adbGUI/Methods/FormMethods.cs index 95197d4..49224fc 100644 --- a/adbGUI/Methods/FormMethods.cs +++ b/adbGUI/Methods/FormMethods.cs @@ -1,11 +1,11 @@ // This is an open source non-commercial project. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com +using adbGUI.Forms; using System; using System.Collections.Generic; using System.Diagnostics; using System.Windows.Forms; -using adbGUI.Forms; namespace adbGUI.Methods { diff --git a/adbGUI/Program.cs b/adbGUI/Program.cs index 2ad744f..8322718 100644 --- a/adbGUI/Program.cs +++ b/adbGUI/Program.cs @@ -3,10 +3,10 @@ namespace adbGUI { - using System; - using System.Windows.Forms; using Forms; using Methods; + using System; + using System.Windows.Forms; internal static class Program { diff --git a/adbGUI/Properties/AssemblyInfo.cs b/adbGUI/Properties/AssemblyInfo.cs index 806ad47..01b998d 100644 --- a/adbGUI/Properties/AssemblyInfo.cs +++ b/adbGUI/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// Allgemeine Informationen über eine Assembly werden über die folgenden +// Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. [assembly: AssemblyTitle("adbGUI")] @@ -16,8 +16,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von // COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. [assembly: ComVisible(false)] @@ -27,11 +27,11 @@ // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: // // Hauptversion -// Nebenversion +// Nebenversion // Buildnummer // Revision // -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern +// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.1")] From 8b7dc4d111a6c85038891aecf961e71a3868c8af Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Wed, 29 May 2019 23:09:00 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81=D1=8B?= =?UTF-8?q?=20adb.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adbGUI/Forms/BackupRestore.cs | 46 ++-- adbGUI/Forms/Credits.resx | 2 +- adbGUI/Forms/Density.cs | 15 +- adbGUI/Forms/FileOps.cs | 62 +++--- adbGUI/Forms/LogcatAdvanced.cs | 184 ++++++++-------- adbGUI/Forms/MainForm.cs | 137 ++++++------ adbGUI/Forms/ResolutionChange.cs | 15 +- adbGUI/Forms/ScreenRecord.cs | 14 +- adbGUI/Methods/AdbDeviceWatcher.cs | 81 ++++--- .../Methods/CheckAndDownloadDependencies.cs | 63 +++--- adbGUI/Methods/CmdProcess.cs | 206 ++++++++++-------- 11 files changed, 406 insertions(+), 419 deletions(-) diff --git a/adbGUI/Forms/BackupRestore.cs b/adbGUI/Forms/BackupRestore.cs index 772c4f8..b33c9ae 100644 --- a/adbGUI/Forms/BackupRestore.cs +++ b/adbGUI/Forms/BackupRestore.cs @@ -40,9 +40,9 @@ private void Btn_BackupStart_Click(object sender, EventArgs e) const string all = " -all"; var system = " -system"; - if (cbo_BackupPackage.Checked == false) + if (!cbo_BackupPackage.Checked) { - if (txt_BackupPathTo.Text == "") + if (txt_BackupPathTo.Text?.Length == 0) { MessageBox.Show(@"Please select a destination!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -61,11 +61,35 @@ private void Btn_BackupStart_Click(object sender, EventArgs e) { var package = cbx_BackupPackage.SelectedItem.ToString(); - if (txt_BackupPathTo.Text == "") + if (txt_BackupPathTo.Text?.Length == 0) + { MessageBox.Show(@"Please select a destination!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } else + { _adb.StartProcessing("adb backup -apk " + package + name, _formMethods.SelectedDevice()); + } + } + } + + private void Btn_RestoreBrowse_Click(object sender, EventArgs e) + { + openFileDialog.FileName = ""; + openFileDialog.Filter = @" .ab|*.ab"; + + if (openFileDialog.ShowDialog() == DialogResult.OK) txt_RestorePath.Text = openFileDialog.FileName; + } + + private void Btn_RestoreStart_Click(object sender, EventArgs e) + { + if (txt_RestorePath.Text?.Length == 0) + { + MessageBox.Show(@"Please select a file!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + else + { + _adb.StartProcessing("adb restore \"" + txt_RestorePath.Text + "\"", _formMethods.SelectedDevice()); } } @@ -111,21 +135,5 @@ private void Cbo_BackupPackage_CheckedChanged(object sender, EventArgs e) label8.Visible = false; } } - - private void Btn_RestoreStart_Click(object sender, EventArgs e) - { - if (txt_RestorePath.Text == "") - MessageBox.Show(@"Please select a file!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - else - _adb.StartProcessing("adb restore \"" + txt_RestorePath.Text + "\"", _formMethods.SelectedDevice()); - } - - private void Btn_RestoreBrowse_Click(object sender, EventArgs e) - { - openFileDialog.FileName = ""; - openFileDialog.Filter = @" .ab|*.ab"; - - if (openFileDialog.ShowDialog() == DialogResult.OK) txt_RestorePath.Text = openFileDialog.FileName; - } } } \ No newline at end of file diff --git a/adbGUI/Forms/Credits.resx b/adbGUI/Forms/Credits.resx index fcce381..938bda0 100644 --- a/adbGUI/Forms/Credits.resx +++ b/adbGUI/Forms/Credits.resx @@ -124,6 +124,6 @@ Elegant Themes: http://www.flaticon.com/authors/elegant-themes Freepik: http://www.freepik.com Dave Gandy: http://www.flaticon.com/authors/dave-gandy -Version at 06/04/2018 +Version at 29/05/2019 \ No newline at end of file diff --git a/adbGUI/Forms/Density.cs b/adbGUI/Forms/Density.cs index 3e5d132..cc4b834 100644 --- a/adbGUI/Forms/Density.cs +++ b/adbGUI/Forms/Density.cs @@ -26,20 +26,11 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) return true; } - private void Btn_showDpi_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm density", _formMethods.SelectedDevice()); - } + private void Btn_resetDpi_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm density reset", _formMethods.SelectedDevice()); - private void Btn_setDpi_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm density " + txt_phoneDpi.Text, _formMethods.SelectedDevice()); - } + private void Btn_setDpi_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm density " + txt_phoneDpi.Text, _formMethods.SelectedDevice()); - private void Btn_resetDpi_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm density reset", _formMethods.SelectedDevice()); - } + private void Btn_showDpi_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm density", _formMethods.SelectedDevice()); private void DpiChange_KeyDown(object sender, KeyEventArgs e) { diff --git a/adbGUI/Forms/FileOps.cs b/adbGUI/Forms/FileOps.cs index de7c325..ef903d6 100644 --- a/adbGUI/Forms/FileOps.cs +++ b/adbGUI/Forms/FileOps.cs @@ -19,6 +19,34 @@ public FileOps(CmdProcess adbFrm, FormMethods formMethodsFrm) _formMethods = formMethodsFrm; } + private void Btn_FileOpsPullBrowse_Click(object sender, EventArgs e) + { + folderBrowserDialog.Description = @"Where should the file be saved?"; + + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + txt_FileOpsPullTo.Text = folderBrowserDialog.SelectedPath; + } + + private void Btn_FileOpsPullList_Click(object sender, EventArgs e) + { + var path = txt_FileOpsPullFrom.Text; + _adb.StartProcessing("adb shell ls -la " + path + " -F", _formMethods.SelectedDevice()); + } + + private void Btn_FileOpsPullPull_Click(object sender, EventArgs e) + { + if (txt_FileOpsPullTo.Text?.Length == 0 || txt_FileOpsPullFrom.Text?.Length == 0) + { + MessageBox.Show(@"Please select a file and chose destination!", @"Error", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + else + { + var s = "adb pull \"" + txt_FileOpsPullFrom.Text + "\" \"" + txt_FileOpsPullTo.Text + "\""; + _adb.StartProcessing(s, _formMethods.SelectedDevice()); + } + } + private void Btn_FileOpsPushBrowse_Click(object sender, EventArgs e) { openFileDialog.FileName = " "; //This is not a normal whitespace. ALT + 255 @@ -29,23 +57,13 @@ private void Btn_FileOpsPushBrowse_Click(object sender, EventArgs e) if (openFileDialog.ShowDialog() != DialogResult.OK) return; if (openFileDialog.SafeFileName == " ") //This is not a normal whitespace. ALT + 255 + { txt_FileOpsPushTo.Text = openFileDialog.FileName.Remove(openFileDialog.FileName.Length - 2, 2); - else - txt_FileOpsPushFrom.Text = openFileDialog.FileName; - } - - private void Btn_FileOpsPushPush_Click(object sender, EventArgs e) - { - if (txt_FileOpsPushTo.Text?.Length == 0 || txt_FileOpsPushFrom.Text?.Length == 0) - { - MessageBox.Show(@"Please select a file and chose destination!", @"Error", MessageBoxButtons.OK, - MessageBoxIcon.Error); } else { - var s = "adb push \"" + txt_FileOpsPushFrom.Text + "\" \"" + txt_FileOpsPushTo.Text + "\""; - _adb.StartProcessing(s, _formMethods.SelectedDevice()); + txt_FileOpsPushFrom.Text = openFileDialog.FileName; } } @@ -55,32 +73,18 @@ private void Btn_FileOpsPushList_Click(object sender, EventArgs e) _adb.StartProcessing("adb shell ls -la " + path + " -F", _formMethods.SelectedDevice()); } - private void Btn_FileOpsPullBrowse_Click(object sender, EventArgs e) - { - folderBrowserDialog.Description = @"Where should the file be saved?"; - - if (folderBrowserDialog.ShowDialog() == DialogResult.OK) - txt_FileOpsPullTo.Text = folderBrowserDialog.SelectedPath; - } - - private void Btn_FileOpsPullPull_Click(object sender, EventArgs e) + private void Btn_FileOpsPushPush_Click(object sender, EventArgs e) { - if (txt_FileOpsPullTo.Text?.Length == 0 || txt_FileOpsPullFrom.Text?.Length == 0) + if (txt_FileOpsPushTo.Text?.Length == 0 || txt_FileOpsPushFrom.Text?.Length == 0) { MessageBox.Show(@"Please select a file and chose destination!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } else { - var s = "adb pull \"" + txt_FileOpsPullFrom.Text + "\" \"" + txt_FileOpsPullTo.Text + "\""; + var s = "adb push \"" + txt_FileOpsPushFrom.Text + "\" \"" + txt_FileOpsPushTo.Text + "\""; _adb.StartProcessing(s, _formMethods.SelectedDevice()); } } - - private void Btn_FileOpsPullList_Click(object sender, EventArgs e) - { - var path = txt_FileOpsPullFrom.Text; - _adb.StartProcessing("adb shell ls -la " + path + " -F", _formMethods.SelectedDevice()); - } } } \ No newline at end of file diff --git a/adbGUI/Forms/LogcatAdvanced.cs b/adbGUI/Forms/LogcatAdvanced.cs index 44c00f1..aafa2bc 100644 --- a/adbGUI/Forms/LogcatAdvanced.cs +++ b/adbGUI/Forms/LogcatAdvanced.cs @@ -48,6 +48,25 @@ private void AltAdb_CommandExecutionStarted() }); } + private void Btn_LogcatAdvancedClearBuffers_Click(object sender, EventArgs e) + { + var alternativeBuffers = GetAlternativeBufferString(); + + if (!string.IsNullOrEmpty(alternativeBuffers)) + _adb.StartProcessing("adb logcat" + alternativeBuffers + " -c", _formMethods.SelectedDevice()); + } + + private void Btn_LogcatAdvancedNewBufferSize_Click(object sender, EventArgs e) => _adb.StartProcessing("adb logcat -g", _formMethods.SelectedDevice()); + + private void Btn_LogcatAdvancedSetBufferSize_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txt_LogcatAdvancedBufferSize.Text)) + { + _adb.StartProcessing("adb logcat -G " + txt_LogcatAdvancedBufferSize.Text.Trim(), + _formMethods.SelectedDevice()); + } + } + private void Btn_LogcatAdvancedStart_Click(object sender, EventArgs e) { var alternativeBuffers = GetAlternativeBufferString(); @@ -77,26 +96,18 @@ private void Btn_LogcatAdvancedStart_Click(object sender, EventArgs e) } } - private void GetProcess_OutputDataReceived(object sender, DataReceivedEventArgs e) + private void Btn_LogcatAdvancedStatistics_Click(object sender, EventArgs e) { - try + if (cbo_LogcatAdvancedSeparateWindow.Checked) { - BeginInvoke((MethodInvoker)delegate { _lOut.rtb_console.AppendText(e.Data + Environment.NewLine); }); + _lOut.Show(); + + _altAdb.StartProcessing("adb logcat -S", _formMethods.SelectedDevice()); } - catch (Exception ex) + else { - MessageBox.Show(ex.Message); + _adb.StartProcessing("adb logcat -S", _formMethods.SelectedDevice()); } - - Thread.Sleep(3); - } - - private void Btn_LogcatAdvancedClearBuffers_Click(object sender, EventArgs e) - { - var alternativeBuffers = GetAlternativeBufferString(); - - if (!string.IsNullOrEmpty(alternativeBuffers)) - _adb.StartProcessing("adb logcat" + alternativeBuffers + " -c", _formMethods.SelectedDevice()); } private void Btn_LogcatAdvancedStop_Click(object sender, EventArgs e) @@ -107,28 +118,6 @@ private void Btn_LogcatAdvancedStop_Click(object sender, EventArgs e) _adb.StopProcessing(); } - private void Btn_LogcatAdvancedNewBufferSize_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb logcat -g", _formMethods.SelectedDevice()); - } - - private void Btn_LogcatAdvancedSetBufferSize_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(txt_LogcatAdvancedBufferSize.Text)) - _adb.StartProcessing("adb logcat -G " + txt_LogcatAdvancedBufferSize.Text.Trim(), - _formMethods.SelectedDevice()); - } - - private void Txt_LogcatAdvancedRecentNumberOfLines_KeyDown(object sender, KeyEventArgs e) - { - txt_LogcatAdvancedQuitAfterNumberLines.Clear(); - } - - private void Txt_LogcatAdvancedQuitAfterNumberLines_KeyDown(object sender, KeyEventArgs e) - { - txt_LogcatAdvancedRecentNumberOfLines.Clear(); - } - private void Cbo_LogcatAdvancedAlternativeBuffersAll_CheckedChanged(object sender, EventArgs e) { if (cbo_LogcatAdvancedAlternativeBuffersAll.Checked) @@ -178,11 +167,6 @@ private void Cbo_LogcatAdvancedAlternativeBuffersDefault_CheckedChanged(object s } } - private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - Process.Start(linkLabel1.Text); - } - private string GetAlternativeBufferString() { var alternativeBuffers = ""; @@ -198,24 +182,6 @@ private string GetAlternativeBufferString() return alternativeBuffers; } - private string GetRegularExpressionString() - { - const string regEx = ""; - - if (string.IsNullOrEmpty(txt_LogcatAdvancedRegularExpressions.Text.Trim())) return regEx; - return (txt_LogcatAdvancedRegularExpressions.Text.Contains("|")) ? " -e \"" + txt_LogcatAdvancedRegularExpressions.Text.Trim() + "\"" : " -e " + txt_LogcatAdvancedRegularExpressions.Text.Trim(); - } - - private string GetQuitAfterNumberOfLines() - { - var countNumber = ""; - - if (!string.IsNullOrEmpty(txt_LogcatAdvancedQuitAfterNumberLines.Text.Trim())) - countNumber = " -m " + txt_LogcatAdvancedQuitAfterNumberLines.Text.Trim(); - - return countNumber; - } - private string GetBypassRegEx() { var bypassRegEx = ""; @@ -226,36 +192,6 @@ private string GetBypassRegEx() return bypassRegEx; } - private string GetPidFilter() - { - var pidFilter = ""; - - if (!string.IsNullOrEmpty(txt_LogcatAdvancedPidFilter.Text.Trim())) - pidFilter = " --pid=" + txt_LogcatAdvancedPidFilter.Text.Trim(); - - return pidFilter; - } - - private string GetRecentNumberOfLines() - { - var recentNumberOfLines = ""; - - if (!string.IsNullOrEmpty(txt_LogcatAdvancedRecentNumberOfLines.Text.Trim())) - recentNumberOfLines = " -t " + txt_LogcatAdvancedRecentNumberOfLines.Text.Trim(); - - return recentNumberOfLines; - } - - private string GetSpecifiedTime() - { - var specifiedTime = ""; - - if (!string.IsNullOrEmpty(txt_LogcatAdvancedSpecifiedTime.Text.Trim())) - specifiedTime = " -T \"" + txt_LogcatAdvancedSpecifiedTime.Text.Trim() + "\""; - - return specifiedTime; - } - private string GetOutputFilter() { var outputFilter = ""; @@ -303,24 +239,78 @@ private string GetOutputFormat() return opt_LogcatAdvancedOutputFormatBrief.Checked ? " -v brief" : ""; } - private void Btn_LogcatAdvancedStatistics_Click(object sender, EventArgs e) + private string GetPidFilter() { - if (cbo_LogcatAdvancedSeparateWindow.Checked) - { - _lOut.Show(); + var pidFilter = ""; - _altAdb.StartProcessing("adb logcat -S", _formMethods.SelectedDevice()); + if (!string.IsNullOrEmpty(txt_LogcatAdvancedPidFilter.Text.Trim())) + pidFilter = " --pid=" + txt_LogcatAdvancedPidFilter.Text.Trim(); + + return pidFilter; + } + + private void GetProcess_OutputDataReceived(object sender, DataReceivedEventArgs e) + { + try + { + BeginInvoke((MethodInvoker)delegate { _lOut.rtb_console.AppendText(e.Data + Environment.NewLine); }); } - else + catch (Exception ex) { - _adb.StartProcessing("adb logcat -S", _formMethods.SelectedDevice()); + MessageBox.Show(ex.Message); } + + Thread.Sleep(3); + } + + private string GetQuitAfterNumberOfLines() + { + var countNumber = ""; + + if (!string.IsNullOrEmpty(txt_LogcatAdvancedQuitAfterNumberLines.Text.Trim())) + countNumber = " -m " + txt_LogcatAdvancedQuitAfterNumberLines.Text.Trim(); + + return countNumber; + } + + private string GetRecentNumberOfLines() + { + var recentNumberOfLines = ""; + + if (!string.IsNullOrEmpty(txt_LogcatAdvancedRecentNumberOfLines.Text.Trim())) + recentNumberOfLines = " -t " + txt_LogcatAdvancedRecentNumberOfLines.Text.Trim(); + + return recentNumberOfLines; } + private string GetRegularExpressionString() + { + const string regEx = ""; + + if (string.IsNullOrEmpty(txt_LogcatAdvancedRegularExpressions.Text.Trim())) return regEx; + return (txt_LogcatAdvancedRegularExpressions.Text.Contains("|")) ? " -e \"" + txt_LogcatAdvancedRegularExpressions.Text.Trim() + "\"" : " -e " + txt_LogcatAdvancedRegularExpressions.Text.Trim(); + } + + private string GetSpecifiedTime() + { + var specifiedTime = ""; + + if (!string.IsNullOrEmpty(txt_LogcatAdvancedSpecifiedTime.Text.Trim())) + specifiedTime = " -T \"" + txt_LogcatAdvancedSpecifiedTime.Text.Trim() + "\""; + + return specifiedTime; + } + + private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) => Process.Start(linkLabel1.Text); + private void LogcatAdvanced_FormClosing(object sender, FormClosingEventArgs e) { _lOut.Close(); _altAdb.GetProcess.Close(); } + + private void Txt_LogcatAdvancedQuitAfterNumberLines_KeyDown(object sender, KeyEventArgs e) => txt_LogcatAdvancedRecentNumberOfLines.Clear(); + + private void Txt_LogcatAdvancedRecentNumberOfLines_KeyDown(object sender, KeyEventArgs e) => txt_LogcatAdvancedQuitAfterNumberLines.Clear(); } } \ No newline at end of file diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index ecd9099..38facb8 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -71,24 +71,16 @@ public MainForm() protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { if (keyData != Keys.Escape) return base.ProcessCmdKey(ref msg, keyData); - _cmdProcess.StopProcessing(); + _ = _cmdProcess.StopProcessing(); return true; } - private void CommandExecutionStarted() - { - BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); - } - - private void DwAdb_DeviceChanged(AdbDeviceList e) + private void AppendReceivedData(object sender, DataReceivedEventArgs e) { try { - BeginInvoke((MethodInvoker)delegate - { - _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); - txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); - }); + BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); + Thread.Sleep(2); } catch (Exception ex) { @@ -96,10 +88,7 @@ private void DwAdb_DeviceChanged(AdbDeviceList e) } } - private void Btn_consoleStop_Click(object sender, EventArgs e) - { - _cmdProcess.StopProcessing(); - } + private void Btn_consoleStop_Click(object sender, EventArgs e) => _cmdProcess.StopProcessing(); private void Btn_executeCommand_Click(object sender, EventArgs e) { @@ -117,12 +106,37 @@ private void Btn_executeCommand_Click(object sender, EventArgs e) } } - private void AppendReceivedData(object sender, DataReceivedEventArgs e) + private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Return) btn_executeCommand.PerformClick(); + } + + private void CommandExecutionStarted() => BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); + + private void DwAdb_DeviceChanged(AdbDeviceList e) { try { - BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); - Thread.Sleep(2); + BeginInvoke((MethodInvoker)delegate + { + _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); + txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); + }); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } + } + + private void MainForm_FormClosed(object sender, FormClosedEventArgs e) + { + try + { + foreach (var process in Process.GetProcessesByName("adb")) + { + process.Kill(); + } } catch (Exception ex) { @@ -136,10 +150,7 @@ private void MainForm_Load(object sender, EventArgs e) trv_commandTreeView.SelectedNode = trv_commandTreeView.Nodes[0]; } - private void Rtb_console_Resize(object sender, EventArgs e) - { - rtb_console.ScrollToCaret(); - } + private void Rtb_console_Resize(object sender, EventArgs e) => rtb_console.ScrollToCaret(); private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) { @@ -150,8 +161,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) if (string.IsNullOrEmpty(tag = trv_commandTreeView.SelectedNode.Tag.ToString())) return; if (tag.StartsWith("adb ") || tag.StartsWith("fastboot ")) + { _cmdProcess.StartProcessing(tag, _formMethods.SelectedDevice()); + } else if (tag.StartsWith("#")) + { switch (tag) { case "#prop": @@ -166,9 +180,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) .Replace(' ', '_').Replace(':', '.'); saveFileDialog.Filter = @"PNG Image(.png)|*.png"; if (saveFileDialog.ShowDialog() == DialogResult.OK) + { _cmdProcess.StartProcessing( "adb shell screencap -p > " + saveFileDialog.FileName, _formMethods.SelectedDevice()); + } } break; @@ -297,6 +313,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) default: throw new ArgumentOutOfRangeException(); } + } } catch (Exception ex) { @@ -304,25 +321,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) } } - private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Return) btn_executeCommand.PerformClick(); - } + private void Tsb_AdbRoot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - private void MainForm_FormClosed(object sender, FormClosedEventArgs e) - { - // Kill the process - // todo rename Forms - try - { - //adb.StopProcessing(); - _cmdProcess.GetProcess.Kill(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } - } + private void Tsb_AdbUnroot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); + + private void Tsb_KillServer_Click(object sender, EventArgs e) => FormMethods.KillServer(); private void Tsb_OpenShell_Click(object sender, EventArgs e) { @@ -351,39 +354,6 @@ private void Tsb_OpenShell_Click(object sender, EventArgs e) } } - private void Tsm_WirelessConnect_Click(object sender, EventArgs e) - { - var r = new Regex(@"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$"); - - var ipadress = tst_IpAdress.Text; - - if (r.Match(ipadress).Success) - _cmdProcess.StartProcessing("adb connect " + ipadress, ""); - else - MessageBox.Show(@"Please enter a valid IP adress", @"Error", MessageBoxButtons.OK, - MessageBoxIcon.Information); - } - - private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb disconnect", ""); - } - - private void Tsb_KillServer_Click(object sender, EventArgs e) - { - FormMethods.KillServer(); - } - - private void Tsb_AdbRoot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - } - - private void Tsb_AdbUnroot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); - } - private void Tsb_Power_Click(object sender, EventArgs e) { switch (sender.ToString()) @@ -420,5 +390,24 @@ private void Tsb_Power_Click(object sender, EventArgs e) throw new ArgumentOutOfRangeException(); } } + + private void Tsm_WirelessConnect_Click(object sender, EventArgs e) + { + var r = new Regex(@"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$"); + + var ipadress = tst_IpAdress.Text; + + if (r.Match(ipadress).Success) + { + _cmdProcess.StartProcessing("adb connect " + ipadress, ""); + } + else + { + MessageBox.Show(@"Please enter a valid IP adress", @"Error", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + } + + private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb disconnect", ""); } } \ No newline at end of file diff --git a/adbGUI/Forms/ResolutionChange.cs b/adbGUI/Forms/ResolutionChange.cs index d8c631c..73cfa74 100644 --- a/adbGUI/Forms/ResolutionChange.cs +++ b/adbGUI/Forms/ResolutionChange.cs @@ -26,20 +26,11 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) return true; } - private void Btn_ResolutionChangeSet_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm size " + txt_phoneResolution.Text, _formMethods.SelectedDevice()); - } + private void Btn_ResolutionChangeReset_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm size reset", _formMethods.SelectedDevice()); - private void Btn_ResolutionChangeReset_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm size reset", _formMethods.SelectedDevice()); - } + private void Btn_ResolutionChangeSet_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm size " + txt_phoneResolution.Text, _formMethods.SelectedDevice()); - private void Btn_ResolutionChangeShow_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell wm size", _formMethods.SelectedDevice()); - } + private void Btn_ResolutionChangeShow_Click(object sender, EventArgs e) => _adb.StartProcessing("adb shell wm size", _formMethods.SelectedDevice()); private void Txt_phoneResolution_KeyDown(object sender, KeyEventArgs e) { diff --git a/adbGUI/Forms/ScreenRecord.cs b/adbGUI/Forms/ScreenRecord.cs index c523e2c..47605ca 100644 --- a/adbGUI/Forms/ScreenRecord.cs +++ b/adbGUI/Forms/ScreenRecord.cs @@ -27,16 +27,6 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) return true; } - private void Trb_screenRecord_Scroll(object sender, EventArgs e) - { - lbl_screenRecordSeconds.Text = trb_screenRecordTimeLimit.Value.ToString(); - } - - private void Cbo_ScreenRecordCustomResolution_CheckedChanged(object sender, EventArgs e) - { - txt_screenRecordResolution.Enabled = cbo_ScreenRecordCustomResolution.Checked; - } - private void Btn_screenRecordStart_Click(object sender, EventArgs e) { var size = ""; @@ -75,6 +65,8 @@ private void Btn_SreenRecordAbort_Click(object sender, EventArgs e) _adb.StopProcessing(); } + private void Cbo_ScreenRecordCustomResolution_CheckedChanged(object sender, EventArgs e) => txt_screenRecordResolution.Enabled = cbo_ScreenRecordCustomResolution.Checked; + private void Timer_Tick(object sender, EventArgs e) { if (_time > 1) @@ -88,5 +80,7 @@ private void Timer_Tick(object sender, EventArgs e) btn_screenRecordStart.Text = @"Start"; } } + + private void Trb_screenRecord_Scroll(object sender, EventArgs e) => lbl_screenRecordSeconds.Text = trb_screenRecordTimeLimit.Value.ToString(); } } \ No newline at end of file diff --git a/adbGUI/Methods/AdbDeviceWatcher.cs b/adbGUI/Methods/AdbDeviceWatcher.cs index abafac8..790adb7 100644 --- a/adbGUI/Methods/AdbDeviceWatcher.cs +++ b/adbGUI/Methods/AdbDeviceWatcher.cs @@ -10,18 +10,20 @@ namespace adbGUI.Methods public static class AdbDeviceWatcher { - public delegate void DeviceChangedHandler(AdbDeviceList e); - - private static string _devicesRawOld; + private static int _connectedDevices; private static string _devicesRawNew; - private static int _connectedDevices; + private static string _devicesRawOld; private static Thread _tr; + public delegate void DeviceChangedHandler(AdbDeviceList e); + public static event DeviceChangedHandler DeviceChanged; + public static int ConnectedAdbDevices => _connectedDevices; + public static void StartDeviceWatcher() { _tr = new Thread(Watcher) @@ -32,36 +34,6 @@ public static void StartDeviceWatcher() _tr.Start(); } - private static void Watcher() - { - while (true) - { - if (DeviceChanged != null) - { - _devicesRawNew = StartProcessingGetDevices("adb devices -l"); - - if (_devicesRawNew != _devicesRawOld) - { - _devicesRawOld = _devicesRawNew; - - var dl = new AdbDeviceList - { - GetDevicesRaw = _devicesRawNew, - GetDevicesList = ParseDevicesL(_devicesRawNew) - }; - - _connectedDevices = dl.GetDevicesList.Count; - - DeviceChanged?.Invoke(dl); - } - } - - Thread.Sleep(750); - } - - // ReSharper disable once FunctionNeverReturns - } - private static List ParseDevicesL(string input) { var listofserials = new List(); @@ -73,9 +45,11 @@ private static List ParseDevicesL(string input) { var line = s.ReadLine(); - if (line != null && (line.StartsWith("List") || line.StartsWith("\r\n") || line.Trim() == "" || - line.StartsWith("*"))) + if (line != null && (line.StartsWith("List") || line.StartsWith("\r\n") || line.Trim()?.Length == 0 + || line.StartsWith("*"))) + { continue; + } if (line != null && line.IndexOf(' ') != -1) listofserials.Add(line.Substring(0, line.IndexOf(' '))); @@ -85,11 +59,6 @@ private static List ParseDevicesL(string input) return listofserials; } - public static int GetConnectedAdbDevices() - { - return _connectedDevices; - } - private static string StartProcessingGetDevices(string command) { using (var process2 = new Process @@ -111,5 +80,35 @@ private static string StartProcessingGetDevices(string command) return process2.StandardOutput.ReadToEnd(); } } + + private static void Watcher() + { + while (true) + { + if (DeviceChanged != null) + { + _devicesRawNew = StartProcessingGetDevices("adb devices -l"); + + if (_devicesRawNew != _devicesRawOld) + { + _devicesRawOld = _devicesRawNew; + + var dl = new AdbDeviceList + { + GetDevicesRaw = _devicesRawNew, + GetDevicesList = ParseDevicesL(_devicesRawNew) + }; + + _connectedDevices = dl.GetDevicesList.Count; + + DeviceChanged?.Invoke(dl); + } + } + + Thread.Sleep(750); + } + + // ReSharper disable once FunctionNeverReturns + } } } \ No newline at end of file diff --git a/adbGUI/Methods/CheckAndDownloadDependencies.cs b/adbGUI/Methods/CheckAndDownloadDependencies.cs index 1d96ede..fb71750 100644 --- a/adbGUI/Methods/CheckAndDownloadDependencies.cs +++ b/adbGUI/Methods/CheckAndDownloadDependencies.cs @@ -19,9 +19,15 @@ public static class CheckAndDownloadDependencies private static readonly string[] StrFiles = {"adb.exe", "AdbWinApi.dll", "AdbWinUsbApi.dll", "fastboot.exe", "libwinpthread-1.dll"}; + private delegate void ExtractionCompletedHandler(); + + private static event ExtractionCompletedHandler ExtractionCompleted; + + private static bool CheckIfFilesExist => StrFiles?.All(File.Exists) == true; + public static void Start() { - if (CheckIfFilesExist()) return; + if (CheckIfFilesExist) return; var dialogResult = MessageBox.Show( @"Enviroment Variables not set and files missing. Should all dependencies be downloaded and extracted?", @@ -68,9 +74,27 @@ public static void Start() } } - private static bool CheckIfFilesExist() + private static void DependenciesChecker_ExtractionCompleted() { - return StrFiles != null && StrFiles.All(File.Exists); + var extractedFilesPath = Path.GetTempPath() + "platform-tools"; + + foreach (var item in StrFiles) + { + try + { + File.Copy(extractedFilesPath + "\\" + item, item); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } + } + + ExtractionCompleted -= DependenciesChecker_ExtractionCompleted; + + MessageBox.Show(@"Files downloaded, decompressed and moved successfully", @"Completed", + MessageBoxButtons.OK, + MessageBoxIcon.Information); } private static void DownloadFiles() @@ -79,20 +103,12 @@ private static void DownloadFiles() using (var wc = new WebClient()) { wc.DownloadFileCompleted += Wc_DownloadFileCompleted; - wc.DownloadFileTaskAsync( + _ = wc.DownloadFileTaskAsync( new Uri("https://dl.google.com/android/repository/platform-tools-latest-windows.zip"), DownloadToTempPath); } } - private static void Wc_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e) - { - var tr = new Thread(ExtractFiles); - tr.Start(); - } - - private static event ExtractionCompletedHandler ExtractionCompleted; - private static void ExtractFiles() { if (Directory.Exists(Path.GetTempPath() + "platform-tools")) @@ -103,27 +119,6 @@ private static void ExtractFiles() ExtractionCompleted?.Invoke(); } - private static void DependenciesChecker_ExtractionCompleted() - { - var extractedFilesPath = Path.GetTempPath() + "platform-tools"; - - foreach (var item in StrFiles) - try - { - File.Copy(extractedFilesPath + "\\" + item, item); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } - - ExtractionCompleted -= DependenciesChecker_ExtractionCompleted; - - MessageBox.Show(@"Files downloaded, decompressed and moved successfully", @"Completed", - MessageBoxButtons.OK, - MessageBoxIcon.Information); - } - - private delegate void ExtractionCompletedHandler(); + private static void Wc_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e) => new Thread(ExtractFiles).Start(); } } \ No newline at end of file diff --git a/adbGUI/Methods/CmdProcess.cs b/adbGUI/Methods/CmdProcess.cs index bdc85d2..859d0fa 100644 --- a/adbGUI/Methods/CmdProcess.cs +++ b/adbGUI/Methods/CmdProcess.cs @@ -12,12 +12,6 @@ namespace adbGUI.Methods { public class CmdProcess : IDisposable { - public delegate void ClearConsoleHandler(); - - public delegate void CommandExecutionStartedHandler(); - - public delegate void CommandExecutionStoppedHandler(); - // Thanks to Vitaliy Fedorchenko private const int CtrlCEvent = 0; @@ -26,6 +20,21 @@ public CmdProcess() GetProcess.EnableRaisingEvents = true; } + public delegate void ClearConsoleHandler(); + + public delegate void CommandExecutionStartedHandler(); + + public delegate void CommandExecutionStoppedHandler(); + + // Delegate type to be used as the Handler Routine for SCCH + private delegate bool ConsoleCtrlDelegate(uint ctrlType); + + public event ClearConsoleHandler ClearConsole; + + public event CommandExecutionStartedHandler CommandExecutionStarted; + + public event CommandExecutionStoppedHandler CommandExecutionStopped; + public Process GetProcess { get; } = new Process { StartInfo = new ProcessStartInfo @@ -43,37 +52,68 @@ public CmdProcess() } }; - public void Dispose() + public static string StartProcessingInThread(string command, string serialnumber) { - GetProcess?.Dispose(); - GC.SuppressFinalize(this); - } + if (command.StartsWith("adb")) + { + if (AdbDeviceWatcher.ConnectedAdbDevices> 0 || command.EndsWith("help") || + command.EndsWith("version") || command.StartsWith("adb connect") || + command.StartsWith("adb disconnect")) + { + string output = ""; - [DllImport("kernel32.dll")] - internal static extern bool GenerateConsoleCtrlEvent(uint dwCtrlEvent, uint dwProcessGroupId); + Thread t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) + { + IsBackground = true + }; - [DllImport("kernel32.dll", SetLastError = true)] - internal static extern bool AttachConsole(uint dwProcessId); + t.Start(); - [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)] - internal static extern bool FreeConsole(); + while (t.IsAlive) + { + Application.DoEvents(); + } - [DllImport("kernel32.dll")] - private static extern bool SetConsoleCtrlHandler(ConsoleCtrlDelegate handlerRoutine, bool add); + return output; + } + else + { + return null; + } + } - public event CommandExecutionStartedHandler CommandExecutionStarted; + { + string output = ""; - public event CommandExecutionStoppedHandler CommandExecutionStopped; + Thread t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) + { + IsBackground = true + }; - public event ClearConsoleHandler ClearConsole; + t.Start(); + + while (t.IsAlive) + { + Application.DoEvents(); + } + + return output; + } + } + + public void Dispose() + { + GetProcess?.Dispose(); + GC.SuppressFinalize(this); + } public void StartProcessing(string command, string serialnumber) { if (command.StartsWith("adb")) { - if (AdbDeviceWatcher.GetConnectedAdbDevices() > 0 || command.EndsWith("help") || - command.EndsWith("version") || command.StartsWith("adb connect") || - command.StartsWith("adb disconnect")) + if (AdbDeviceWatcher.ConnectedAdbDevices> 0 || command.EndsWith("help") + || command.EndsWith("version") || command.StartsWith("adb connect") + || command.StartsWith("adb disconnect")) { StopProcessing(); Thread.Sleep(50); @@ -101,11 +141,18 @@ public void StartProcessing(string command, string serialnumber) public bool StopProcessing() { - if (!AttachConsole((uint)GetProcess.Id)) return false; + if (!AttachConsole((uint)GetProcess.Id)) + { + return false; + } + SetConsoleCtrlHandler(null, true); try { - if (!GenerateConsoleCtrlEvent(CtrlCEvent, 0)) return false; + if (!GenerateConsoleCtrlEvent(CtrlCEvent, 0)) + { + return false; + } } finally { @@ -116,50 +163,68 @@ public bool StopProcessing() return true; } - public static string StartProcessingInThread(string command, string serialnumber) + [DllImport("kernel32.dll", SetLastError = true)] + internal static extern bool AttachConsole(uint dwProcessId); + + [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)] + internal static extern bool FreeConsole(); + + [DllImport("kernel32.dll")] + internal static extern bool GenerateConsoleCtrlEvent(uint dwCtrlEvent, uint dwProcessGroupId); + + private static string CommandParser(string command, string serialnumber) { - if (command.StartsWith("adb")) - if (AdbDeviceWatcher.GetConnectedAdbDevices() > 0 || command.EndsWith("help") || - command.EndsWith("version") || command.StartsWith("adb connect") || - command.StartsWith("adb disconnect")) - { - var output = ""; + if (command.StartsWith("adb ")) + { + command = command.Remove(0, 4); - var t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) - { - IsBackground = true - }; + if (command.Contains("shell")) + { + command = command.Remove(0, 5); + command = "exec-out" + command; + } - t.Start(); + if (command.StartsWith("logcat")) + { + command = "exec-out " + command; + } - while (t.IsAlive) Application.DoEvents(); + string serial = ""; - return output; + if (!string.IsNullOrEmpty(serialnumber)) + { + serial += "-s " + serialnumber + " "; } else { - return null; + serial = ""; } - { - var output = ""; + string fullcommand = "adb " + serial + command; - var t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) - { - IsBackground = true - }; + return fullcommand; + } - t.Start(); + if (!command.StartsWith("fastboot ")) + { + return command; + } + + { + command = command.Remove(0, 9); - while (t.IsAlive) Application.DoEvents(); + string fullcommand = "fastboot " + command; - return output; + return fullcommand; } } + [DllImport("kernel32.dll")] + private static extern bool SetConsoleCtrlHandler(ConsoleCtrlDelegate handlerRoutine, bool add); + private static string StartProcessingReadToEnd(string command, string serialnumber) { - var process2 = new Process + Process process2 = new Process { StartInfo = new ProcessStartInfo { @@ -177,44 +242,5 @@ private static string StartProcessingReadToEnd(string command, string serialnumb return process2.StandardOutput.ReadToEnd(); } - - private static string CommandParser(string command, string serialnumber) - { - if (command.StartsWith("adb ")) - { - command = command.Remove(0, 4); - - if (command.Contains("shell")) - { - command = command.Remove(0, 5); - command = "exec-out" + command; - } - - if (command.StartsWith("logcat")) command = "exec-out " + command; - - var serial = ""; - - if (!string.IsNullOrEmpty(serialnumber)) - serial += "-s " + serialnumber + " "; - else - serial = ""; - - var fullcommand = "adb " + serial + command; - - return fullcommand; - } - - if (!command.StartsWith("fastboot ")) return command; - { - command = command.Remove(0, 9); - - var fullcommand = "fastboot " + command; - - return fullcommand; - } - } - - // Delegate type to be used as the Handler Routine for SCCH - private delegate bool ConsoleCtrlDelegate(uint ctrlType); } } \ No newline at end of file From cbb4a21a23947b4ef875d9d7342f01e6f94293b1 Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Thu, 30 May 2019 14:30:14 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20adb=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=B5=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?= =?UTF-8?q?=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adbGUI/Forms/MainForm.cs | 64 +++++++++++------------------------ adbGUI/Methods/FormMethods.cs | 5 +-- 2 files changed, 20 insertions(+), 49 deletions(-) diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index ecd9099..d685df0 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -56,7 +56,7 @@ public MainForm() // Start the watcher which fires if adb devices changed AdbDeviceWatcher.DeviceChanged += DwAdb_DeviceChanged; AdbDeviceWatcher.StartDeviceWatcher(); - Text = "ADBGUI build at 29/05/2019"; + Text = "ADBGUI build at 30/05/2019"; } public new void Dispose() @@ -71,14 +71,11 @@ public MainForm() protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { if (keyData != Keys.Escape) return base.ProcessCmdKey(ref msg, keyData); - _cmdProcess.StopProcessing(); + _ = _cmdProcess.StopProcessing(); return true; } - private void CommandExecutionStarted() - { - BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); - } + private void CommandExecutionStarted() => BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); private void DwAdb_DeviceChanged(AdbDeviceList e) { @@ -96,10 +93,7 @@ private void DwAdb_DeviceChanged(AdbDeviceList e) } } - private void Btn_consoleStop_Click(object sender, EventArgs e) - { - _cmdProcess.StopProcessing(); - } + private void Btn_consoleStop_Click(object sender, EventArgs e) => _cmdProcess.StopProcessing(); private void Btn_executeCommand_Click(object sender, EventArgs e) { @@ -136,10 +130,7 @@ private void MainForm_Load(object sender, EventArgs e) trv_commandTreeView.SelectedNode = trv_commandTreeView.Nodes[0]; } - private void Rtb_console_Resize(object sender, EventArgs e) - { - rtb_console.ScrollToCaret(); - } + private void Rtb_console_Resize(object sender, EventArgs e) => rtb_console.ScrollToCaret(); private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) { @@ -150,8 +141,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) if (string.IsNullOrEmpty(tag = trv_commandTreeView.SelectedNode.Tag.ToString())) return; if (tag.StartsWith("adb ") || tag.StartsWith("fastboot ")) + { _cmdProcess.StartProcessing(tag, _formMethods.SelectedDevice()); + } else if (tag.StartsWith("#")) + { switch (tag) { case "#prop": @@ -297,6 +291,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) default: throw new ArgumentOutOfRangeException(); } + } } catch (Exception ex) { @@ -309,20 +304,7 @@ private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) if (e.KeyCode == Keys.Return) btn_executeCommand.PerformClick(); } - private void MainForm_FormClosed(object sender, FormClosedEventArgs e) - { - // Kill the process - // todo rename Forms - try - { - //adb.StopProcessing(); - _cmdProcess.GetProcess.Kill(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } - } + private void MainForm_FormClosed(object sender, FormClosedEventArgs e) => FormMethods.KillServer(); private void Tsb_OpenShell_Click(object sender, EventArgs e) { @@ -341,7 +323,7 @@ private void Tsb_OpenShell_Click(object sender, EventArgs e) } }) { - process.Start(); + _ = process.Start(); } } else @@ -358,31 +340,23 @@ private void Tsm_WirelessConnect_Click(object sender, EventArgs e) var ipadress = tst_IpAdress.Text; if (r.Match(ipadress).Success) + { _cmdProcess.StartProcessing("adb connect " + ipadress, ""); + } else + { MessageBox.Show(@"Please enter a valid IP adress", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Information); + } } - private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb disconnect", ""); - } + private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb disconnect", ""); - private void Tsb_KillServer_Click(object sender, EventArgs e) - { - FormMethods.KillServer(); - } + private void Tsb_KillServer_Click(object sender, EventArgs e) => FormMethods.KillServer(); - private void Tsb_AdbRoot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - } + private void Tsb_AdbRoot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - private void Tsb_AdbUnroot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); - } + private void Tsb_AdbUnroot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); private void Tsb_Power_Click(object sender, EventArgs e) { diff --git a/adbGUI/Methods/FormMethods.cs b/adbGUI/Methods/FormMethods.cs index 49224fc..0e38f2f 100644 --- a/adbGUI/Methods/FormMethods.cs +++ b/adbGUI/Methods/FormMethods.cs @@ -26,10 +26,7 @@ public void Dispose() GC.SuppressFinalize(this); } - public string SelectedDevice() - { - return _frm.tsc_ConnectedDevices.Items.Count == 0 ? "" : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); - } + public string SelectedDevice() => _frm.tsc_ConnectedDevices.Items.Count == 0 ? "" : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); public void RefreshAdbSerialsInCombobox(List devices) { From cc9a14ec9f16488d4de82b6d086cbb104779ef3c Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Thu, 30 May 2019 14:42:03 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adbGUI/Forms/MainForm.cs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index ecd9099..d316f02 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -311,17 +311,7 @@ private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) private void MainForm_FormClosed(object sender, FormClosedEventArgs e) { - // Kill the process - // todo rename Forms - try - { - //adb.StopProcessing(); - _cmdProcess.GetProcess.Kill(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } + FormMethods.KillServer(); } private void Tsb_OpenShell_Click(object sender, EventArgs e) From a9a1d4c9c011867bf740fecd4286c0caae703bb0 Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Fri, 31 May 2019 08:40:20 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adbGUI/Forms/InstallUninstall.cs | 34 ++++---- adbGUI/Forms/MainForm.cs | 133 ++++++++++++++++++------------- adbGUI/Forms/Sideload.cs | 16 ++-- adbGUI/Forms/SpoofMac.cs | 10 +-- adbGUI/Methods/CmdProcess.cs | 4 +- adbGUI/Methods/FormMethods.cs | 32 ++++---- 6 files changed, 125 insertions(+), 104 deletions(-) diff --git a/adbGUI/Forms/InstallUninstall.cs b/adbGUI/Forms/InstallUninstall.cs index a5dc56d..21d00ed 100644 --- a/adbGUI/Forms/InstallUninstall.cs +++ b/adbGUI/Forms/InstallUninstall.cs @@ -20,6 +20,17 @@ public InstallUninstall(CmdProcess adbFrm, FormMethods formMethodsFrm) _formMethods = formMethodsFrm; } + private void Btn_InstallUninstallBrowse_Click(object sender, EventArgs e) + { + openFileDialog.FileName = ""; + openFileDialog.CheckFileExists = true; + openFileDialog.CheckPathExists = true; + openFileDialog.Filter = @" .apk|*.apk"; + + if (openFileDialog.ShowDialog() == DialogResult.OK) + txt_InstallUninstallPackageInstall.Text = openFileDialog.FileName; + } + private void Btn_InstallUninstallInstall_Click(object sender, EventArgs e) { var s = "\"" + txt_InstallUninstallPackageInstall.Text + "\""; @@ -36,15 +47,13 @@ private void Btn_InstallUninstallInstall_Click(object sender, EventArgs e) } } - private void Btn_InstallUninstallBrowse_Click(object sender, EventArgs e) + private void Btn_InstallUninstallRefreshApps_Click(object sender, EventArgs e) { - openFileDialog.FileName = ""; - openFileDialog.CheckFileExists = true; - openFileDialog.CheckPathExists = true; - openFileDialog.Filter = @" .apk|*.apk"; - - if (openFileDialog.ShowDialog() == DialogResult.OK) - txt_InstallUninstallPackageInstall.Text = openFileDialog.FileName; + groupBox1.Enabled = false; + groupBox3.Enabled = false; + RefreshInstalledApps(); + groupBox1.Enabled = true; + groupBox3.Enabled = true; } private void Btn_InstallUninstallUninstall_Click(object sender, EventArgs e) @@ -56,15 +65,6 @@ private void Btn_InstallUninstallUninstall_Click(object sender, EventArgs e) RefreshInstalledApps(); } - private void Btn_InstallUninstallRefreshApps_Click(object sender, EventArgs e) - { - groupBox1.Enabled = false; - groupBox3.Enabled = false; - RefreshInstalledApps(); - groupBox1.Enabled = true; - groupBox3.Enabled = true; - } - private void RefreshInstalledApps() { cbx_InstallUninstallPackageUninstall.Items.Clear(); diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index d316f02..e618e00 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -56,7 +56,7 @@ public MainForm() // Start the watcher which fires if adb devices changed AdbDeviceWatcher.DeviceChanged += DwAdb_DeviceChanged; AdbDeviceWatcher.StartDeviceWatcher(); - Text = "ADBGUI build at 29/05/2019"; + Text = "ADBGUI build at 31/05/2019"; } public new void Dispose() @@ -70,25 +70,21 @@ public MainForm() protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { - if (keyData != Keys.Escape) return base.ProcessCmdKey(ref msg, keyData); + if (keyData != Keys.Escape) + { + return base.ProcessCmdKey(ref msg, keyData); + } + _cmdProcess.StopProcessing(); return true; } - private void CommandExecutionStarted() - { - BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); - } - - private void DwAdb_DeviceChanged(AdbDeviceList e) + private void AppendReceivedData(object sender, DataReceivedEventArgs e) { try { - BeginInvoke((MethodInvoker)delegate - { - _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); - txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); - }); + BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); + Thread.Sleep(2); } catch (Exception ex) { @@ -103,7 +99,7 @@ private void Btn_consoleStop_Click(object sender, EventArgs e) private void Btn_executeCommand_Click(object sender, EventArgs e) { - var command = cbx_customCommand.Text; + string command = cbx_customCommand.Text; if (!string.IsNullOrEmpty(command)) { @@ -117,12 +113,28 @@ private void Btn_executeCommand_Click(object sender, EventArgs e) } } - private void AppendReceivedData(object sender, DataReceivedEventArgs e) + private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Return) + { + btn_executeCommand.PerformClick(); + } + } + + private void CommandExecutionStarted() + { + BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); + } + + private void DwAdb_DeviceChanged(AdbDeviceList e) { try { - BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); - Thread.Sleep(2); + BeginInvoke((MethodInvoker)delegate + { + _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); + txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); + }); } catch (Exception ex) { @@ -130,6 +142,11 @@ private void AppendReceivedData(object sender, DataReceivedEventArgs e) } } + private void MainForm_FormClosed(object sender, FormClosedEventArgs e) + { + FormMethods.KillServer(); + } + private void MainForm_Load(object sender, EventArgs e) { trv_commandTreeView.ExpandAll(); @@ -148,10 +165,17 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) { string tag; - if (string.IsNullOrEmpty(tag = trv_commandTreeView.SelectedNode.Tag.ToString())) return; + if (string.IsNullOrEmpty(tag = trv_commandTreeView.SelectedNode.Tag.ToString())) + { + return; + } + if (tag.StartsWith("adb ") || tag.StartsWith("fastboot ")) + { _cmdProcess.StartProcessing(tag, _formMethods.SelectedDevice()); + } else if (tag.StartsWith("#")) + { switch (tag) { case "#prop": @@ -166,9 +190,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) .Replace(' ', '_').Replace(':', '.'); saveFileDialog.Filter = @"PNG Image(.png)|*.png"; if (saveFileDialog.ShowDialog() == DialogResult.OK) + { _cmdProcess.StartProcessing( "adb shell screencap -p > " + saveFileDialog.FileName, _formMethods.SelectedDevice()); + } } break; @@ -297,6 +323,7 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) default: throw new ArgumentOutOfRangeException(); } + } } catch (Exception ex) { @@ -304,12 +331,17 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) } } - private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) + private void Tsb_AdbRoot_Click(object sender, EventArgs e) { - if (e.KeyCode == Keys.Return) btn_executeCommand.PerformClick(); + _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); } - private void MainForm_FormClosed(object sender, FormClosedEventArgs e) + private void Tsb_AdbUnroot_Click(object sender, EventArgs e) + { + _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); + } + + private void Tsb_KillServer_Click(object sender, EventArgs e) { FormMethods.KillServer(); } @@ -318,11 +350,11 @@ private void Tsb_OpenShell_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(_formMethods.SelectedDevice())) { - var serial = ""; + string serial = ""; serial += "-s " + _formMethods.SelectedDevice() + " "; - using (var process = new Process + using (Process process = new Process { StartInfo = new ProcessStartInfo { @@ -341,39 +373,6 @@ private void Tsb_OpenShell_Click(object sender, EventArgs e) } } - private void Tsm_WirelessConnect_Click(object sender, EventArgs e) - { - var r = new Regex(@"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$"); - - var ipadress = tst_IpAdress.Text; - - if (r.Match(ipadress).Success) - _cmdProcess.StartProcessing("adb connect " + ipadress, ""); - else - MessageBox.Show(@"Please enter a valid IP adress", @"Error", MessageBoxButtons.OK, - MessageBoxIcon.Information); - } - - private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb disconnect", ""); - } - - private void Tsb_KillServer_Click(object sender, EventArgs e) - { - FormMethods.KillServer(); - } - - private void Tsb_AdbRoot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - } - - private void Tsb_AdbUnroot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); - } - private void Tsb_Power_Click(object sender, EventArgs e) { switch (sender.ToString()) @@ -410,5 +409,27 @@ private void Tsb_Power_Click(object sender, EventArgs e) throw new ArgumentOutOfRangeException(); } } + + private void Tsm_WirelessConnect_Click(object sender, EventArgs e) + { + Regex r = new Regex(@"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$"); + + string ipadress = tst_IpAdress.Text; + + if (r.Match(ipadress).Success) + { + _cmdProcess.StartProcessing("adb connect " + ipadress, ""); + } + else + { + MessageBox.Show(@"Please enter a valid IP adress", @"Error", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + } + + private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) + { + _cmdProcess.StartProcessing("adb disconnect", ""); + } } } \ No newline at end of file diff --git a/adbGUI/Forms/Sideload.cs b/adbGUI/Forms/Sideload.cs index 36b50bc..e6c6556 100644 --- a/adbGUI/Forms/Sideload.cs +++ b/adbGUI/Forms/Sideload.cs @@ -20,6 +20,14 @@ public Sideload(CmdProcess adbFrm, FormMethods formMethodsFrm) _formMethods = formMethodsFrm; } + private void Btn_SideloadBrowse_Click(object sender, EventArgs e) + { + openFileDialog.FileName = ""; + openFileDialog.Filter = @" .zip|*.zip"; + + if (openFileDialog.ShowDialog() == DialogResult.OK) txt_SideloadPath.Text = openFileDialog.FileName; + } + private void Btn_SideloadStart_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(txt_SideloadPath.Text)) @@ -32,13 +40,5 @@ private void Btn_SideloadStart_Click(object sender, EventArgs e) MessageBox.Show(@"Please select a file!", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - private void Btn_SideloadBrowse_Click(object sender, EventArgs e) - { - openFileDialog.FileName = ""; - openFileDialog.Filter = @" .zip|*.zip"; - - if (openFileDialog.ShowDialog() == DialogResult.OK) txt_SideloadPath.Text = openFileDialog.FileName; - } } } \ No newline at end of file diff --git a/adbGUI/Forms/SpoofMac.cs b/adbGUI/Forms/SpoofMac.cs index 643731e..ca0c1c1 100644 --- a/adbGUI/Forms/SpoofMac.cs +++ b/adbGUI/Forms/SpoofMac.cs @@ -27,6 +27,11 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) return true; } + private void Btn_SpoofMacReset_Click(object sender, EventArgs e) + { + _adb.StartProcessing("adb shell su root ifconfig wlan0 down", _formMethods.SelectedDevice()); + } + private void Btn_SpoofMacSet_Click(object sender, EventArgs e) { var s = txt_SpoofMacAdress.Text; @@ -39,11 +44,6 @@ private void Btn_SpoofMacSet_Click(object sender, EventArgs e) MessageBox.Show(@"Please enter a valid MAC address", @"Error"); } - private void Btn_SpoofMacReset_Click(object sender, EventArgs e) - { - _adb.StartProcessing("adb shell su root ifconfig wlan0 down", _formMethods.SelectedDevice()); - } - private void Btn_SpoofMacShow_Click(object sender, EventArgs e) { _adb.StartProcessing("adb shell su root cat /sys/class/net/wlan0/address", _formMethods.SelectedDevice()); diff --git a/adbGUI/Methods/CmdProcess.cs b/adbGUI/Methods/CmdProcess.cs index 859d0fa..aaffb45 100644 --- a/adbGUI/Methods/CmdProcess.cs +++ b/adbGUI/Methods/CmdProcess.cs @@ -56,7 +56,7 @@ public static string StartProcessingInThread(string command, string serialnumber { if (command.StartsWith("adb")) { - if (AdbDeviceWatcher.ConnectedAdbDevices> 0 || command.EndsWith("help") || + if (AdbDeviceWatcher.ConnectedAdbDevices > 0 || command.EndsWith("help") || command.EndsWith("version") || command.StartsWith("adb connect") || command.StartsWith("adb disconnect")) { @@ -111,7 +111,7 @@ public void StartProcessing(string command, string serialnumber) { if (command.StartsWith("adb")) { - if (AdbDeviceWatcher.ConnectedAdbDevices> 0 || command.EndsWith("help") + if (AdbDeviceWatcher.ConnectedAdbDevices > 0 || command.EndsWith("help") || command.EndsWith("version") || command.StartsWith("adb connect") || command.StartsWith("adb disconnect")) { diff --git a/adbGUI/Methods/FormMethods.cs b/adbGUI/Methods/FormMethods.cs index 0e38f2f..a13d393 100644 --- a/adbGUI/Methods/FormMethods.cs +++ b/adbGUI/Methods/FormMethods.cs @@ -20,21 +20,9 @@ public FormMethods(MainForm f) _frm = f; } - public void Dispose() - { - _adb?.Dispose(); - GC.SuppressFinalize(this); - } - - public string SelectedDevice() => _frm.tsc_ConnectedDevices.Items.Count == 0 ? "" : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); - - public void RefreshAdbSerialsInCombobox(List devices) + public static bool AlwaysClearConsole() { - _frm.tsc_ConnectedDevices.Items.Clear(); - - foreach (var item in devices) _frm.tsc_ConnectedDevices.Items.Add(item); - - _frm.tsc_ConnectedDevices.SelectedIndex = _frm.tsc_ConnectedDevices.Items.Count - 1; + return true; } public static void KillServer() @@ -49,9 +37,21 @@ public static void KillServer() } } - public static bool AlwaysClearConsole() + public void Dispose() { - return true; + _adb?.Dispose(); + GC.SuppressFinalize(this); + } + + public void RefreshAdbSerialsInCombobox(List devices) + { + _frm.tsc_ConnectedDevices.Items.Clear(); + + foreach (var item in devices) _frm.tsc_ConnectedDevices.Items.Add(item); + + _frm.tsc_ConnectedDevices.SelectedIndex = _frm.tsc_ConnectedDevices.Items.Count - 1; } + + public string SelectedDevice() => _frm.tsc_ConnectedDevices.Items.Count == 0 ? "" : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); } } \ No newline at end of file From 02b11b8091d02af4888435d716073e9f7cf76ad7 Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Sun, 2 Jun 2019 11:33:20 +0300 Subject: [PATCH 6/7] Clean up. --- adbGUI/Forms/MainForm.cs | 50 +++++-------------- adbGUI/Methods/AdbDeviceWatcher.cs | 2 +- .../Methods/CheckAndDownloadDependencies.cs | 22 ++++---- adbGUI/Methods/CmdProcess.cs | 2 +- adbGUI/Methods/FormMethods.cs | 4 +- 5 files changed, 30 insertions(+), 50 deletions(-) diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index e618e00..c2504cf 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -32,7 +32,7 @@ public MainForm() // pass formMethods the created Form this _formMethods = new FormMethods(this); - _cmdProcess.GetProcess.Start(); + _ = _cmdProcess.GetProcess.Start(); // Begin and cancel so the RichTextBox will stay clean. Otherwise it will start in line 2. _cmdProcess.GetProcess.BeginOutputReadLine(); @@ -75,7 +75,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) return base.ProcessCmdKey(ref msg, keyData); } - _cmdProcess.StopProcessing(); + _ = _cmdProcess.StopProcessing(); return true; } @@ -83,7 +83,7 @@ private void AppendReceivedData(object sender, DataReceivedEventArgs e) { try { - BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); + _ = BeginInvoke((MethodInvoker)delegate { rtb_console.AppendText(e.Data + Environment.NewLine); }); Thread.Sleep(2); } catch (Exception ex) @@ -92,10 +92,7 @@ private void AppendReceivedData(object sender, DataReceivedEventArgs e) } } - private void Btn_consoleStop_Click(object sender, EventArgs e) - { - _cmdProcess.StopProcessing(); - } + private void Btn_consoleStop_Click(object sender, EventArgs e) => _ = _cmdProcess.StopProcessing(); private void Btn_executeCommand_Click(object sender, EventArgs e) { @@ -103,7 +100,7 @@ private void Btn_executeCommand_Click(object sender, EventArgs e) if (!string.IsNullOrEmpty(command)) { - cbx_customCommand.Items.Add(command); + _ = cbx_customCommand.Items.Add(command); _cmdProcess.StartProcessing(command, _formMethods.SelectedDevice()); } @@ -121,10 +118,7 @@ private void Cbx_customCommand_KeyDown(object sender, KeyEventArgs e) } } - private void CommandExecutionStarted() - { - BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); - } + private void CommandExecutionStarted() => _ = BeginInvoke((MethodInvoker)delegate { rtb_console.Clear(); }); private void DwAdb_DeviceChanged(AdbDeviceList e) { @@ -142,10 +136,7 @@ private void DwAdb_DeviceChanged(AdbDeviceList e) } } - private void MainForm_FormClosed(object sender, FormClosedEventArgs e) - { - FormMethods.KillServer(); - } + private void MainForm_FormClosed(object sender, FormClosedEventArgs e) => FormMethods.KillServer(); private void MainForm_Load(object sender, EventArgs e) { @@ -153,10 +144,7 @@ private void MainForm_Load(object sender, EventArgs e) trv_commandTreeView.SelectedNode = trv_commandTreeView.Nodes[0]; } - private void Rtb_console_Resize(object sender, EventArgs e) - { - rtb_console.ScrollToCaret(); - } + private void Rtb_console_Resize(object sender, EventArgs e) => rtb_console.ScrollToCaret(); private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) { @@ -331,20 +319,11 @@ private void Trv_commandTreeView_DoubleClick(object sender, EventArgs e) } } - private void Tsb_AdbRoot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - } + private void Tsb_AdbRoot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb root", _formMethods.SelectedDevice()); - private void Tsb_AdbUnroot_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); - } + private void Tsb_AdbUnroot_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb unroot", _formMethods.SelectedDevice()); - private void Tsb_KillServer_Click(object sender, EventArgs e) - { - FormMethods.KillServer(); - } + private void Tsb_KillServer_Click(object sender, EventArgs e) => FormMethods.KillServer(); private void Tsb_OpenShell_Click(object sender, EventArgs e) { @@ -363,7 +342,7 @@ private void Tsb_OpenShell_Click(object sender, EventArgs e) } }) { - process.Start(); + _ = process.Start(); } } else @@ -427,9 +406,6 @@ private void Tsm_WirelessConnect_Click(object sender, EventArgs e) } } - private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) - { - _cmdProcess.StartProcessing("adb disconnect", ""); - } + private void Tsm_WirelessDisconnect_Click(object sender, EventArgs e) => _cmdProcess.StartProcessing("adb disconnect", ""); } } \ No newline at end of file diff --git a/adbGUI/Methods/AdbDeviceWatcher.cs b/adbGUI/Methods/AdbDeviceWatcher.cs index 790adb7..045ed20 100644 --- a/adbGUI/Methods/AdbDeviceWatcher.cs +++ b/adbGUI/Methods/AdbDeviceWatcher.cs @@ -75,7 +75,7 @@ private static string StartProcessingGetDevices(string command) } }) { - process2.Start(); + _ = process2.Start(); return process2.StandardOutput.ReadToEnd(); } diff --git a/adbGUI/Methods/CheckAndDownloadDependencies.cs b/adbGUI/Methods/CheckAndDownloadDependencies.cs index fb71750..16b2367 100644 --- a/adbGUI/Methods/CheckAndDownloadDependencies.cs +++ b/adbGUI/Methods/CheckAndDownloadDependencies.cs @@ -70,23 +70,25 @@ public static void Start() break; default: - throw new ArgumentOutOfRangeException(); + throw new ArgumentOutOfRangeException("Err"); } } private static void DependenciesChecker_ExtractionCompleted() { - var extractedFilesPath = Path.GetTempPath() + "platform-tools"; - - foreach (var item in StrFiles) + string extractedFilesPath = Path.GetTempPath() + "platform-tools"; + if (extractedFilesPath != null) { - try - { - File.Copy(extractedFilesPath + "\\" + item, item); - } - catch (Exception ex) + foreach (var item in StrFiles) { - MessageBox.Show(ex.Message); + try + { + File.Copy(extractedFilesPath + "\\" + item, item); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } } } diff --git a/adbGUI/Methods/CmdProcess.cs b/adbGUI/Methods/CmdProcess.cs index aaffb45..4b2d93d 100644 --- a/adbGUI/Methods/CmdProcess.cs +++ b/adbGUI/Methods/CmdProcess.cs @@ -238,7 +238,7 @@ private static string StartProcessingReadToEnd(string command, string serialnumb } }; - process2.Start(); + _ = process2.Start(); return process2.StandardOutput.ReadToEnd(); } diff --git a/adbGUI/Methods/FormMethods.cs b/adbGUI/Methods/FormMethods.cs index a13d393..3db4a1e 100644 --- a/adbGUI/Methods/FormMethods.cs +++ b/adbGUI/Methods/FormMethods.cs @@ -52,6 +52,8 @@ public void RefreshAdbSerialsInCombobox(List devices) _frm.tsc_ConnectedDevices.SelectedIndex = _frm.tsc_ConnectedDevices.Items.Count - 1; } - public string SelectedDevice() => _frm.tsc_ConnectedDevices.Items.Count == 0 ? "" : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); + public string SelectedDevice() => _frm.tsc_ConnectedDevices.Items.Count == 0 + ? string.Empty + : _frm.tsc_ConnectedDevices.SelectedItem.ToString(); } } \ No newline at end of file From 28e1712f7705cc3d99677b8d3fea174ae23246ec Mon Sep 17 00:00:00 2001 From: Nikita Sverenkov Date: Tue, 4 Jun 2019 10:22:23 +0300 Subject: [PATCH 7/7] Clean up --- adbGUI/Forms/LogcatAdvanced.cs | 8 ++++---- adbGUI/Forms/MainForm.cs | 12 ++++++------ adbGUI/Methods/AdbDeviceWatcher.cs | 11 +++-------- adbGUI/Methods/CmdProcess.cs | 23 +++++------------------ 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/adbGUI/Forms/LogcatAdvanced.cs b/adbGUI/Forms/LogcatAdvanced.cs index aafa2bc..3cab49a 100644 --- a/adbGUI/Forms/LogcatAdvanced.cs +++ b/adbGUI/Forms/LogcatAdvanced.cs @@ -42,10 +42,10 @@ public LogcatAdvanced(CmdProcess adbFrm, FormMethods formMethodsFrm) private void AltAdb_CommandExecutionStarted() { - BeginInvoke((MethodInvoker)delegate - { - if (FormMethods.AlwaysClearConsole()) _lOut.rtb_console.Clear(); - }); + _ = BeginInvoke((MethodInvoker)delegate + { + if (FormMethods.AlwaysClearConsole()) _lOut.rtb_console.Clear(); + }); } private void Btn_LogcatAdvancedClearBuffers_Click(object sender, EventArgs e) diff --git a/adbGUI/Forms/MainForm.cs b/adbGUI/Forms/MainForm.cs index c2504cf..8a4b8d6 100644 --- a/adbGUI/Forms/MainForm.cs +++ b/adbGUI/Forms/MainForm.cs @@ -56,7 +56,7 @@ public MainForm() // Start the watcher which fires if adb devices changed AdbDeviceWatcher.DeviceChanged += DwAdb_DeviceChanged; AdbDeviceWatcher.StartDeviceWatcher(); - Text = "ADBGUI build at 31/05/2019"; + Text = "ADBGUI build at 03/06/2019"; } public new void Dispose() @@ -124,11 +124,11 @@ private void DwAdb_DeviceChanged(AdbDeviceList e) { try { - BeginInvoke((MethodInvoker)delegate - { - _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); - txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); - }); + _ = BeginInvoke((MethodInvoker)delegate + { + _formMethods.RefreshAdbSerialsInCombobox(e.GetDevicesList); + txt_DevicesAdb.Text = e.GetDevicesRaw.ToUpper().TrimEnd(); + }); } catch (Exception ex) { diff --git a/adbGUI/Methods/AdbDeviceWatcher.cs b/adbGUI/Methods/AdbDeviceWatcher.cs index 045ed20..014e69a 100644 --- a/adbGUI/Methods/AdbDeviceWatcher.cs +++ b/adbGUI/Methods/AdbDeviceWatcher.cs @@ -10,8 +10,6 @@ namespace adbGUI.Methods public static class AdbDeviceWatcher { - private static int _connectedDevices; - private static string _devicesRawNew; private static string _devicesRawOld; @@ -22,14 +20,11 @@ public static class AdbDeviceWatcher public static event DeviceChangedHandler DeviceChanged; - public static int ConnectedAdbDevices => _connectedDevices; + public static int ConnectedAdbDevices { get; private set; } public static void StartDeviceWatcher() { - _tr = new Thread(Watcher) - { - IsBackground = true - }; + _tr = new Thread(Watcher) { IsBackground = true }; _tr.Start(); } @@ -99,7 +94,7 @@ private static void Watcher() GetDevicesList = ParseDevicesL(_devicesRawNew) }; - _connectedDevices = dl.GetDevicesList.Count; + ConnectedAdbDevices = dl.GetDevicesList.Count; DeviceChanged?.Invoke(dl); } diff --git a/adbGUI/Methods/CmdProcess.cs b/adbGUI/Methods/CmdProcess.cs index 4b2d93d..8031899 100644 --- a/adbGUI/Methods/CmdProcess.cs +++ b/adbGUI/Methods/CmdProcess.cs @@ -15,10 +15,7 @@ public class CmdProcess : IDisposable // Thanks to Vitaliy Fedorchenko private const int CtrlCEvent = 0; - public CmdProcess() - { - GetProcess.EnableRaisingEvents = true; - } + public CmdProcess() => GetProcess.EnableRaisingEvents = true; public delegate void ClearConsoleHandler(); @@ -62,10 +59,7 @@ public static string StartProcessingInThread(string command, string serialnumber { string output = ""; - Thread t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) - { - IsBackground = true - }; + Thread t = new Thread(() => output = StartProcessingReadToEnd(command, serialnumber)) { IsBackground = true }; t.Start(); @@ -85,10 +79,7 @@ public static string StartProcessingInThread(string command, string serialnumber { string output = ""; - Thread t = new Thread(() => { output = StartProcessingReadToEnd(command, serialnumber); }) - { - IsBackground = true - }; + Thread t = new Thread(() => output = StartProcessingReadToEnd(command, serialnumber)) { IsBackground = true }; t.Start(); @@ -200,9 +191,7 @@ private static string CommandParser(string command, string serialnumber) serial = ""; } - string fullcommand = "adb " + serial + command; - - return fullcommand; + return "adb " + serial + command; } if (!command.StartsWith("fastboot ")) @@ -213,9 +202,7 @@ private static string CommandParser(string command, string serialnumber) { command = command.Remove(0, 9); - string fullcommand = "fastboot " + command; - - return fullcommand; + return "fastboot " + command; } }