Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
akwizgran
2018-11-23 12:56:34 +00:00
parent 61276c81d2
commit ce7d6d3db5
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java
View File

@@ -10,8 +10,6 @@ public class OsUtils {
@Nullable @Nullable
private static final String os = System.getProperty("os.name"); private static final String os = System.getProperty("os.name");
@Nullable @Nullable
private static final String version = System.getProperty("os.version");
@Nullable
private static final String vendor = System.getProperty("java.vendor"); private static final String vendor = System.getProperty("java.vendor");
public static boolean isWindows() { public static boolean isWindows() {

5
bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomProviderTest.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.bramble.system; package org.briarproject.bramble.system;
import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.util.OsUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -11,6 +10,8 @@ import java.security.Provider;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.briarproject.bramble.util.OsUtils.isLinux;
import static org.briarproject.bramble.util.OsUtils.isMac;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -22,7 +23,7 @@ public class UnixSecureRandomProviderTest extends BrambleTestCase {
@Before @Before
public void setUp() { public void setUp() {
assumeTrue(OsUtils.isLinux() || OsUtils.isMac()); assumeTrue(isLinux() || isMac());
assertTrue(testDir.mkdirs()); assertTrue(testDir.mkdirs());
} }

5
bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomSpiTest.java
View File

@@ -4,7 +4,6 @@ import org.briarproject.bramble.api.Bytes;
import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.test.TestUtils;
import org.briarproject.bramble.util.IoUtils; import org.briarproject.bramble.util.IoUtils;
import org.briarproject.bramble.util.OsUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -17,6 +16,8 @@ import java.util.Set;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.briarproject.bramble.util.OsUtils.isLinux;
import static org.briarproject.bramble.util.OsUtils.isMac;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -32,7 +33,7 @@ public class UnixSecureRandomSpiTest extends BrambleTestCase {
@Before @Before
public void setUp() { public void setUp() {
assumeTrue(OsUtils.isLinux() || OsUtils.isMac()); assumeTrue(isLinux() || isMac());
assertTrue(testDir.mkdirs()); assertTrue(testDir.mkdirs());
} }

5
bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java
View File

@@ -1,20 +1,21 @@
package org.briarproject.bramble.lifecycle; package org.briarproject.bramble.lifecycle;
import org.briarproject.bramble.api.lifecycle.ShutdownManager; import org.briarproject.bramble.api.lifecycle.ShutdownManager;
import org.briarproject.bramble.util.OsUtils;
import javax.inject.Singleton; import javax.inject.Singleton;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
import static org.briarproject.bramble.util.OsUtils.isWindows;
@Module @Module
public class DesktopLifecycleModule extends LifecycleModule { public class DesktopLifecycleModule extends LifecycleModule {
@Provides @Provides
@Singleton @Singleton
ShutdownManager provideDesktopShutdownManager() { ShutdownManager provideDesktopShutdownManager() {
if (OsUtils.isWindows()) return new WindowsShutdownManagerImpl(); if (isWindows()) return new WindowsShutdownManagerImpl();
else return new ShutdownManagerImpl(); else return new ShutdownManagerImpl();
} }
} }

6
bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java
View File

@@ -15,7 +15,6 @@ import com.sun.jna.win32.W32APIFunctionMapper;
import com.sun.jna.win32.W32APITypeMapper; import com.sun.jna.win32.W32APITypeMapper;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.util.OsUtils;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -29,6 +28,7 @@ import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER;
import static com.sun.jna.Library.OPTION_TYPE_MAPPER; import static com.sun.jna.Library.OPTION_TYPE_MAPPER;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.OsUtils.isWindows;
@ThreadSafe @ThreadSafe
@NotNullByDefault @NotNullByDefault
@@ -71,7 +71,7 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
// Locking: lock // Locking: lock
private void initialise() { private void initialise() {
if (OsUtils.isWindows()) { if (isWindows()) {
new EventLoop().start(); new EventLoop().start();
} else { } else {
LOG.warning("Windows shutdown manager used on non-Windows OS"); LOG.warning("Windows shutdown manager used on non-Windows OS");
@@ -111,7 +111,7 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
public void run() { public void run() {
try { try {
// Load user32.dll // Load user32.dll
User32 user32 = (User32) Native.loadLibrary("user32", User32 user32 = Native.loadLibrary("user32",
User32.class, options); User32.class, options);
// Create a callback to handle the WM_QUERYENDSESSION message // Create a callback to handle the WM_QUERYENDSESSION message
WindowProc proc = (hwnd, msg, wp, lp) -> { WindowProc proc = (hwnd, msg, wp, lp) -> {

6
bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java
View File

@@ -1,20 +1,22 @@
package org.briarproject.bramble.system; package org.briarproject.bramble.system;
import org.briarproject.bramble.api.system.SecureRandomProvider; import org.briarproject.bramble.api.system.SecureRandomProvider;
import org.briarproject.bramble.util.OsUtils;
import javax.inject.Singleton; import javax.inject.Singleton;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
import static org.briarproject.bramble.util.OsUtils.isLinux;
import static org.briarproject.bramble.util.OsUtils.isMac;
@Module @Module
public class DesktopSecureRandomModule { public class DesktopSecureRandomModule {
@Provides @Provides
@Singleton @Singleton
SecureRandomProvider provideSecureRandomProvider() { SecureRandomProvider provideSecureRandomProvider() {
if (OsUtils.isLinux() || OsUtils.isMac()) if (isLinux() || isMac())
return new UnixSecureRandomProvider(); return new UnixSecureRandomProvider();
// TODO: Create a secure random provider for Windows // TODO: Create a secure random provider for Windows
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();

4
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -26,7 +26,7 @@ import org.briarproject.bramble.plugin.tor.CircumventionModule
import org.briarproject.bramble.plugin.tor.CircumventionProvider import org.briarproject.bramble.plugin.tor.CircumventionProvider
import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory
import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.bramble.system.JavaSystemModule
import org.briarproject.bramble.util.OsUtils import org.briarproject.bramble.util.OsUtils.isLinux
import org.briarproject.bramble.util.StringUtils.fromHexString import org.briarproject.bramble.util.StringUtils.fromHexString
import org.briarproject.briar.headless.blogs.HeadlessBlogModule import org.briarproject.briar.headless.blogs.HeadlessBlogModule
import org.briarproject.briar.headless.contact.HeadlessContactModule import org.briarproject.briar.headless.contact.HeadlessContactModule
@@ -72,7 +72,7 @@ internal class HeadlessModule(private val appDir: File) {
): PluginConfig { ): PluginConfig {
val torDirectory = File(appDir, "tor") val torDirectory = File(appDir, "tor")
val duplex: List<DuplexPluginFactory> val duplex: List<DuplexPluginFactory>
if (OsUtils.isLinux()) { if (isLinux()) {
val tor = LinuxTorPluginFactory( val tor = LinuxTorPluginFactory(
ioExecutor, networkManager, locationUtils, eventBus, ioExecutor, networkManager, locationUtils, eventBus,
torSocketFactory, backoffFactory, resourceProvider, circumventionProvider, torSocketFactory, backoffFactory, resourceProvider, circumventionProvider,