Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Extract library filenames into constants.

Browse Source
This commit is contained in:
akwizgran
2020-09-04 13:28:21 +01:00
parent b72e8fa490
commit 0e1fb406b5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
View File

@@ -43,6 +43,9 @@ class AndroidTorPlugin extends TorPlugin {
private static final List<String> LIBRARY_ARCHITECTURES = private static final List<String> LIBRARY_ARCHITECTURES =
asList("armeabi-v7a", "arm64-v8a", "x86", "x86_64"); asList("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
private static final String TOR_LIB_NAME = "libtor.so";
private static final String OBFS4_LIB_NAME = "libobfs4proxy.so";
private static final Logger LOG = private static final Logger LOG =
getLogger(AndroidTorPlugin.class.getName()); getLogger(AndroidTorPlugin.class.getName());
@@ -76,8 +79,8 @@ class AndroidTorPlugin extends TorPlugin {
this.app = app; this.app = app;
wakeLock = wakeLockManager.createWakeLock("TorPlugin"); wakeLock = wakeLockManager.createWakeLock("TorPlugin");
String nativeLibDir = app.getApplicationInfo().nativeLibraryDir; String nativeLibDir = app.getApplicationInfo().nativeLibraryDir;
torLib = new File(nativeLibDir, "libtor.so"); torLib = new File(nativeLibDir, TOR_LIB_NAME);
obfs4Lib = new File(nativeLibDir, "libobfs4proxy.so"); obfs4Lib = new File(nativeLibDir, OBFS4_LIB_NAME);
} }
@Override @Override
@@ -131,7 +134,7 @@ class AndroidTorPlugin extends TorPlugin {
} else if (SDK_INT < 29) { } else if (SDK_INT < 29) {
// The binary wasn't extracted at install time. Try to extract it // The binary wasn't extracted at install time. Try to extract it
if (!extracted.exists()) { if (!extracted.exists()) {
extractLibraryFromApk("libtor.so", extracted); extractLibraryFromApk(TOR_LIB_NAME, extracted);
} }
} else { } else {
// No point extracting the binary, we won't be allowed to execute it // No point extracting the binary, we won't be allowed to execute it
@@ -151,7 +154,7 @@ class AndroidTorPlugin extends TorPlugin {
} else if (SDK_INT < 29) { } else if (SDK_INT < 29) {
// The binary wasn't extracted at install time. Try to extract it // The binary wasn't extracted at install time. Try to extract it
if (!extracted.exists()) { if (!extracted.exists()) {
extractLibraryFromApk("libobfs4proxy.so", extracted); extractLibraryFromApk(OBFS4_LIB_NAME, extracted);
} }
} else { } else {
// No point extracting the binary, we won't be allowed to execute it // No point extracting the binary, we won't be allowed to execute it