piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Remove copyAsset's overwrite parameter

Browse Source 
Because of the previous commit, this is no longer needed.
This commit is contained in:
JosJuice
2021-12-30 18:40:00 +01:00
parent 93657cce54
commit 304d898966
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
View File

@ -145,7 +145,7 @@ public final class DirectoryInitialization
// There is no extracted Sys directory, or there is a Sys directory from another // There is no extracted Sys directory, or there is a Sys directory from another
// version of Dolphin that might contain outdated files. Let's (re-)extract Sys. // version of Dolphin that might contain outdated files. Let's (re-)extract Sys.
deleteDirectoryRecursively(sysDirectory); deleteDirectoryRecursively(sysDirectory);
copyAssetFolder("Sys", sysDirectory, true, context); copyAssetFolder("Sys", sysDirectory, context);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putString("sysDirectoryVersion", revision); editor.putString("sysDirectoryVersion", revision);
@ -209,21 +209,18 @@ public final class DirectoryInitialization
return new File(context.getExternalCacheDir(), "gamelist.cache"); return new File(context.getExternalCacheDir(), "gamelist.cache");
} }
private static boolean copyAsset(String asset, File output, Boolean overwrite, Context context) private static boolean copyAsset(String asset, File output, Context context)
{ {
Log.verbose("[DirectoryInitialization] Copying File " + asset + " to " + output); Log.verbose("[DirectoryInitialization] Copying File " + asset + " to " + output);
try try
{ {
if (!output.exists() || overwrite) try (InputStream in = context.getAssets().open(asset))
{ {
try (InputStream in = context.getAssets().open(asset)) try (OutputStream out = new FileOutputStream(output))
{ {
try (OutputStream out = new FileOutputStream(output)) copyFile(in, out);
{ return true;
copyFile(in, out);
return true;
}
} }
} }
} }
@ -235,8 +232,7 @@ public final class DirectoryInitialization
return false; return false;
} }
private static void copyAssetFolder(String assetFolder, File outputFolder, Boolean overwrite, private static void copyAssetFolder(String assetFolder, File outputFolder, Context context)
Context context)
{ {
Log.verbose("[DirectoryInitialization] Copying Folder " + assetFolder + " to " + Log.verbose("[DirectoryInitialization] Copying Folder " + assetFolder + " to " +
outputFolder); outputFolder);
@ -263,9 +259,8 @@ public final class DirectoryInitialization
createdFolder = true; createdFolder = true;
} }
copyAssetFolder(assetFolder + File.separator + file, new File(outputFolder, file), copyAssetFolder(assetFolder + File.separator + file, new File(outputFolder, file),
overwrite, context);
copyAsset(assetFolder + File.separator + file, new File(outputFolder, file), overwrite,
context); context);
copyAsset(assetFolder + File.separator + file, new File(outputFolder, file), context);
} }
} }
catch (IOException e) catch (IOException e)