mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: Clean up old symlinks before creating new ones (#11931)

Browse Source
This commit is contained in:
Braden Farmer 2021-01-23 11:49:32 -07:00 committed by GitHub
parent 0068dfd963
commit 6167f8c980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
View File

@ -33,8 +33,6 @@ import android.os.VibrationEffect;
import android.util.Log; import android.util.Log;
import java.io.File; import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -100,6 +98,7 @@ public class RetroActivityCommon extends NativeActivity
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
cleanupSymlinks();
updateSymlinks(); updateSymlinks();
SplitInstallManager manager = SplitInstallManagerFactory.create(this); SplitInstallManager manager = SplitInstallManagerFactory.create(this);
@ -543,6 +542,23 @@ public class RetroActivityCommon extends NativeActivity
return path; return path;
} }
/**
* Cleans up existing symlinks before new ones are created.
*/
private void cleanupSymlinks() {
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
File[] files = new File(getCorePath()).listFiles();
for(int i = 0; i < files.length; i++) {
try {
Os.readlink(files[i].getAbsolutePath());
files[i].delete();
} catch (Exception e) {
// File is not a symlink, so don't delete.
}
}
}
/** /**
* Triggers a symlink update in the known places that Dynamic Feature Modules * Triggers a symlink update in the known places that Dynamic Feature Modules
* are installed to. * are installed to.
@ -570,6 +586,8 @@ public class RetroActivityCommon extends NativeActivity
* @param filenames List of filenames to update. * @param filenames List of filenames to update.
*/ */
private void traverseFilesystem(File file) { private void traverseFilesystem(File file) {
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
File[] list = file.listFiles(); File[] list = file.listFiles();
if(list == null) return; if(list == null) return;
@ -593,19 +611,7 @@ public class RetroActivityCommon extends NativeActivity
new File(newFilename).delete(); new File(newFilename).delete();
try { try {
// On Android 5.0+, use the official API for creating a symlink.
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Os.symlink(filename, newFilename); Os.symlink(filename, newFilename);
} else {
// On older versions, resort to using reflection instead.
Class<?> clazz = Class.forName("libcore.io.Libcore");
Field field = clazz.getDeclaredField("os");
field.setAccessible(true);
Object os = field.get(null);
Method method = os.getClass().getMethod("symlink", String.class, String.class);
method.invoke(os, filename, newFilename);
}
} catch (Exception e) { } catch (Exception e) {
// Symlink failed to be created. Should never happen. // Symlink failed to be created. Should never happen.
} }