From 0e1fb406b51a73d99daed5112c2b1dadc6c17c56 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 4 Sep 2020 13:28:21 +0100 Subject: [PATCH] Extract library filenames into constants. --- .../bramble/plugin/tor/AndroidTorPlugin.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java index 2efdc5986..9be55eb79 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java @@ -43,6 +43,9 @@ class AndroidTorPlugin extends TorPlugin { private static final List LIBRARY_ARCHITECTURES = 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 = getLogger(AndroidTorPlugin.class.getName()); @@ -76,8 +79,8 @@ class AndroidTorPlugin extends TorPlugin { this.app = app; wakeLock = wakeLockManager.createWakeLock("TorPlugin"); String nativeLibDir = app.getApplicationInfo().nativeLibraryDir; - torLib = new File(nativeLibDir, "libtor.so"); - obfs4Lib = new File(nativeLibDir, "libobfs4proxy.so"); + torLib = new File(nativeLibDir, TOR_LIB_NAME); + obfs4Lib = new File(nativeLibDir, OBFS4_LIB_NAME); } @Override @@ -131,7 +134,7 @@ class AndroidTorPlugin extends TorPlugin { } else if (SDK_INT < 29) { // The binary wasn't extracted at install time. Try to extract it if (!extracted.exists()) { - extractLibraryFromApk("libtor.so", extracted); + extractLibraryFromApk(TOR_LIB_NAME, extracted); } } else { // 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) { // The binary wasn't extracted at install time. Try to extract it if (!extracted.exists()) { - extractLibraryFromApk("libobfs4proxy.so", extracted); + extractLibraryFromApk(OBFS4_LIB_NAME, extracted); } } else { // No point extracting the binary, we won't be allowed to execute it