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 71b8b3491..d9b0907af 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 4acf191a4..929e9cf40 100644
--- a/briar-api/.classpath
+++ b/briar-api/.classpath
@@ -2,7 +2,6 @@
-
diff --git a/briar-api/libs/android.jar b/briar-api/libs/android.jar
deleted file mode 100644
index 6afa19ee0..000000000
Binary files a/briar-api/libs/android.jar and /dev/null differ
diff --git a/briar-core/.classpath b/briar-core/.classpath
index bc25b1378..7efe06ab2 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -2,15 +2,12 @@
+
+
+
+
-
-
-
-
-
-
-
diff --git a/briar-core/libs/source/jsocks-source.jar b/briar-core/libs/source/jsocks-source.jar
deleted file mode 100644
index bedbd79d4..000000000
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 082613caf..000000000
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 6151e1c9a..3a940bb73 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 0738053ab..5daeb37d4 100644
--- a/briar-desktop/.classpath
+++ b/briar-desktop/.classpath
@@ -2,15 +2,14 @@
-
-
+
+
+
-
-
-
+
+
-
diff --git a/briar-tests/.classpath b/briar-tests/.classpath
index 0cb0657ff..af3f2eaf8 100644
--- a/briar-tests/.classpath
+++ b/briar-tests/.classpath
@@ -2,17 +2,16 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-