diff --git a/.gitignore b/.gitignore
index e760dcb..7f681e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
.idea
Phunk/obj
Phunk.Updater/obj
-Phunk/bin
\ No newline at end of file
+Phunk/bin
+Phunk.Updater/bin
\ No newline at end of file
diff --git a/Phunk/Core/ApkHandler.cs b/Phunk/Core/ApkHandler.cs
index 37df1d6..e02ac27 100644
--- a/Phunk/Core/ApkHandler.cs
+++ b/Phunk/Core/ApkHandler.cs
@@ -23,7 +23,7 @@ public int DecompileApkTool(string apktoolPath, string apkPath, string outputApk
FileName = !GlobalViewModel.IsCustomJavaPath && GlobalViewModel.JavaPathFolderSettingsTxt.Length == 0
? "java"
: Path.Combine(GlobalViewModel.JavaPathFolderSettingsTxt + "/bin/java.exe"),
- Arguments = $"-jar \"{apktoolPath}\" -f d \"{apkPath}\" -o \"{outputApkPath}\"" + " " + additionalParams,
+ Arguments = $"-jar \"{apktoolPath}\" d -f \"{apkPath}\" -o \"{outputApkPath}\"" + " " + additionalParams,
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
@@ -71,7 +71,7 @@ public void BuildApkTool(string apktoolPath, string directoryPath, string output
FileName = !GlobalViewModel.IsCustomJavaPath && GlobalViewModel.JavaPathFolderSettingsTxt.Length == 0
? "java"
: Path.Combine(GlobalViewModel.JavaPathFolderSettingsTxt + "/bin/java.exe"),
- Arguments = $"-jar \"{apktoolPath}\" -f b \"{directoryPath}\" -o \"{outputApkPath}\"",
+ Arguments = $"-jar \"{apktoolPath}\" b -f \"{directoryPath}\" -o \"{outputApkPath}\"",
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
diff --git a/Phunk/Core/ReqChecker.cs b/Phunk/Core/ReqChecker.cs
index eff71ff..a803555 100644
--- a/Phunk/Core/ReqChecker.cs
+++ b/Phunk/Core/ReqChecker.cs
@@ -77,8 +77,9 @@ public bool IsJavaVersionValid(string command)
string versionString = match.Groups[1].Value.Trim();
versionstr = versionString;
- if (Version.TryParse(versionString, out Version version) && version.Major == 1 && version.Minor >= 8)
+ if (Version.TryParse(versionString, out Version version) && ( version.Major >= 18 || version.ToString() == "1.8" ) )
{
+ GlobalViewModel.PhunkLogs += "\n[Phunk] Java version is up to date: " + version;
return true;
}
}
diff --git a/Phunk/MVVM/View/Windows/SettingsWindow.xaml b/Phunk/MVVM/View/Windows/SettingsWindow.xaml
index 2f7d60c..c071a24 100644
--- a/Phunk/MVVM/View/Windows/SettingsWindow.xaml
+++ b/Phunk/MVVM/View/Windows/SettingsWindow.xaml
@@ -36,7 +36,7 @@
-
+