Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use symlink instead of hardlink, which was accidentally used on API < 19.

Browse Source 
At the same time, also changed visibility of methods to package local
to remove need for test class.
This commit is contained in:
Peter Serwylo 2016-06-23 11:06:16 +10:00
parent 95d8537187
commit 64bc13de8a
3 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatForTest.java
View File

@ -1,27 +0,0 @@
package org.fdroid.fdroid.compat;
import android.annotation.TargetApi;
import android.os.Build;
import org.fdroid.fdroid.data.SanitizedFile;
/**
* Used to expose the protected methods from FileCompat in a public manner so
* that they can be called from a test harness.
*/
public class FileCompatForTest extends FileCompat {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public static void symlinkOsTest(SanitizedFile source, SanitizedFile dest) {
symlinkOs(source, dest);
}
public static void symlinkRuntimeTest(SanitizedFile source, SanitizedFile dest) {
symlinkRuntime(source, dest);
}
public static void symlinkLibcoreTest(SanitizedFile source, SanitizedFile dest) {
symlinkLibcore(source, dest);
}
}

10
app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java → app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.compat;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.content.Context; import android.content.Context;
@ -9,7 +9,7 @@ import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.compat.FileCompatForTest; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.SanitizedFile; import org.fdroid.fdroid.data.SanitizedFile;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -64,21 +64,21 @@ public class FileCompatTest {
@Test @Test
public void testSymlinkRuntime() { public void testSymlinkRuntime() {
FileCompatForTest.symlinkRuntimeTest(sourceFile, destFile); FileCompat.symlinkRuntime(sourceFile, destFile);
assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists()); assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists());
} }
@Test @Test
public void testSymlinkLibcore() { public void testSymlinkLibcore() {
assumeTrue(Build.VERSION.SDK_INT >= 19); assumeTrue(Build.VERSION.SDK_INT >= 19);
FileCompatForTest.symlinkLibcoreTest(sourceFile, destFile); FileCompat.symlinkLibcore(sourceFile, destFile);
assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists()); assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists());
} }
@Test @Test
public void testSymlinkOs() { public void testSymlinkOs() {
assumeTrue(Build.VERSION.SDK_INT >= 21); assumeTrue(Build.VERSION.SDK_INT >= 21);
FileCompatForTest.symlinkOsTest(sourceFile, destFile); FileCompat.symlinkOs(sourceFile, destFile);
assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists()); assertTrue(destFile.getAbsolutePath() + " should exist after symlinking", destFile.exists());
} }

9
app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
View File

@ -43,7 +43,7 @@ public class FileCompat {
private static class Symlink21 { private static class Symlink21 {
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
public void symlink(SanitizedFile source, SanitizedFile dest) { void symlink(SanitizedFile source, SanitizedFile dest) {
try { try {
android.system.Os.symlink(source.getAbsolutePath(), dest.getAbsolutePath()); android.system.Os.symlink(source.getAbsolutePath(), dest.getAbsolutePath());
} catch (ErrnoException e) { } catch (ErrnoException e) {
@ -54,13 +54,14 @@ public class FileCompat {
} }
@TargetApi(21) @TargetApi(21)
protected static void symlinkOs(SanitizedFile source, SanitizedFile dest) { static void symlinkOs(SanitizedFile source, SanitizedFile dest) {
new Symlink21().symlink(source, dest); new Symlink21().symlink(source, dest);
} }
protected static void symlinkRuntime(SanitizedFile source, SanitizedFile dest) { static void symlinkRuntime(SanitizedFile source, SanitizedFile dest) {
String[] commands = { String[] commands = {
FDroidApp.SYSTEM_DIR_NAME + "/bin/ln", FDroidApp.SYSTEM_DIR_NAME + "/bin/ln",
"-s",
source.getAbsolutePath(), source.getAbsolutePath(),
dest.getAbsolutePath(), dest.getAbsolutePath(),
}; };
@ -74,7 +75,7 @@ public class FileCompat {
} }
} }
protected static void symlinkLibcore(SanitizedFile source, SanitizedFile dest) { static void symlinkLibcore(SanitizedFile source, SanitizedFile dest) {
try { try {
Object os = Class.forName("libcore.io.Libcore").getField("os").get(null); Object os = Class.forName("libcore.io.Libcore").getField("os").get(null);
Method symlink = os.getClass().getMethod("symlink", String.class, String.class); Method symlink = os.getClass().getMethod("symlink", String.class, String.class);