Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
.idea
Phunk/obj
Phunk.Updater/obj
Phunk/bin
Phunk/bin
Phunk.Updater/bin
4 changes: 2 additions & 2 deletions Phunk/Core/ApkHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion Phunk/Core/ReqChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Phunk/MVVM/View/Windows/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<StackPanel Margin="5" Grid.Row="1">
<TextBlock Text="Custom Package Name" Margin="0 0 2 2"/>
<TextBox Text="{Binding GlobalViewModel.CustomPackageNameSettingsTxt, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding GlobalViewModel.IsProcessStarting, Converter={StaticResource BooleanNegationConverter}}" adonisExtensions:CursorSpotlightExtension.BackgroundBrush="Transparent" Background="#25262e" Foreground="White" adonisExtensions:WatermarkExtension.IsWatermarkVisible="True" adonisExtensions:WatermarkExtension.Watermark="demo (default)"/>
<TextBox Text="{Binding GlobalViewModel.CustomPackageNameSettingsTxt, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding GlobalViewModel.IsProcessStarting, Converter={StaticResource BooleanNegationConverter}}" adonisExtensions:CursorSpotlightExtension.BackgroundBrush="Transparent" Background="#25262e" Foreground="White" adonisExtensions:WatermarkExtension.IsWatermarkVisible="True" adonisExtensions:WatermarkExtension.Watermark="phunk (default)"/>
</StackPanel>

<StackPanel Margin="5" Grid.Row="2">
Expand Down