GitHub/APKToolGUI
1
0
Fork 0
mirror of https://github.com/AndnixSH/APKToolGUI.git synced 2026-06-03 11:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve aapt logic, and logs

Browse Source 
Fix freezing when parsing APK
Don't print timer when not necessary
This commit is contained in:
q3b5q3
2023-02-15 21:45:59 +01:00
parent 8671f87a1a
commit 4408a0d06d
8 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
APKToolGUI/ApkTool/AaptParser.cs
+2
View File
@@ -139,6 +139,8 @@ namespace APKToolGUI.Utils
result = true;
}
else
result = false;
return result;
}
APKToolGUI/Forms/FormMain.cs
+27 -15
View File
@@ -195,7 +195,7 @@ namespace APKToolGUI
ToLog(ApktoolEventType.Error, Language.ErrorZipalign);
});
Done();
Done(printTimer: true);
break;
case "baksmali":
if (await Baksmali(file) == 0)
@@ -227,17 +227,19 @@ namespace APKToolGUI
{
if (File.Exists(file))
{
ToLog(ApktoolEventType.None, Language.ParsingApkInfo);
ToStatus(Language.ParsingApkInfo, Resources.waiting);
try
{
bool result = false;
bool parsed = false;
await Task.Factory.StartNew(() =>
{
aapt = new AaptParser();
result = aapt.Parse(file);
parsed = aapt.Parse(file);
});
if (aapt.Parse(file))
if (parsed)
{
if (apkIconPicBox.Image != null)
{
@@ -261,7 +263,10 @@ namespace APKToolGUI
if (aapt.AppIcon != null)
{
ZipUtils.ExtractFile(file, aapt.AppIcon, Path.Combine(Program.TEMP_PATH, aapt.PackageName));
await Task.Factory.StartNew(() =>
{
ZipUtils.ExtractFile(file, aapt.AppIcon, Path.Combine(Program.TEMP_PATH, aapt.PackageName));
});
string icon = Path.Combine(Program.TEMP_PATH, aapt.PackageName, Path.GetFileName(aapt.AppIcon));
if (File.Exists(icon))
{
@@ -278,6 +283,9 @@ namespace APKToolGUI
ToLog(ApktoolEventType.Warning, Language.ErrorGettingApkInfo);
#endif
}
ToLog(ApktoolEventType.Done, Language.Done);
Done();
}
}
#endregion
@@ -392,14 +400,18 @@ namespace APKToolGUI
}));
}
internal void Done()
internal void Done(bool printTimer = false)
{
isRunning = false;
stopwatch.Stop();
TimeSpan ts = stopwatch.Elapsed;
ToLog(ApktoolEventType.None, "Time started: " + lastStartedDate);
ToLog(ApktoolEventType.None, "Time elapsed: " + ts.ToString("mm\\:ss"));
if (printTimer)
{
ToLog(ApktoolEventType.None, "Time started: " + lastStartedDate);
ToLog(ApktoolEventType.None, "Time elapsed: " + ts.ToString("mm\\:ss"));
}
if (Settings.Default.PlaySoundWhenDone)
SystemSounds.Beep.Play();
@@ -532,7 +544,7 @@ namespace APKToolGUI
ToLog(ApktoolEventType.Error, ex.ToString());
}
Done();
Done(printTimer: true);
return code;
}
@@ -603,7 +615,7 @@ namespace APKToolGUI
if (zipalign.Align(outputFile, outputFile) != 0)
{
ToLog(ApktoolEventType.Error, Language.ErrorZipalign);
Done();
Done(printTimer: true);
return;
}
else
@@ -645,7 +657,7 @@ namespace APKToolGUI
else
{
ToLog(ApktoolEventType.Error, Language.ErrorSigning);
Done();
Done(printTimer: true);
return;
}
}
@@ -667,7 +679,7 @@ namespace APKToolGUI
code = 1;
ToLog(ApktoolEventType.Error, ex.Message);
}
Done();
Done(printTimer: true);
return code;
}
@@ -720,7 +732,7 @@ namespace APKToolGUI
else
ToLog(ApktoolEventType.Error, Language.ErrorDecompiling);
});
Done();
Done(printTimer: true);
}
catch (Exception ex)
{
@@ -772,7 +784,7 @@ namespace APKToolGUI
else
ToLog(ApktoolEventType.Error, Language.ErrorCompiling);
});
Done();
Done(printTimer: true);
}
catch (Exception ex)
{
APKToolGUI/Handlers/DragDropHandlers.cs
+2 -2
View File
@@ -124,7 +124,7 @@ namespace APKToolGUI.Handlers
{
main.ToLog(ApktoolEventType.Error, ex.Message);
}
main.Done();
main.Done(printTimer: true);
}
}
@@ -170,7 +170,7 @@ namespace APKToolGUI.Handlers
{
main.ToLog(ApktoolEventType.Error, ex.Message);
}
main.Done();
main.Done(printTimer: true);
}
}
APKToolGUI/Handlers/FrameworkControlEventHandlers.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace APKToolGUI.Handlers
else
main.ToLog(ApktoolEventType.Error, Language.FrameworkInstallationNotStarted);
});
main.Done();
main.Done(printTimer: true);
}
internal async void clearFwBtn_Click(object sender, EventArgs e)
APKToolGUI/Handlers/SignControlEventHandlers.cs
+1 -1
View File
@@ -149,7 +149,7 @@ namespace APKToolGUI.Handlers
{
main.ToLog(ApktoolEventType.Error, ex.Message);
}
main.Done();
main.Done(printTimer: true);
}
internal void selectKeyStoreFileBtn_Click(object sender, EventArgs e)
APKToolGUI/Handlers/ZipalignControlEventHandlers.cs
+1 -1
View File
@@ -108,7 +108,7 @@ namespace APKToolGUI.Handlers
{
main.ToLog(ApktoolEventType.Error, ex.Message);
}
main.Done();
main.Done(printTimer: true);
}
internal void alignApkOpenDirBtn_Click(object sender, EventArgs e)
APKToolGUI/Languages/Language.Designer.cs
Generated
+9
View File
@@ -780,6 +780,15 @@ namespace APKToolGUI.Languages {
}
}
/// <summary>
/// Looks up a localized string similar to Parsing APK Info....
/// </summary>
internal static string ParsingApkInfo {
get {
return ResourceManager.GetString("ParsingApkInfo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Removed all ApkTool dummies.
/// </summary>
APKToolGUI/Languages/Language.resx
+3
View File
@@ -426,4 +426,7 @@
<data name="MoveTempApkToOutput" xml:space="preserve">
<value>Move temp apk "{0}" to output directory "{1}"</value>
</data>
<data name="ParsingApkInfo" xml:space="preserve">
<value>Parsing APK Info...</value>
</data>
</root>