From 51e8d50631fbe223fdf579535d9f5af74a175a4b Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Fri, 18 Mar 2022 21:53:34 +0100
Subject: [PATCH] Store the tor state subdir in app datadir
---
.../java/org/briarproject/mailbox/core/tor/JavaTorModule.kt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mailbox-cli/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt b/mailbox-cli/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt
index 7933f9ff..8dc4194f 100644
--- a/mailbox-cli/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt
+++ b/mailbox-cli/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt
@@ -24,6 +24,7 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import org.briarproject.mailbox.core.event.EventBus
+import org.briarproject.mailbox.core.files.FileProvider
import org.briarproject.mailbox.core.lifecycle.IoExecutor
import org.briarproject.mailbox.core.lifecycle.LifecycleManager
import org.briarproject.mailbox.core.settings.SettingsManager
@@ -66,10 +67,9 @@ internal class JavaTorModule {
backoff: Backoff,
lifecycleManager: LifecycleManager,
eventBus: EventBus,
+ fileProvider: FileProvider,
): TorPlugin {
- val configDir = File(System.getProperty("user.home") + File.separator + ".config")
- val mailboxDir = File(configDir, ".briar-mailbox")
- val torDir = File(mailboxDir, "tor")
+ val torDir = File(fileProvider.root, "tor")
return JavaTorPlugin(
ioExecutor,
settingsManager,
--
GitLab