Skip to content
Snippets Groups Projects
Commit 427efdc7 authored by akwizgran's avatar akwizgran
Browse files

Raise minimum Java version to 6, upgrade H2. #24

parent 2b12f0d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 33 deletions
briar-android/.classpath
+ 1
− 1
View file @ 427efdc7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/briar-api"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/briar-api"/>
<classpathentry exported="true" kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/> <classpathentry exported="true" kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-api/libs/javax.inject.jar"/> <classpathentry exported="true" kind="lib" path="/briar-api/libs/javax.inject.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-core/libs/h2small-1.3.170.jar"/> <classpathentry exported="true" kind="lib" path="/briar-core/libs/h2small-1.4.190.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-core/libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/> <classpathentry exported="true" kind="lib" path="/briar-core/libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-core/libs/lcrypto-jdk15on-152.jar"/> <classpathentry exported="true" kind="lib" path="/briar-core/libs/lcrypto-jdk15on-152.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
......
briar-android/briar-android.iml
+ 1
− 1
View file @ 427efdc7
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<orderEntry type="library" exported="" name="roboguice-2.0" level="project" /> <orderEntry type="library" exported="" name="roboguice-2.0" level="project" />
<orderEntry type="library" exported="" name="jsocks" level="project" /> <orderEntry type="library" exported="" name="jsocks" level="project" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" /> <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="h2small-1.3.170" level="project" /> <orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" /> <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" /> <orderEntry type="library" exported="" name="javax.inject" level="project" />
......
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+ 3
− 5
View file @ 427efdc7
...@@ -119,7 +119,7 @@ class DroidtoothPlugin implements DuplexPlugin { ...@@ -119,7 +119,7 @@ class DroidtoothPlugin implements DuplexPlugin {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
throw new IOException("Interrupted while getting BluetoothAdapter"); throw new IOException("Interrupted while getting BluetoothAdapter");
} catch (ExecutionException e) { } catch (ExecutionException e) {
throw new IOException(e.toString()); throw new IOException(e);
} }
if (adapter == null) { if (adapter == null) {
LOG.info("Bluetooth is not supported"); LOG.info("Bluetooth is not supported");
...@@ -156,13 +156,12 @@ class DroidtoothPlugin implements DuplexPlugin { ...@@ -156,13 +156,12 @@ class DroidtoothPlugin implements DuplexPlugin {
p.put("address", adapter.getAddress()); p.put("address", adapter.getAddress());
callback.mergeLocalProperties(p); callback.mergeLocalProperties(p);
// Bind a server socket to accept connections from contacts // Bind a server socket to accept connections from contacts
BluetoothServerSocket ss = null; BluetoothServerSocket ss;
try { try {
ss = InsecureBluetooth.listen(adapter, "RFCOMM", getUuid()); ss = InsecureBluetooth.listen(adapter, "RFCOMM", getUuid());
} catch (IOException e) { } catch (IOException e) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e); LOG.log(WARNING, e.toString(), e);
tryToClose(ss);
return; return;
} }
if (!isRunning()) { if (!isRunning()) {
...@@ -331,12 +330,11 @@ class DroidtoothPlugin implements DuplexPlugin { ...@@ -331,12 +330,11 @@ class DroidtoothPlugin implements DuplexPlugin {
UUID uuid = UUID.nameUUIDFromBytes(b); UUID uuid = UUID.nameUUIDFromBytes(b);
if (LOG.isLoggable(INFO)) LOG.info("Invitation UUID " + uuid); if (LOG.isLoggable(INFO)) LOG.info("Invitation UUID " + uuid);
// Bind a server socket for receiving invitation connections // Bind a server socket for receiving invitation connections
BluetoothServerSocket ss = null; BluetoothServerSocket ss;
try { try {
ss = InsecureBluetooth.listen(adapter, "RFCOMM", uuid); ss = InsecureBluetooth.listen(adapter, "RFCOMM", uuid);
} catch (IOException e) { } catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
tryToClose(ss);
return null; return null;
} }
// Start the background threads // Start the background threads
......
briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java
+ 14
− 14
View file @ 427efdc7
...@@ -85,18 +85,18 @@ class InsecureBluetooth { ...@@ -85,18 +85,18 @@ class InsecureBluetooth {
setCloseHandler.invoke(socket, mHandler, handle); setCloseHandler.invoke(socket, mHandler, handle);
return socket; return socket;
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InstantiationException e) { } catch (InstantiationException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) { if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause(); throw (IOException) e.getCause();
} else { } else {
throw new IOException(e.toString()); throw new IOException(e);
} }
} }
} }
...@@ -122,18 +122,18 @@ class InsecureBluetooth { ...@@ -122,18 +122,18 @@ class InsecureBluetooth {
} }
return socket; return socket;
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InstantiationException e) { } catch (InstantiationException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) { if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause(); throw (IOException) e.getCause();
} else { } else {
throw new IOException(e.toString()); throw new IOException(e);
} }
} }
} }
...@@ -155,16 +155,16 @@ class InsecureBluetooth { ...@@ -155,16 +155,16 @@ class InsecureBluetooth {
return constructor.newInstance(TYPE_RFCOMM, -1, false, true, device, return constructor.newInstance(TYPE_RFCOMM, -1, false, true, device,
-1, new ParcelUuid(uuid)); -1, new ParcelUuid(uuid));
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InstantiationException e) { } catch (InstantiationException e) {
throw new IOException(e.toString()); throw new IOException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) { if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause(); throw (IOException) e.getCause();
} else { } else {
throw new IOException(e.toString()); throw new IOException(e);
} }
} }
} }
......
briar-api/briar-api.iml
+ 1
− 2
View file @ 427efdc7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" /> <output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
...@@ -28,6 +28,5 @@ ...@@ -28,6 +28,5 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" /> <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" /> <orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="briar-api.briar-api" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
briar-core/.classpath
+ 1
− 1
View file @ 427efdc7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/> <classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/> <classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="lib" path="/briar-api/libs/javax.inject.jar"/> <classpathentry kind="lib" path="/briar-api/libs/javax.inject.jar"/>
<classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/> <classpathentry kind="lib" path="libs/h2small-1.4.190.jar"/>
<classpathentry kind="lib" path="libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/> <classpathentry kind="lib" path="libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="libs/lcrypto-jdk15on-152.jar" sourcepath="libs/source/lcrypto-jdk15on-152-src.jar"/> <classpathentry kind="lib" path="libs/lcrypto-jdk15on-152.jar" sourcepath="libs/source/lcrypto-jdk15on-152-src.jar"/>
......
briar-core/briar-core.iml
+ 2
− 3
View file @ 427efdc7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" /> <output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
...@@ -29,9 +29,8 @@ ...@@ -29,9 +29,8 @@
<orderEntry type="module" module-name="briar-api" exported="" /> <orderEntry type="module" module-name="briar-api" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" /> <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" /> <orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="h2small-1.3.170" level="project" /> <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" /> <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
briar-core/libs/h2small-1.3.170.jar deleted 100644 → 0
+ 0
− 0
View file @ 2b12f0d4
File deleted
briar-core/libs/h2small-1.4.190.jar 0 → 100644
+ 0
− 0
View file @ 427efdc7
File added
briar-desktop/briar-desktop.iml
+ 2
− 3
View file @ 427efdc7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" /> <output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<orderEntry type="module" module-name="briar-core" exported="" /> <orderEntry type="module" module-name="briar-core" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" /> <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" /> <orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="h2small-1.3.170" level="project" /> <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" /> <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" />
...@@ -39,6 +39,5 @@ ...@@ -39,6 +39,5 @@
<orderEntry type="library" exported="" name="jnotify-0.94" level="project" /> <orderEntry type="library" exported="" name="jnotify-0.94" level="project" />
<orderEntry type="library" exported="" name="bluecove-gpl-2.1.1-SNAPSHOT" level="project" /> <orderEntry type="library" exported="" name="bluecove-gpl-2.1.1-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="jssc-0.9-briar" level="project" /> <orderEntry type="library" exported="" name="jssc-0.9-briar" level="project" />
<orderEntry type="library" exported="" name="briar-desktop.briar-desktop" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
briar-tests/briar-tests.iml
+ 2
− 3
View file @ 427efdc7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" /> <output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<orderEntry type="module" module-name="briar-desktop" exported="" /> <orderEntry type="module" module-name="briar-desktop" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" /> <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" /> <orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="h2small-1.3.170" level="project" /> <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" /> <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" /> <orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" />
...@@ -43,6 +43,5 @@ ...@@ -43,6 +43,5 @@
<orderEntry type="library" exported="" name="jmock-2.5.1" level="project" /> <orderEntry type="library" exported="" name="jmock-2.5.1" level="project" />
<orderEntry type="library" exported="" name="hamcrest-core-1.1" level="project" /> <orderEntry type="library" exported="" name="hamcrest-core-1.1" level="project" />
<orderEntry type="library" exported="" name="hamcrest-library-1.1" level="project" /> <orderEntry type="library" exported="" name="hamcrest-library-1.1" level="project" />
<orderEntry type="library" exported="" name="briar-tests.briar-tests" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment