Reorganised Guice modules. Contribute entropy to pool on Linux/Android.

briar-android/src/org/briarproject/system/AndroidFileUtils.java

@@ -0,0 +1,19 @@
+package org.briarproject.system;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.briarproject.api.system.FileUtils;
+import android.os.Build;
+import android.os.StatFs;
+
+class AndroidFileUtils implements FileUtils {
+
+	@SuppressWarnings("deprecation")
+	public long getFreeSpace(File f) throws IOException {
+		if(Build.VERSION.SDK_INT >= 9) return f.getUsableSpace();
+		StatFs s = new StatFs(f.getAbsolutePath());
+		// These deprecated methods are the best thing available for SDK < 9
+		return (long) s.getAvailableBlocks() * s.getBlockSize();
+	}
+}