diff --git a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java index 4e4a49f86..f38219880 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java @@ -4,7 +4,7 @@ import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockModule; import org.briarproject.bramble.battery.AndroidBatteryModule; import org.briarproject.bramble.io.DnsModule; import org.briarproject.bramble.network.AndroidNetworkModule; -import org.briarproject.bramble.plugin.tor.CircumventionModule; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionModule; import org.briarproject.bramble.reporting.ReportingModule; import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.system.AndroidSystemModule; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java index 497ea7f43..76cbfd397 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java @@ -19,6 +19,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.WakefulIoExecutor; import org.briarproject.bramble.plugin.tor.wrapper.AndroidTorWrapper; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper; import org.briarproject.nullsafety.NotNullByDefault; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 655567d34..1c6db7698 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -25,7 +25,8 @@ import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; import org.briarproject.bramble.api.system.LocationUtils; -import org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper.HiddenServiceProperties; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper.Observer; @@ -76,9 +77,9 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_BATTERY; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_MOBILE_DATA; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; import static org.briarproject.bramble.plugin.tor.TorRendezvousCrypto.SEED_BYTES; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.MEEK; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.SNOWFLAKE; import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java index 53419f04b..ce5a902ab 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java @@ -19,6 +19,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.nullsafety.NotNullByDefault; import java.io.File; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionModule.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionModule.java similarity index 83% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionModule.java rename to bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionModule.java index 9ad744861..be4249f48 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionModule.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.plugin.tor; +package org.briarproject.bramble.plugin.tor.wrapper; import javax.inject.Singleton; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProvider.java similarity index 94% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java rename to bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProvider.java index ef8cbb7cc..ac0ee85d0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProvider.java @@ -1,10 +1,13 @@ -package org.briarproject.bramble.plugin.tor; +package org.briarproject.bramble.plugin.tor.wrapper; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.nullsafety.NotNullByDefault; import java.util.List; +import javax.annotation.concurrent.ThreadSafe; + +@ThreadSafe @NotNullByDefault public interface CircumventionProvider { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImpl.java similarity index 87% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java rename to bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImpl.java index 81e6eee02..a5a56df8a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImpl.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.plugin.tor; +package org.briarproject.bramble.plugin.tor.wrapper; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.nullsafety.NotNullByDefault; @@ -16,11 +16,11 @@ import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static java.util.Arrays.asList; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.MEEK; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.SNOWFLAKE; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.VANILLA; import static org.briarproject.nullsafety.NullSafety.requireNonNull; @Immutable diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImplTest.java similarity index 72% rename from bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImplTest.java rename to bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImplTest.java index 564efcded..374116e45 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/wrapper/CircumventionProviderImplTest.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.plugin.tor; +package org.briarproject.bramble.plugin.tor.wrapper; import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; @@ -7,16 +7,16 @@ import java.util.HashSet; import java.util.Set; import static java.util.Arrays.asList; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BLOCKED; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BRIDGES; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DEFAULT_BRIDGES; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DPI_BRIDGES; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.NON_DEFAULT_BRIDGES; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BLOCKED; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BRIDGES; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.MEEK; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.SNOWFLAKE; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.VANILLA; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.DEFAULT_BRIDGES; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.DPI_BRIDGES; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.NON_DEFAULT_BRIDGES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java index d627025ab..2d4fd9376 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java @@ -3,7 +3,7 @@ package org.briarproject.bramble; import org.briarproject.bramble.io.DnsModule; import org.briarproject.bramble.mailbox.ModularMailboxModule; import org.briarproject.bramble.network.JavaNetworkModule; -import org.briarproject.bramble.plugin.tor.CircumventionModule; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionModule; import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.system.JavaSystemModule; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java index 441259ea4..a9b48f1a2 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java @@ -15,6 +15,7 @@ import org.briarproject.bramble.api.plugin.TorSocksPort; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper; import org.briarproject.bramble.plugin.tor.wrapper.UnixTorWrapper; import org.briarproject.nullsafety.NotNullByDefault; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java index c113af80a..23ba5ba56 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java @@ -15,6 +15,7 @@ import org.briarproject.bramble.api.plugin.TorSocksPort; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.WakefulIoExecutor; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.bramble.plugin.tor.wrapper.TorWrapper; import org.briarproject.bramble.plugin.tor.wrapper.WindowsTorWrapper; import org.briarproject.nullsafety.NotNullByDefault; diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index dd584d2a5..f5bb53141 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -16,7 +16,8 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.WakefulIoExecutor; -import org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType; import org.briarproject.bramble.test.BrambleJavaIntegrationTestComponent; import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.DaggerBrambleJavaIntegrationTestComponent; @@ -46,11 +47,11 @@ import static java.util.Collections.singletonList; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; -import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.MEEK; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.SNOWFLAKE; +import static org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider.BridgeType.VANILLA; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory; import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled; diff --git a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java index 3f47a3541..8443e578c 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java @@ -5,7 +5,7 @@ import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.BrambleJavaModule; import org.briarproject.bramble.mailbox.ModularMailboxModule; import org.briarproject.bramble.plugin.tor.BridgeTest; -import org.briarproject.bramble.plugin.tor.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import javax.inject.Singleton; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index 6d23ec95f..e58baf4ad 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -30,7 +30,7 @@ import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.mailbox.ModularMailboxModule; import org.briarproject.bramble.plugin.file.RemovableDriveModule; -import org.briarproject.bramble.plugin.tor.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.bramble.system.ClockModule; import org.briarproject.briar.BriarCoreEagerSingletons; import org.briarproject.briar.BriarCoreModule; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java index 85cc559e4..9ccafba31 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java @@ -24,7 +24,7 @@ import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; import org.briarproject.bramble.api.system.AndroidExecutor; import org.briarproject.bramble.api.system.LocationUtils; -import org.briarproject.bramble.plugin.tor.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.UnsupportedMimeTypeException; import org.briarproject.briar.android.attachment.media.ImageCompressor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java index 73c7d24ae..d52ab51b0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java @@ -3,7 +3,7 @@ package org.briarproject.briar.android.settings; import android.content.Context; import org.briarproject.bramble.api.system.LocationUtils; -import org.briarproject.bramble.plugin.tor.CircumventionProvider; +import org.briarproject.bramble.plugin.tor.wrapper.CircumventionProvider; import org.briarproject.briar.R; import org.briarproject.nullsafety.NotNullByDefault;