diff --git a/briar-core/libs/jsocks.jar b/briar-android/libs/jsocks.jar
similarity index 100%
rename from briar-core/libs/jsocks.jar
rename to briar-android/libs/jsocks.jar
diff --git a/briar-core/libs/jtorctl-briar.jar b/briar-android/libs/jtorctl-briar.jar
similarity index 100%
rename from briar-core/libs/jtorctl-briar.jar
rename to briar-android/libs/jtorctl-briar.jar
diff --git a/briar-android/src/net/sf/briar/android/AndroidModule.java b/briar-android/src/net/sf/briar/android/AndroidModule.java
index 71b8b34913344b1cfcd97f7dd38fdb9464993145..d9b0907af3eb2f11c368fc9543c96f46c83613a8 100644
--- a/briar-android/src/net/sf/briar/android/AndroidModule.java
+++ b/briar-android/src/net/sf/briar/android/AndroidModule.java
@@ -50,8 +50,8 @@ public class AndroidModule extends AbstractModule {
protected void configure() {
bind(AndroidExecutor.class).to(AndroidExecutorImpl.class);
- bind(ReferenceManager.class).to(ReferenceManagerImpl.class).in(
- Singleton.class);
+ bind(ReferenceManager.class).to(
+ ReferenceManagerImpl.class).in(Singleton.class);
}
@Provides @Singleton @DatabaseUiExecutor
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
rename to briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java b/briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
rename to briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothTransportConnection.java b/briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothTransportConnection.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothTransportConnection.java
rename to briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothTransportConnection.java
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/InsecureBluetooth.java b/briar-android/src/net/sf/briar/plugins/droidtooth/InsecureBluetooth.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/droidtooth/InsecureBluetooth.java
rename to briar-android/src/net/sf/briar/plugins/droidtooth/InsecureBluetooth.java
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java b/briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java
rename to briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java b/briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java
rename to briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java
diff --git a/briar-core/src/net/sf/briar/plugins/tor/TorPlugin.java b/briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/tor/TorPlugin.java
rename to briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java
diff --git a/briar-core/src/net/sf/briar/plugins/tor/TorPluginFactory.java b/briar-android/src/net/sf/briar/plugins/tor/TorPluginFactory.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/tor/TorPluginFactory.java
rename to briar-android/src/net/sf/briar/plugins/tor/TorPluginFactory.java
diff --git a/briar-core/src/net/sf/briar/plugins/tor/TorTransportConnection.java b/briar-android/src/net/sf/briar/plugins/tor/TorTransportConnection.java
similarity index 100%
rename from briar-core/src/net/sf/briar/plugins/tor/TorTransportConnection.java
rename to briar-android/src/net/sf/briar/plugins/tor/TorTransportConnection.java
diff --git a/briar-api/.classpath b/briar-api/.classpath
index 4acf191a4ad752a19f47b994e590aabab40d8aeb..929e9cf40a7785749eb851fb0c77f3dd69a28d06 100644
--- a/briar-api/.classpath
+++ b/briar-api/.classpath
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="libs/android.jar"/>
<classpathentry kind="lib" path="libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-api/libs/android.jar b/briar-api/libs/android.jar
deleted file mode 100644
index 6afa19ee007e4ecc2bc8eebcccf249ad4974e445..0000000000000000000000000000000000000000
Binary files a/briar-api/libs/android.jar and /dev/null differ
diff --git a/briar-core/.classpath b/briar-core/.classpath
index bc25b137846631ea4d1a009138575f3f9dfc218d..7efe06ab282cc632f536f4085b5721e6f825c5dc 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -2,15 +2,12 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
- <classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
- <classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/>
- <classpathentry kind="lib" path="libs/javax.inject.jar"/>
- <classpathentry kind="lib" path="libs/jsocks.jar" sourcepath="libs/source/jsocks-source.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
- <classpathentry kind="lib" path="/briar-api/libs/android.jar"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
- <classpathentry kind="lib" path="libs/jtorctl-briar.jar"/>
+ <classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/>
+ <classpathentry kind="lib" path="libs/javax.inject.jar"/>
+ <classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
+ <classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-core/libs/source/jsocks-source.jar b/briar-core/libs/source/jsocks-source.jar
deleted file mode 100644
index bedbd79d45ed788dc8b04777b3c8c761e973b050..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/source/jsocks-source.jar and /dev/null differ
diff --git a/briar-core/libs/source/jtorctl-briar-source.jar b/briar-core/libs/source/jtorctl-briar-source.jar
deleted file mode 100644
index 082613caffc87c78850e27def7ea5aeb73f83fbf..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/source/jtorctl-briar-source.jar and /dev/null differ
diff --git a/briar-core/src/net/sf/briar/util/FileUtils.java b/briar-core/src/net/sf/briar/util/FileUtils.java
index 6151e1c9a4a6e93d199dd893791a46c666e017ab..3a940bb738f2f6dac893b6a0d1ad2b3535a5c766 100644
--- a/briar-core/src/net/sf/briar/util/FileUtils.java
+++ b/briar-core/src/net/sf/briar/util/FileUtils.java
@@ -9,8 +9,6 @@ import java.security.CodeSource;
import org.apache.commons.io.FileSystemUtils;
-import android.os.StatFs;
-
public class FileUtils {
/**
@@ -87,12 +85,7 @@ public class FileUtils {
}
public static long getFreeSpace(File f) throws IOException {
- if(OsUtils.isAndroid()) {
- StatFs s = new StatFs(f.getAbsolutePath());
- return (long) s.getAvailableBlocks() * s.getBlockSize();
- } else {
- return FileSystemUtils.freeSpaceKb(f.getAbsolutePath()) * 1024;
- }
+ return FileSystemUtils.freeSpaceKb(f.getAbsolutePath()) * 1024;
}
public interface Callback {
diff --git a/briar-desktop/.classpath b/briar-desktop/.classpath
index 0738053ab2fdbe59377a96f69252f78923bd674e..5daeb37d40ebfd5b8b9d833bd47a6355724bf123 100644
--- a/briar-desktop/.classpath
+++ b/briar-desktop/.classpath
@@ -2,15 +2,14 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="libs/jnotify-0.93.jar"/>
- <classpathentry kind="lib" path="libs/jssc-0.9-briar.jar" sourcepath="libs/source/jssc-0.9-briar-source.jar"/>
- <classpathentry kind="lib" path="libs/bluecove-2.1.1-SNAPSHOT-briar.jar"/>
- <classpathentry kind="lib" path="libs/bluecove-gpl-2.1.1-SNAPSHOT.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
- <classpathentry kind="lib" path="/briar-api/libs/android.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
+ <classpathentry kind="lib" path="libs/bluecove-2.1.1-SNAPSHOT-briar.jar"/>
+ <classpathentry kind="lib" path="libs/bluecove-gpl-2.1.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="libs/jna-3.5.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="libs/jnotify-0.93.jar"/>
+ <classpathentry kind="lib" path="libs/jssc-0.9-briar.jar" sourcepath="libs/source/jssc-0.9-briar-source.jar"/>
<classpathentry kind="lib" path="libs/platform-3.5.2-SNAPSHOT.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-tests/.classpath b/briar-tests/.classpath
index 0cb0657ff59de10516ea18d00d1c1380bd3388f1..af3f2eaf88f5b3daacddb471b18b60ec581fa7cc 100644
--- a/briar-tests/.classpath
+++ b/briar-tests/.classpath
@@ -2,17 +2,16 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="libs/hamcrest-core-1.1.jar"/>
- <classpathentry kind="lib" path="libs/hamcrest-library-1.1.jar"/>
- <classpathentry kind="lib" path="libs/jmock-2.5.1.jar"/>
- <classpathentry kind="lib" path="libs/junit-4.9b3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
- <classpathentry kind="lib" path="/briar-api/libs/android.jar"/>
- <classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
- <classpathentry kind="lib" path="/briar-core/libs/commons-io-2.0.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-desktop"/>
+ <classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
+ <classpathentry kind="lib" path="/briar-core/libs/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="/briar-desktop/libs/jnotify-0.93.jar"/>
<classpathentry kind="lib" path="/briar-desktop/libs/jssc-0.9-briar.jar" sourcepath="/briar-desktop/libs/source/jssc-0.9-briar-source.jar"/>
+ <classpathentry kind="lib" path="libs/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="lib" path="libs/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="lib" path="libs/jmock-2.5.1.jar"/>
+ <classpathentry kind="lib" path="libs/junit-4.9b3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>