TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad usage of IOUtils

Browse Source
This commit is contained in:
artdeell 2023-03-02 15:38:27 +03:00
parent a5b5809372
commit d789f1251e
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/assets/components/lwjgl3/version
View File

@ -1 +1 @@
1674881685730 1677612008557

20
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -523,7 +523,11 @@ public final class Tools {
} }
File destinationFile = new File(output, outputName); File destinationFile = new File(output, outputName);
if(!destinationFile.exists() || overwrite){ if(!destinationFile.exists() || overwrite){
IOUtils.copy(ctx.getAssets().open(fileName), new FileOutputStream(destinationFile)); try(InputStream inputStream = ctx.getAssets().open(fileName)) {
try (OutputStream outputStream = new FileOutputStream(destinationFile)){
IOUtils.copy(inputStream, outputStream);
}
}
} }
} }
@ -768,15 +772,19 @@ public final class Tools {
} }
public static String read(InputStream is) throws IOException { public static String read(InputStream is) throws IOException {
return IOUtils.toString(new InputStreamReader(is, StandardCharsets.UTF_8)); String readResult = IOUtils.toString(is, StandardCharsets.UTF_8);
is.close();
return readResult;
} }
public static String read(String path) throws IOException { public static String read(String path) throws IOException {
return IOUtils.toString(new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8)); return read(new FileInputStream(path));
} }
public static void write(String path, String content) throws IOException { public static void write(String path, String content) throws IOException {
IOUtils.write(content, new FileOutputStream(path)); try(FileOutputStream outStream = new FileOutputStream(path)) {
IOUtils.write(content, outStream);
}
} }
public static void downloadFile(String urlInput, String nameOutput) throws IOException { public static void downloadFile(String urlInput, String nameOutput) throws IOException {
@ -930,7 +938,9 @@ public final class Tools {
final String name = getFileName(activity, uri); final String name = getFileName(activity, uri);
final File modInstallerFile = new File(activity.getCacheDir(), name); final File modInstallerFile = new File(activity.getCacheDir(), name);
FileOutputStream fos = new FileOutputStream(modInstallerFile); FileOutputStream fos = new FileOutputStream(modInstallerFile);
IOUtils.copy(activity.getContentResolver().openInputStream(uri), fos); InputStream input = activity.getContentResolver().openInputStream(uri);
IOUtils.copy(input, fos);
input.close();
fos.close(); fos.close();
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
alertDialog.dismiss(); alertDialog.dismiss();

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java
View File

@ -21,7 +21,7 @@ public class LayoutConverter {
public static boolean convertLookType = false; //false = flat; true = classic public static boolean convertLookType = false; //false = flat; true = classic
public static CustomControls loadAndConvertIfNecessary(String jsonPath) throws IOException, JsonSyntaxException { public static CustomControls loadAndConvertIfNecessary(String jsonPath) throws IOException, JsonSyntaxException {
String jsonLayoutData = IOUtils.toString(new InputStreamReader(new FileInputStream(jsonPath), StandardCharsets.UTF_8)); String jsonLayoutData = Tools.read(jsonPath);
try { try {
JSONObject layoutJobj = new JSONObject(jsonLayoutData); JSONObject layoutJobj = new JSONObject(jsonLayoutData);