diff --git a/briar-android/.classpath b/briar-android/.classpath
index e2baa5a2d..9651c7b62 100644
--- a/briar-android/.classpath
+++ b/briar-android/.classpath
@@ -6,7 +6,7 @@
-
+
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 8cb7b86d6..70b2d2d81 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -81,7 +81,7 @@
-
+
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index a8a18ce2b..c898aef03 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -119,7 +119,7 @@ class DroidtoothPlugin implements DuplexPlugin {
Thread.currentThread().interrupt();
throw new IOException("Interrupted while getting BluetoothAdapter");
} catch (ExecutionException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
}
if (adapter == null) {
LOG.info("Bluetooth is not supported");
@@ -156,13 +156,12 @@ class DroidtoothPlugin implements DuplexPlugin {
p.put("address", adapter.getAddress());
callback.mergeLocalProperties(p);
// Bind a server socket to accept connections from contacts
- BluetoothServerSocket ss = null;
+ BluetoothServerSocket ss;
try {
ss = InsecureBluetooth.listen(adapter, "RFCOMM", getUuid());
} catch (IOException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
- tryToClose(ss);
return;
}
if (!isRunning()) {
@@ -331,12 +330,11 @@ class DroidtoothPlugin implements DuplexPlugin {
UUID uuid = UUID.nameUUIDFromBytes(b);
if (LOG.isLoggable(INFO)) LOG.info("Invitation UUID " + uuid);
// Bind a server socket for receiving invitation connections
- BluetoothServerSocket ss = null;
+ BluetoothServerSocket ss;
try {
ss = InsecureBluetooth.listen(adapter, "RFCOMM", uuid);
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
- tryToClose(ss);
return null;
}
// Start the background threads
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java b/briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java
index 572fe2b52..4d6e1117d 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java
@@ -85,18 +85,18 @@ class InsecureBluetooth {
setCloseHandler.invoke(socket, mHandler, handle);
return socket;
} catch (NoSuchMethodException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (NoSuchFieldException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (IllegalAccessException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InstantiationException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
} else {
- throw new IOException(e.toString());
+ throw new IOException(e);
}
}
}
@@ -122,18 +122,18 @@ class InsecureBluetooth {
}
return socket;
} catch (NoSuchMethodException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (NoSuchFieldException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (IllegalAccessException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InstantiationException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
} else {
- throw new IOException(e.toString());
+ throw new IOException(e);
}
}
}
@@ -155,16 +155,16 @@ class InsecureBluetooth {
return constructor.newInstance(TYPE_RFCOMM, -1, false, true, device,
-1, new ParcelUuid(uuid));
} catch (NoSuchMethodException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (IllegalAccessException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InstantiationException e) {
- throw new IOException(e.toString());
+ throw new IOException(e);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
} else {
- throw new IOException(e.toString());
+ throw new IOException(e);
}
}
}
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index c1ef8459b..3d154955e 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -13,7 +13,7 @@
-
+
@@ -28,6 +28,5 @@
-
\ No newline at end of file
diff --git a/briar-core/.classpath b/briar-core/.classpath
index cd794d7c8..db3b175cb 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -4,7 +4,7 @@
-
+
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 6db499bfb..3b5b4dce8 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -13,7 +13,7 @@
-
+
@@ -29,9 +29,8 @@
-
+
-
\ No newline at end of file
diff --git a/briar-core/libs/h2small-1.3.170.jar b/briar-core/libs/h2small-1.3.170.jar
deleted file mode 100644
index 013dc7e85..000000000
Binary files a/briar-core/libs/h2small-1.3.170.jar and /dev/null differ
diff --git a/briar-core/libs/h2small-1.4.190.jar b/briar-core/libs/h2small-1.4.190.jar
new file mode 100644
index 000000000..031c51caf
Binary files /dev/null and b/briar-core/libs/h2small-1.4.190.jar differ
diff --git a/briar-desktop/briar-desktop.iml b/briar-desktop/briar-desktop.iml
index cb1b15a1d..84dc23fcf 100644
--- a/briar-desktop/briar-desktop.iml
+++ b/briar-desktop/briar-desktop.iml
@@ -13,7 +13,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -39,6 +39,5 @@
-
\ No newline at end of file
diff --git a/briar-tests/briar-tests.iml b/briar-tests/briar-tests.iml
index 50b0b9e70..54e209e64 100644
--- a/briar-tests/briar-tests.iml
+++ b/briar-tests/briar-tests.iml
@@ -13,7 +13,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -43,6 +43,5 @@
-
\ No newline at end of file