diff --git a/briar-android/.classpath b/briar-android/.classpath
index 9651c7b62..589027c42 100644
--- a/briar-android/.classpath
+++ b/briar-android/.classpath
@@ -8,7 +8,7 @@
-
+
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 70b2d2d81..4845d4a95 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,18 +59,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -81,7 +69,7 @@
-
+
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index 3d154955e..c1ef8459b 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -13,7 +13,7 @@
-
+
@@ -28,5 +28,6 @@
+
\ No newline at end of file
diff --git a/briar-core/.classpath b/briar-core/.classpath
index db3b175cb..77c6f5461 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -7,6 +7,6 @@
-
+
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 3b5b4dce8..e3d45a9dd 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -13,7 +13,7 @@
-
+
@@ -29,8 +29,9 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/briar-core/libs/lcrypto-jdk15on-152.jar b/briar-core/libs/lcrypto-jdk15on-152.jar
deleted file mode 100644
index 3e5f8278b..000000000
Binary files a/briar-core/libs/lcrypto-jdk15on-152.jar and /dev/null differ
diff --git a/briar-core/libs/source/lcrypto-jdk15on-152-src.jar b/briar-core/libs/source/lcrypto-jdk15on-152-src.jar
deleted file mode 100644
index f3419a569..000000000
Binary files a/briar-core/libs/source/lcrypto-jdk15on-152-src.jar and /dev/null differ
diff --git a/briar-core/libs/spongy-core-1.53.jar b/briar-core/libs/spongy-core-1.53.jar
new file mode 100644
index 000000000..5322c3625
Binary files /dev/null and b/briar-core/libs/spongy-core-1.53.jar differ
diff --git a/briar-core/src/org/briarproject/db/H2Database.java b/briar-core/src/org/briarproject/db/H2Database.java
index 4eb28f89e..11d0df595 100644
--- a/briar-core/src/org/briarproject/db/H2Database.java
+++ b/briar-core/src/org/briarproject/db/H2Database.java
@@ -33,7 +33,7 @@ class H2Database extends JdbcDatabase {
super(HASH_TYPE, BINARY_TYPE, COUNTER_TYPE, SECRET_TYPE, clock);
this.config = config;
this.fileUtils = fileUtils;
- String path = new File(config.getDatabaseDirectory(), "db").getPath();
+ String path = new File(config.getDatabaseDirectory(), "db").getAbsolutePath();
// FIXME: Remove WRITE_DELAY=0 after implementing BTPv2?
url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1"
+ ";WRITE_DELAY=0;DB_CLOSE_ON_EXIT=false";
diff --git a/briar-desktop/briar-desktop.iml b/briar-desktop/briar-desktop.iml
index 84dc23fcf..4c554cbd7 100644
--- a/briar-desktop/briar-desktop.iml
+++ b/briar-desktop/briar-desktop.iml
@@ -13,7 +13,7 @@
-
+
@@ -30,8 +30,8 @@
-
-
+
+
@@ -39,5 +39,6 @@
+
\ No newline at end of file
diff --git a/briar-tests/.classpath b/briar-tests/.classpath
index a44f0f7d4..86bc550fd 100644
--- a/briar-tests/.classpath
+++ b/briar-tests/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/briar-tests/briar-tests.iml b/briar-tests/briar-tests.iml
index 54e209e64..5105bc023 100644
--- a/briar-tests/briar-tests.iml
+++ b/briar-tests/briar-tests.iml
@@ -13,7 +13,7 @@
-
+
@@ -30,8 +30,8 @@
-
-
+
+
diff --git a/briar-tests/src/org/briarproject/db/BasicH2Test.java b/briar-tests/src/org/briarproject/db/BasicH2Test.java
index c5ca6af83..9ddcd6dec 100644
--- a/briar-tests/src/org/briarproject/db/BasicH2Test.java
+++ b/briar-tests/src/org/briarproject/db/BasicH2Test.java
@@ -27,7 +27,7 @@ public class BasicH2Test extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
private final File db = new File(testDir, "db");
- private final String url = "jdbc:h2:" + db.getPath();
+ private final String url = "jdbc:h2:" + db.getAbsolutePath();
private Connection connection = null;
@@ -106,19 +106,19 @@ public class BasicH2Test extends BriarTestCase {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -128
+ 0, 0, 0, 0, 0, 0, 0, 0
};
byte[] second = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 127
};
byte[] third = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 127
+ 0, 0, 0, 0, 0, 0, 0, (byte) 255
};
// Create the table
createTable(connection);
diff --git a/patches/spongy.sh b/patches/spongy.sh
deleted file mode 100755
index a0d404335..000000000
--- a/patches/spongy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-dirs=(ant core docs jce mail pg pkix prov)
-
-for file in `find ${dirs[@]} -name bouncycastle`
-do
- path=`dirname $file`
- echo "Moving $file to $path/spongycastle"
- mv $file $path/spongycastle
-done
-
-for file in `grep -Rl bouncycastle ${dirs[@]}`
-do
- echo "Replacing string bouncycastle in $file"
- sed -i 's/bouncycastle/spongycastle/g' $file
-done
-