diff --git a/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidTorWrapper.java b/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidTorWrapper.java index 137d9eaf4524e3c3b5b512b6f82bfed337ecb487..9ddf657d08d3acdf6a3d4ce262ac706be2e438de 100644 --- a/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidTorWrapper.java +++ b/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidTorWrapper.java @@ -133,7 +133,7 @@ public class AndroidTorWrapper extends AbstractTorWrapper { } @Override - protected File getObfs4ExecutableFile() { + public File getObfs4ExecutableFile() { return obfs4Lib.exists() ? obfs4Lib : super.getObfs4ExecutableFile(); } diff --git a/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java index fb7722287148d28e00e3a48731584be42f0faedf..fb5f1921ea28ee6302fd548f4cb1dd7e97e44463 100644 --- a/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java +++ b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java @@ -107,7 +107,8 @@ abstract class AbstractTorWrapper implements EventHandler, TorWrapper { return new File(torDirectory, "tor"); } - protected File getObfs4ExecutableFile() { + @Override + public File getObfs4ExecutableFile() { return new File(torDirectory, "obfs4proxy"); } diff --git a/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java index a72ac10d67366d27de844a31ecd32b2682ca9472..21d05106b955359335bbee002b54888ccc046b18 100644 --- a/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java +++ b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java @@ -2,6 +2,7 @@ package org.briarproject.onionwrapper; import org.briarproject.nullsafety.NotNullByDefault; +import java.io.File; import java.io.IOException; import java.util.List; import java.util.logging.Logger; @@ -99,6 +100,11 @@ public interface TorWrapper { */ void enableIpv6(boolean ipv6Only) throws IOException; + /** + * Returns the Obfs4 executable as a File for use with Moat. + */ + File getObfs4ExecutableFile(); + /** * The state of the Tor wrapper. */