diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index be97f170e..aac6d1f13 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -40,7 +40,7 @@ configurations { } dependencies { - api 'org.briarproject:dont-kill-me-lib:0.2.6' + api 'org.briarproject:dont-kill-me-lib:0.2.7' // In theory this dependency shouldn't be needed, but without it Android Studio's linter will // complain about unresolved symbols for bramble-api test classes in bramble-android tests, diff --git a/bramble-android/src/main/java/org/briarproject/android/dontkillmelib/wakelock/AndroidWakeLockModule.java b/bramble-android/src/main/java/org/briarproject/android/dontkillmelib/wakelock/AndroidWakeLockModule.java deleted file mode 100644 index a8dba5dd1..000000000 --- a/bramble-android/src/main/java/org/briarproject/android/dontkillmelib/wakelock/AndroidWakeLockModule.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.briarproject.android.dontkillmelib.wakelock; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; - -@Module -public class AndroidWakeLockModule { - - @Provides - @Singleton - AndroidWakeLockManager provideWakeLockManager( - AndroidWakeLockManagerImpl wakeLockManager) { - return wakeLockManager; - } -} 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 8c2e07e3f..3b70552a7 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java @@ -1,16 +1,16 @@ package org.briarproject.bramble; -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.reporting.ReportingModule; import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.system.AndroidSystemModule; import org.briarproject.bramble.system.AndroidTaskSchedulerModule; +import org.briarproject.bramble.system.AndroidWakeLockModule; import org.briarproject.bramble.system.AndroidWakefulIoExecutorModule; import org.briarproject.bramble.system.DefaultThreadFactoryModule; -import org.briarproject.onionwrapper.CircumventionModule; import dagger.Module; 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 2f39fb229..a5ccf6afe 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 @@ -16,11 +16,11 @@ import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; 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.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.AndroidTorWrapper; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import org.briarproject.onionwrapper.TorWrapper; import java.io.File; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java deleted file mode 100644 index 22d989027..000000000 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.briarproject.bramble.system; - -import android.annotation.SuppressLint; -import android.app.Application; -import android.content.Context; -import android.telephony.TelephonyManager; -import android.text.TextUtils; - -import org.briarproject.bramble.api.system.LocationUtils; -import org.briarproject.nullsafety.NotNullByDefault; - -import java.util.Locale; -import java.util.logging.Logger; - -import javax.inject.Inject; - -import static android.content.Context.TELEPHONY_SERVICE; - -@NotNullByDefault -class AndroidLocationUtils implements LocationUtils { - - private static final Logger LOG = - Logger.getLogger(AndroidLocationUtils.class.getName()); - - private final Context appContext; - - @Inject - AndroidLocationUtils(Application app) { - appContext = app.getApplicationContext(); - } - - /** - * This guesses the current country from the first of these sources that - * succeeds (also in order of likelihood of being correct): - * - * - * - * Note: this is very similar to - * this API except it seems that Google doesn't want us to use it for - * some reason - both that class and {@code Context.COUNTRY_CODE} are - * annotated {@code @hide}. - */ - @Override - @SuppressLint("DefaultLocale") - public String getCurrentCountry() { - String countryCode = getCountryFromPhoneNetwork(); - if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase(); - LOG.info("Falling back to SIM card country"); - countryCode = getCountryFromSimCard(); - if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase(); - LOG.info("Falling back to user-defined locale"); - return Locale.getDefault().getCountry(); - } - - private String getCountryFromPhoneNetwork() { - Object o = appContext.getSystemService(TELEPHONY_SERVICE); - TelephonyManager tm = (TelephonyManager) o; - return tm == null ? "" : tm.getNetworkCountryIso(); - } - - private String getCountryFromSimCard() { - Object o = appContext.getSystemService(TELEPHONY_SERVICE); - TelephonyManager tm = (TelephonyManager) o; - return tm == null ? "" : tm.getSimCountryIso(); - } -} diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java index 96aadb506..6ca516bb2 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java @@ -1,11 +1,14 @@ package org.briarproject.bramble.system; +import android.app.Application; + import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.system.AndroidExecutor; -import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; import org.briarproject.bramble.api.system.SecureRandomProvider; +import org.briarproject.onionwrapper.AndroidLocationUtilsFactory; +import org.briarproject.onionwrapper.LocationUtils; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionHandler; @@ -45,8 +48,9 @@ public class AndroidSystemModule { } @Provides - LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) { - return locationUtils; + @Singleton + LocationUtils provideLocationUtils(Application app) { + return AndroidLocationUtilsFactory.createAndroidLocationUtils(app); } @Provides diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockModule.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockModule.java new file mode 100644 index 000000000..3deb2330c --- /dev/null +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockModule.java @@ -0,0 +1,25 @@ +package org.briarproject.bramble.system; + +import android.app.Application; + +import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager; +import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManagerFactory; + +import java.util.concurrent.ScheduledExecutorService; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +@Module +public class AndroidWakeLockModule { + + @Provides + @Singleton + AndroidWakeLockManager provideWakeLockManager(Application app, + ScheduledExecutorService scheduledExecutorService) { + return AndroidWakeLockManagerFactory.createAndroidWakeLockManager(app, + scheduledExecutorService); + } +} diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index ca6d7bcb8..899509126 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -25,12 +25,12 @@ dependencyVerification { 'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0', 'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd', 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', - 'org.briarproject:dont-kill-me-lib:0.2.6:dont-kill-me-lib-0.2.6.aar:8a4cc201143227c0865c2edfba035f71109bf02e1ab26444fa3e42d3c569960f', + 'org.briarproject:dont-kill-me-lib:0.2.7:dont-kill-me-lib-0.2.7.aar:8a9540941fd927e1c127096a7a9b4aa61ce2f2965d2e24f849be92f9e57213c4', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', 'org.briarproject:obfs4proxy-android:0.0.14-tor2:obfs4proxy-android-0.0.14-tor2.jar:a0a93770d6760ce57d9dbd31cc7177687374e00c3361dac22ab75e3b6e0f289e', - 'org.briarproject:onionwrapper-android:0.0.1:onionwrapper-android-0.0.1.aar:959115946586daa090f057645cf75992407a59025e221c3bf88d2aa930ef3919', - 'org.briarproject:onionwrapper-core:0.0.1:onionwrapper-core-0.0.1.jar:a1937506b00ee6620e909a500e5d004be81f94a6f7d7c898e1a9e841a8ae8a2a', + 'org.briarproject:onionwrapper-android:0.0.2:onionwrapper-android-0.0.2.aar:d196f1fe5d8b750866ea09d80509716aae7645d39b2c85433994718dbebeb4d1', + 'org.briarproject:onionwrapper-core:0.0.2:onionwrapper-core-0.0.2.jar:7038e960c9e59803f0e2c19444dbb5214cd99e5a7463c0a01c45318e07a0eb80', 'org.briarproject:snowflake-android:2.5.1:snowflake-android-2.5.1.jar:88ec81c17b1b6fa884d06839dec0330e328b45c89f88c970a213ce91ca8eac87', 'org.briarproject:tor-android:0.4.7.13-2:tor-android-0.4.7.13-2.jar:453fd463b234a2104edd7f0d02d0649cbb5c5efbe47a76df3828f55a3f90f8b5', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java deleted file mode 100644 index 4b3e1be3b..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/LocationUtils.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.briarproject.bramble.api.system; - -import org.briarproject.nullsafety.NotNullByDefault; - -@NotNullByDefault -public interface LocationUtils { - - /** - * Get the country the device is currently located in, or "" if it cannot - * be determined. - *

- * The country codes are formatted upper-case and as per ISO 3166-1 alpha 2. - */ - String getCurrentCountry(); -} 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/CircumventionModule.java new file mode 100644 index 000000000..4c3e065a3 --- /dev/null +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionModule.java @@ -0,0 +1,19 @@ +package org.briarproject.bramble.plugin.tor; + +import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.CircumventionProviderFactory; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +@Module +public class CircumventionModule { + + @Provides + @Singleton + CircumventionProvider provideCircumventionProvider() { + return CircumventionProviderFactory.createCircumventionProvider(); + } +} 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 785c38264..6a6ac2609 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 @@ -24,11 +24,11 @@ import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; 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.nullsafety.InterfaceNotNullByDefault; import org.briarproject.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; import org.briarproject.onionwrapper.CircumventionProvider.BridgeType; +import org.briarproject.onionwrapper.LocationUtils; import org.briarproject.onionwrapper.TorWrapper; import org.briarproject.onionwrapper.TorWrapper.HiddenServiceProperties; import org.briarproject.onionwrapper.TorWrapper.Observer; 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 b04082d03..a8297efeb 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 @@ -17,10 +17,10 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; 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.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import java.io.File; import java.util.concurrent.Executor; diff --git a/bramble-core/src/main/java/org/briarproject/onionwrapper/CircumventionModule.java b/bramble-core/src/main/java/org/briarproject/onionwrapper/CircumventionModule.java deleted file mode 100644 index 0c60cf01a..000000000 --- a/bramble-core/src/main/java/org/briarproject/onionwrapper/CircumventionModule.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.briarproject.onionwrapper; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; - -@Module -public class CircumventionModule { - - @Provides - @Singleton - CircumventionProvider provideCircumventionProvider( - CircumventionProviderImpl provider) { - return provider; - } -} diff --git a/bramble-core/witness.gradle b/bramble-core/witness.gradle index 5635a6fec..6f5b8fedb 100644 --- a/bramble-core/witness.gradle +++ b/bramble-core/witness.gradle @@ -36,7 +36,7 @@ dependencyVerification { 'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:onionwrapper-core:0.0.1:onionwrapper-core-0.0.1.jar:a1937506b00ee6620e909a500e5d004be81f94a6f7d7c898e1a9e841a8ae8a2a', + 'org.briarproject:onionwrapper-core:0.0.2:onionwrapper-core-0.0.2.jar:7038e960c9e59803f0e2c19444dbb5214cd99e5a7463c0a01c45318e07a0eb80', 'org.briarproject:socks-socket:0.1:socks-socket-0.1.jar:e5898822d10f5390363c5dddb945891648c92cf93ba50709e07f0d173ec0eb4b', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb', 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 b6f4a5627..d627025ab 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java @@ -3,9 +3,9 @@ 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.socks.SocksModule; import org.briarproject.bramble.system.JavaSystemModule; -import org.briarproject.onionwrapper.CircumventionModule; import dagger.Module; 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 6f3b58501..f3b72aaed 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 @@ -13,10 +13,10 @@ import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; 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.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import org.briarproject.onionwrapper.TorWrapper; import org.briarproject.onionwrapper.UnixTorWrapper; 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 456dcc4bd..b282ed42c 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 @@ -13,10 +13,10 @@ import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; 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.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import org.briarproject.onionwrapper.TorWrapper; import org.briarproject.onionwrapper.WindowsTorWrapper; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java deleted file mode 100644 index a25f9c8b9..000000000 --- a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.briarproject.bramble.system; - -import org.briarproject.bramble.api.system.LocationUtils; -import org.briarproject.nullsafety.NotNullByDefault; - -import java.util.Locale; -import java.util.logging.Logger; - -import javax.inject.Inject; - -@NotNullByDefault -class JavaLocationUtils implements LocationUtils { - - private static final Logger LOG = - Logger.getLogger(JavaLocationUtils.class.getName()); - - @Inject - JavaLocationUtils() { - } - - @Override - public String getCurrentCountry() { - LOG.info("Using user-defined locale"); - return Locale.getDefault().getCountry(); - } - -} diff --git a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java index c33192d9b..60f147736 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java @@ -1,7 +1,8 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.bramble.api.system.ResourceProvider; +import org.briarproject.onionwrapper.JavaLocationUtilsFactory; +import org.briarproject.onionwrapper.LocationUtils; import javax.inject.Singleton; @@ -13,8 +14,8 @@ public class JavaSystemModule { @Provides @Singleton - LocationUtils provideLocationUtils(JavaLocationUtils locationUtils) { - return locationUtils; + LocationUtils provideLocationUtils() { + return JavaLocationUtilsFactory.createJavaLocationUtils(); } @Provides diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index 08c6254e2..80de87196 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -27,8 +27,8 @@ dependencyVerification { 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:onionwrapper-core:0.0.1:onionwrapper-core-0.0.1.jar:a1937506b00ee6620e909a500e5d004be81f94a6f7d7c898e1a9e841a8ae8a2a', - 'org.briarproject:onionwrapper-java:0.0.1:onionwrapper-java-0.0.1.jar:102ccea934d02b13702fd28e890e27e342db8b669a4c84bb54a3783cb8926552', + 'org.briarproject:onionwrapper-core:0.0.2:onionwrapper-core-0.0.2.jar:7038e960c9e59803f0e2c19444dbb5214cd99e5a7463c0a01c45318e07a0eb80', + 'org.briarproject:onionwrapper-java:0.0.2:onionwrapper-java-0.0.2.jar:87a3f4082174dbbd32c4f5f062b46af1d3fedd8cfa1ec84f6ce6ccb6e3674fb6', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb', 'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9', 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 6e8196efc..7e03eaf16 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 @@ -27,7 +27,6 @@ import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidExecutor; 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.system.ClockModule; @@ -84,6 +83,7 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; import org.briarproject.briar.api.test.TestDataCreator; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import java.util.concurrent.Executor; 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 4f93848b5..95c0d5796 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 @@ -23,7 +23,6 @@ import org.briarproject.bramble.api.settings.Settings; 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.briar.R; import org.briarproject.briar.android.attachment.UnsupportedMimeTypeException; import org.briarproject.briar.android.attachment.media.ImageCompressor; @@ -34,6 +33,7 @@ import org.briarproject.briar.api.identity.AuthorManager; import org.briarproject.nullsafety.MethodsNotNullByDefault; import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import java.io.IOException; import java.io.InputStream; 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 086739306..d4ccaabbd 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 @@ -2,10 +2,10 @@ package org.briarproject.briar.android.settings; import android.content.Context; -import org.briarproject.bramble.api.system.LocationUtils; import org.briarproject.briar.R; import org.briarproject.nullsafety.NotNullByDefault; import org.briarproject.onionwrapper.CircumventionProvider; +import org.briarproject.onionwrapper.LocationUtils; import androidx.preference.ListPreference; import androidx.preference.Preference.SummaryProvider; diff --git a/briar-headless/witness.gradle b/briar-headless/witness.gradle index fca773997..5a3b48954 100644 --- a/briar-headless/witness.gradle +++ b/briar-headless/witness.gradle @@ -45,8 +45,8 @@ dependencyVerification { 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', 'org.briarproject:obfs4proxy-linux:0.0.14-tor2:obfs4proxy-linux-0.0.14-tor2.jar:bb2431092b5ad998ad620b0223e725c0f7e43f1b02af2f097a2544edc1fd9738', 'org.briarproject:obfs4proxy-windows:0.0.14-tor2:obfs4proxy-windows-0.0.14-tor2.jar:b5fbd00a8c35ccf095b265370752390e4cd46055331049c4dfcc236dc9c650ac', - 'org.briarproject:onionwrapper-core:0.0.1:onionwrapper-core-0.0.1.jar:a1937506b00ee6620e909a500e5d004be81f94a6f7d7c898e1a9e841a8ae8a2a', - 'org.briarproject:onionwrapper-java:0.0.1:onionwrapper-java-0.0.1.jar:102ccea934d02b13702fd28e890e27e342db8b669a4c84bb54a3783cb8926552', + 'org.briarproject:onionwrapper-core:0.0.2:onionwrapper-core-0.0.2.jar:7038e960c9e59803f0e2c19444dbb5214cd99e5a7463c0a01c45318e07a0eb80', + 'org.briarproject:onionwrapper-java:0.0.2:onionwrapper-java-0.0.2.jar:87a3f4082174dbbd32c4f5f062b46af1d3fedd8cfa1ec84f6ce6ccb6e3674fb6', 'org.briarproject:snowflake-linux:2.5.1:snowflake-linux-2.5.1.jar:edc807dcb7758365970d95525e4749349a27f462d0e2df6505ad1ca65fb296d2', 'org.briarproject:snowflake-windows:2.5.1:snowflake-windows-2.5.1.jar:700ec9c68dc033f544daa4ca3547c89e523aed66500cf4b3ac51fe017c51e7be', 'org.briarproject:tor-linux:0.4.7.13-2:tor-linux-0.4.7.13-2.jar:1e4ca9e0f724e1f17fcce570832704942cc3be26c4c2eccbe5aae29f35afa307', diff --git a/build.gradle b/build.gradle index f2548c0e6..39ad76007 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ buildscript { junit_version = "4.13.2" jmock_version = '2.12.0' mockwebserver_version = '4.10.0' - onionwrapper_version = '0.0.1' + onionwrapper_version = '0.0.2' } dependencies { // upgrading this let's us run into https://github.com/gradle/gradle/issues/20330