From 1d49319fc7f628e7138a3d621e82163b5ddb36e9 Mon Sep 17 00:00:00 2001 From: cyBerta <cyberta@riseup.net> Date: Fri, 1 Jul 2022 03:08:25 +0200 Subject: [PATCH] take torrc file only into account if pluggable transport is used --- .../src/main/java/org/torproject/jni/TorService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java index 5af50f6c..87c2fd20 100644 --- a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java +++ b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java @@ -440,8 +440,6 @@ public class TorService extends Service { createTorConfiguration(); ArrayList<String> lines = new ArrayList<>(Arrays.asList("tor", "--verify-config", // must always be here "--RunAsDaemon", "0", - "-f", getTorrc(context).getAbsolutePath(), - "--defaults-torrc", getDefaultsTorrc(context).getAbsolutePath(), "--ignore-missing-torrc", "--SyslogIdentityTag", TAG, "--CacheDirectory", new File(getCacheDir(), TAG).getAbsolutePath(), @@ -455,6 +453,10 @@ public class TorService extends Service { "--LogMessageDomains", "1", "--TruncateLogFile", "1" )); + if (clientTransportPlugin != null) { + lines.add("-f"); + lines.add(getTorrc(context).getAbsolutePath()); + } String[] verifyLines = lines.toArray(new String[0]); if (!mainConfigurationSetCommandLine(verifyLines)) { throw new IllegalArgumentException("Setting command line failed: " + Arrays.toString(verifyLines)); -- GitLab