From 480edd3e59cd629428c9ece7a8f72c90cb0cbce7 Mon Sep 17 00:00:00 2001 From: q3b5q3 <40742924+AndnixSH@users.noreply.github.com> Date: Mon, 17 Oct 2022 22:13:28 +0200 Subject: [PATCH] Add input file/directory to log --- APKToolGUI/Forms/FormMain.cs | 8 +++++++- APKToolGUI/Languages/Language.Designer.cs | 20 +++++++++++++++++++- APKToolGUI/Languages/Language.resx | 6 ++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs index 601ae3f..3f562b4 100644 --- a/APKToolGUI/Forms/FormMain.cs +++ b/APKToolGUI/Forms/FormMain.cs @@ -468,6 +468,7 @@ namespace APKToolGUI Invoke(new Action(delegate () { ToLog(ApktoolEventType.Information, "=====[ " + Language.Signing + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputFile, input)); ToStatus(String.Format(Language.Signing + " \"{0}\"...", Path.GetFileName(input)), Resources.waiting); })); @@ -516,6 +517,7 @@ namespace APKToolGUI Invoke(new Action(delegate () { ToLog(ApktoolEventType.Information, "=====[ " + Language.Decoding + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputFile, inputApk)); ToStatus(String.Format(Language.Decoding + " \"{0}\"...", Path.GetFileName(inputApk)), Resources.waiting); })); @@ -577,6 +579,7 @@ namespace APKToolGUI Running(); ToLog(ApktoolEventType.Information, "=====[ " + Language.Build + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputFile, inputFile)); ToStatus(String.Format(Language.Build + " \"{0}\"...", Path.GetFileName(textBox_BUILD_InputProjectDir.Text)), Resources.waiting); try @@ -669,7 +672,6 @@ namespace APKToolGUI ToLog(ApktoolEventType.Information, e.Message); } - internal async Task Baksmali(string inputFile) { int code = 0; @@ -677,6 +679,8 @@ namespace APKToolGUI { Running(); ToLog(ApktoolEventType.Information, "=====[ " + Language.DecompilingDex + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputFile, inputFile)); + ToStatus(String.Format(Language.DecompilingDex + "...", Path.GetFileName(baksmaliBrowseInputDexTxtBox.Text)), Resources.waiting); await Task.Factory.StartNew(() => @@ -734,6 +738,7 @@ namespace APKToolGUI { Running(); ToLog(ApktoolEventType.Information, "=====[ " + Language.CompilingDex + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputDirectory, inputDir)); ToStatus(String.Format(Language.DecompilingDex + "...", Path.GetFileName(smaliBrowseInputDirTxtBox.Text)), Resources.waiting); await Task.Factory.StartNew(() => @@ -783,6 +788,7 @@ namespace APKToolGUI Invoke(new Action(delegate () { ToLog(ApktoolEventType.Information, "=====[ " + Language.Aligning + " ]====="); + ToLog(ApktoolEventType.Information, String.Format(Language.InputFile, input)); ToStatus(String.Format(Language.Aligning + " \"{0}\"...", Path.GetFileName(input)), Resources.waiting); })); diff --git a/APKToolGUI/Languages/Language.Designer.cs b/APKToolGUI/Languages/Language.Designer.cs index b818463..df3693e 100644 --- a/APKToolGUI/Languages/Language.Designer.cs +++ b/APKToolGUI/Languages/Language.Designer.cs @@ -19,7 +19,7 @@ namespace APKToolGUI.Languages { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Language { @@ -645,6 +645,24 @@ namespace APKToolGUI.Languages { } } + /// + /// Looks up a localized string similar to Input directory: {0}. + /// + internal static string InputDirectory { + get { + return ResourceManager.GetString("InputDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Input file: {0}. + /// + internal static string InputFile { + get { + return ResourceManager.GetString("InputFile", resourceCulture); + } + } + /// /// Looks up a localized string similar to Install framework. /// diff --git a/APKToolGUI/Languages/Language.resx b/APKToolGUI/Languages/Language.resx index 88d7b67..cda53da 100644 --- a/APKToolGUI/Languages/Language.resx +++ b/APKToolGUI/Languages/Language.resx @@ -405,4 +405,10 @@ There was an error getting APK infomation + + Input directory: {0} + + + Input file: {0} + \ No newline at end of file