From 6d13c4e095ae344960e1f68d9a134f7931abe914 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Tue, 8 Dec 2015 11:05:03 +0100
Subject: [PATCH 1/7] improved git ignore

---
 .gitignore | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a2a5d98f..0c91c311c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,21 @@
-build
-.gradle
 .metadata
 *.tmp
-.idea
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Android Studio
+.idea
+.gradle
+build
+*.iml

From 43f562a7bc1c5e80480a64fd13d5e1ca1e8f40fc Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Tue, 8 Dec 2015 23:56:34 +0100
Subject: [PATCH 2/7] code and ui refactoring in the Password activity,
 encapsulation and wrappers.

---
 .../res/layout/activity_password.xml          |  61 +++++++++
 briar-android/res/values-v14/styles.xml       |   5 +
 briar-android/res/values/color.xml            |   2 +
 briar-android/res/values/dimens.xml           |  21 +++
 briar-android/res/values/strings.xml          |   4 +
 briar-android/res/values/styles.xml           |  17 +++
 .../briarproject/android/BaseActivity.java    |  56 ++++++++
 .../briarproject/android/BriarActivity.java   |   3 +-
 .../android/PasswordActivity.java             | 125 ++++++------------
 9 files changed, 208 insertions(+), 86 deletions(-)
 create mode 100644 briar-android/res/layout/activity_password.xml
 create mode 100644 briar-android/res/values/dimens.xml
 create mode 100644 briar-android/src/org/briarproject/android/BaseActivity.java

diff --git a/briar-android/res/layout/activity_password.xml b/briar-android/res/layout/activity_password.xml
new file mode 100644
index 000000000..5a306a79c
--- /dev/null
+++ b/briar-android/res/layout/activity_password.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/margin_activity_vertical"
+    android:paddingEnd="@dimen/margin_activity_horizontal"
+    android:paddingStart="@dimen/margin_activity_horizontal"
+    android:paddingTop="@dimen/margin_activity_vertical">
+
+    <TextView
+        android:id="@+id/title_password"
+        style="@style/BriarTextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:padding="@dimen/margin_large"
+        android:text="@string/enter_password" />
+
+    <EditText
+        android:id="@+id/edit_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title_password"
+        android:hint="@string/password_hint"
+        android:imeOptions="actionDone"
+        android:inputType="textPassword"
+        android:lines="1"
+        android:maxLines="1" />
+
+    <Button
+        android:id="@+id/btn_sign_in"
+        style="@style/BriarButton.Default"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/edit_password"
+        android:layout_marginTop="@dimen/margin_xlarge"
+        android:onClick="onSignInClick"
+        android:text="@string/sign_in_button" />
+
+    <ProgressBar
+        android:id="@+id/progress_wheel"
+        style="?android:attr/progressBarStyleInverse"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/btn_sign_in"
+        android:visibility="invisible" />
+
+    <TextView
+        style="@style/BriarTextBody"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/btn_sign_in"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/margin_large"
+        android:clickable="true"
+        android:onClick="onForgottenPasswordClick"
+        android:text="@string/forgotten_password"
+        android:textColor="?android:attr/textColorLink" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/briar-android/res/values-v14/styles.xml b/briar-android/res/values-v14/styles.xml
index 9fd201d23..c1fc08f07 100644
--- a/briar-android/res/values-v14/styles.xml
+++ b/briar-android/res/values-v14/styles.xml
@@ -9,4 +9,9 @@
         <item name="android:textColor">@color/action_bar_text</item>
         <item name="android:background">@color/action_bar_background</item>
     </style>
+
+    <style name="BriarButton.Default">
+        <item name="android:textAllCaps">true</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index 00b5d2412..18e88d64c 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -14,4 +14,6 @@
 	<color name="no_posts">#AAAAAA</color>
 	<color name="settings_title_text">#2D3E50</color>
 	<color name="settings_title_underline">#2D3E50</color>
+
+    <color name="text_link">#2D3E50</color>
 </resources>
\ No newline at end of file
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
new file mode 100644
index 000000000..35c316f12
--- /dev/null
+++ b/briar-android/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<resources>
+
+	<!-- Default screen margins, per the Android Design guidelines. -->
+	<dimen name="margin_activity_horizontal">16dp</dimen>
+	<dimen name="margin_activity_vertical">16dp</dimen>
+
+	<dimen name="margin_seperator">1dp</dimen>
+	<dimen name="margin_tiny">2dp</dimen>
+	<dimen name="margin_small">4dp</dimen>
+	<dimen name="margin_medium">8dp</dimen>
+	<dimen name="margin_large">16dp</dimen>
+	<dimen name="margin_xlarge">32dp</dimen>
+
+	<!-- v2 dimens -->
+	<dimen name="text_size_tiny">12sp</dimen>
+	<dimen name="text_size_small">14sp</dimen>
+	<dimen name="text_size_medium">16sp</dimen>
+	<dimen name="text_size_large">20sp</dimen>
+	<dimen name="text_size_xlarge">34sp</dimen>
+
+</resources>
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index d429004d6..f14644bd5 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+
     <string name="app_name">Briar</string>
     <string name="crash_report_title">Briar Crash Report</string>
     <string name="ongoing_notification_title">Signed into Briar</string>
@@ -13,6 +15,8 @@
     <string name="passwords_do_not_match">Passwords do not match</string>
     <string name="create_account_button">Create Account</string>
     <string name="enter_password">Enter your password:</string>
+    <string name="password_hint">Password</string>
+    <string name="forgotten_password">I have forgotten my password</string>
     <string name="try_again">Wrong password, try again:</string>
     <string name="sign_in_button">Sign In</string>
     <string name="startup_failed_notification_title">Briar could not start</string>
diff --git a/briar-android/res/values/styles.xml b/briar-android/res/values/styles.xml
index 79b84d8b7..4c5928922 100644
--- a/briar-android/res/values/styles.xml
+++ b/briar-android/res/values/styles.xml
@@ -12,4 +12,21 @@
     <style name="WindowTitleBackground">
         <item name="android:background">@color/action_bar_background</item>
     </style>
+
+    <style name="BriarButton">
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:padding">@dimen/margin_large</item>
+    </style>
+
+    <style name="BriarButton.Default"/>
+
+    <style name="BriarTextTitle">
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+    </style>
+
+    <style name="BriarTextBody">
+        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java
new file mode 100644
index 000000000..61efc68bd
--- /dev/null
+++ b/briar-android/src/org/briarproject/android/BaseActivity.java
@@ -0,0 +1,56 @@
+package org.briarproject.android;
+
+import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
+import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.inputmethod.InputMethodManager;
+
+import roboguice.activity.RoboActivity;
+
+public abstract class BaseActivity extends RoboActivity {
+
+    private final static String PREFS_DB = "db";
+    private final static String KEY_DB_KEY = "key";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
+    }
+
+    private SharedPreferences getBriarPrefs(String prefsName) {
+        return getSharedPreferences(prefsName, MODE_PRIVATE);
+    }
+
+    protected String getDbKeyInHex() {
+        return getBriarPrefs(PREFS_DB).getString(KEY_DB_KEY, null);
+    }
+
+    private void clearPrefs(String prefsName) {
+        SharedPreferences.Editor editor = getBriarPrefs(prefsName).edit();
+        editor.clear();
+        editor.apply();
+    }
+
+    protected void clearDbPrefs() {
+        this.clearPrefs(PREFS_DB);
+    }
+
+    protected void gotoAndFinish(Class classInstance, int resultCode) {
+        if (resultCode != Integer.MIN_VALUE)
+            this.setResult(resultCode);
+        this.startActivity(new Intent(this, classInstance));
+        this.finish();
+    }
+
+    protected void hideSoftKeyboard()
+    {
+        Object o = getSystemService(INPUT_METHOD_SERVICE);
+        ((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
+    }
+}
diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index e098bfee7..49a025914 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.view.inputmethod.InputMethodManager;
 
 @SuppressLint("Registered")
-public class BriarActivity extends RoboActivity {
+public class BriarActivity extends BaseActivity {
 
 	public static final int REQUEST_PASSWORD = 1;
 
@@ -45,7 +45,6 @@ public class BriarActivity extends RoboActivity {
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
-		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 		if (databaseConfig.getEncryptionKey() != null) startAndBindService();
 	}
 
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index c3437852d..497e2eb83 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -1,17 +1,7 @@
 package org.briarproject.android;
 
-import static android.text.InputType.TYPE_CLASS_TEXT;
-import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
-import static android.view.Gravity.CENTER;
-import static android.view.Gravity.CENTER_HORIZONTAL;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
-import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
-import static android.widget.LinearLayout.VERTICAL;
-import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
-import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.io.File;
 import java.util.concurrent.Executor;
@@ -19,37 +9,32 @@ import java.util.concurrent.Executor;
 import javax.inject.Inject;
 
 import org.briarproject.R;
-import org.briarproject.android.util.FixedVerticalSpace;
-import org.briarproject.android.util.LayoutUtils;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.SecretKey;
 import org.briarproject.api.db.DatabaseConfig;
 import org.briarproject.util.StringUtils;
 
-import roboguice.activity.RoboActivity;
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.Editable;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-public class PasswordActivity extends RoboActivity {
+public class PasswordActivity extends BaseActivity {
 
 	@Inject @CryptoExecutor private Executor cryptoExecutor;
-	private TextView enterPassword = null;
-	private EditText passwordEntry = null;
-	private Button signInButton = null;
-	private ProgressBar progress = null;
+	private Button mSignInButton;
+	private ProgressBar mProgress;
+	private TextView mTitle;
+	private EditText mPassword;
+
+	private byte[] encrypted;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject private volatile CryptoComponent crypto;
@@ -59,66 +44,42 @@ public class PasswordActivity extends RoboActivity {
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
-		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
-
-		SharedPreferences prefs = getSharedPreferences("db", MODE_PRIVATE);
-		String hex = prefs.getString("key", null);
+		String hex = this.getDbKeyInHex();
 		if (hex == null || !databaseConfig.databaseExists()) {
-			// Storage has been deleted - clean up and return to setup
-			prefs.edit().clear().commit();
-			delete(databaseConfig.getDatabaseDirectory());
-			setResult(RESULT_CANCELED);
-			startActivity(new Intent(this, SetupActivity.class));
-			finish();
+			this.clearDbPrefs();
 			return;
 		}
-		final byte[] encrypted = StringUtils.fromHexString(hex);
+		this.encrypted = StringUtils.fromHexString(hex);
 
-		LinearLayout layout = new LinearLayout(this);
-		layout.setLayoutParams(MATCH_MATCH);
-		layout.setOrientation(VERTICAL);
-		layout.setGravity(CENTER_HORIZONTAL);
-		int pad = LayoutUtils.getPadding(this);
-		layout.setPadding(pad, pad, pad, pad);
-
-		enterPassword = new TextView(this);
-		enterPassword.setGravity(CENTER);
-		enterPassword.setTextSize(18);
-		enterPassword.setText(R.string.enter_password);
-		layout.addView(enterPassword);
-
-		passwordEntry = new EditText(this);
-		passwordEntry.setId(1);
-		passwordEntry.setMaxLines(1);
-		int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_PASSWORD;
-		passwordEntry.setInputType(inputType);
-		passwordEntry.setOnEditorActionListener(new OnEditorActionListener() {
-			public boolean onEditorAction(TextView v, int action, KeyEvent e) {
-				validatePassword(encrypted, passwordEntry.getText());
-				return true;
+		this.setContentView(R.layout.activity_password);
+		this.mSignInButton = (Button)findViewById(R.id.btn_sign_in);
+		this.mProgress = (ProgressBar)findViewById(R.id.progress_wheel);
+		this.mTitle = (TextView)findViewById(R.id.title_password);
+		this.mPassword = (EditText)findViewById(R.id.edit_password);
+		this.mPassword.setOnEditorActionListener(new OnEditorActionListener() {
+			@Override
+			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+				if (actionId == EditorInfo.IME_ACTION_DONE) {
+					validatePassword(encrypted, PasswordActivity.this.mPassword.getText());
+				}
+				return false;
 			}
 		});
-		layout.addView(passwordEntry);
+	}
 
-		// Adjusting the padding of buttons and EditTexts has the wrong results
-		layout.addView(new FixedVerticalSpace(this));
+	@Override
+	protected void clearDbPrefs() {
+		super.clearDbPrefs();
+		this.delete(databaseConfig.getDatabaseDirectory());
+		this.gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
+	}
 
-		signInButton = new Button(this);
-		signInButton.setLayoutParams(WRAP_WRAP);
-		signInButton.setText(R.string.sign_in_button);
-		signInButton.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				validatePassword(encrypted, passwordEntry.getText());
-			}
-		});
-		layout.addView(signInButton);
+	public void onSignInClick(View v) {
+		this.validatePassword(this.encrypted, this.mPassword.getText());
+	}
 
-		progress = new ProgressBar(this);
-		progress.setLayoutParams(WRAP_WRAP);
-		progress.setIndeterminate(true);
-		progress.setVisibility(GONE);
-		layout.addView(progress);
-		setContentView(layout);
+	public void onForgottenPasswordClick(View v) {
+		this.clearDbPrefs();
 	}
 
 	private void delete(File f) {
@@ -127,13 +88,10 @@ public class PasswordActivity extends RoboActivity {
 	}
 
 	private void validatePassword(final byte[] encrypted, Editable e) {
-		if (progress == null) return; // Not created yet
-		// Hide the soft keyboard
-		Object o = getSystemService(INPUT_METHOD_SERVICE);
-		((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
+		this.hideSoftKeyboard();
 		// Replace the button with a progress bar
-		signInButton.setVisibility(GONE);
-		progress.setVisibility(VISIBLE);
+		this.mSignInButton.setVisibility(View.INVISIBLE);
+		this.mProgress.setVisibility(VISIBLE);
 		// Decrypt the database key in a background thread
 		final String password = e.toString();
 		cryptoExecutor.execute(new Runnable() {
@@ -152,10 +110,9 @@ public class PasswordActivity extends RoboActivity {
 	private void tryAgain() {
 		runOnUiThread(new Runnable() {
 			public void run() {
-				enterPassword.setText(R.string.try_again);
-				passwordEntry.setText("");
-				signInButton.setVisibility(VISIBLE);
-				progress.setVisibility(GONE);
+				PasswordActivity.this.mTitle.setText(R.string.try_again);
+				PasswordActivity.this.mSignInButton.setVisibility(VISIBLE);
+				PasswordActivity.this.mProgress.setVisibility(GONE);
 			}
 		});
 	}

From 428c3dd1b202f83c255feb41f617f17d95753897 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Wed, 9 Dec 2015 00:08:08 +0100
Subject: [PATCH 3/7] Fixed lost code from merge

---
 briar-android/src/org/briarproject/android/PasswordActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 497e2eb83..736991d90 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -113,6 +113,7 @@ public class PasswordActivity extends BaseActivity {
 				PasswordActivity.this.mTitle.setText(R.string.try_again);
 				PasswordActivity.this.mSignInButton.setVisibility(VISIBLE);
 				PasswordActivity.this.mProgress.setVisibility(GONE);
+				PasswordActivity.this.mPassword.setText("");
 			}
 		});
 	}

From 2052c8456f37404a4d97a2e92e49c42346141163 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Wed, 9 Dec 2015 10:29:34 +0100
Subject: [PATCH 4/7] Added a dialog and refactored code

---
 briar-android/briar-android.iml               | 12 ++++++++++
 briar-android/res/values/strings.xml          |  6 +++++
 .../briarproject/android/BaseActivity.java    |  5 ++++
 .../android/PasswordActivity.java             | 24 +++++++++++++------
 .../android/util/BriarIOUtils.java            | 18 ++++++++++++++
 5 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 briar-android/src/org/briarproject/android/util/BriarIOUtils.java

diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index c465a22dc..87ea58344 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,6 +59,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index f14644bd5..2a3b21c7a 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -16,6 +16,8 @@
     <string name="create_account_button">Create Account</string>
     <string name="enter_password">Enter your password:</string>
     <string name="password_hint">Password</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
     <string name="forgotten_password">I have forgotten my password</string>
     <string name="try_again">Wrong password, try again:</string>
     <string name="sign_in_button">Sign In</string>
@@ -108,4 +110,8 @@
     <string name="notify_sound_setting_default">Default ringtone</string>
     <string name="notify_sound_setting_disabled">None</string>
     <string name="choose_ringtone_title">Choose ringtone</string>
+
+    <!-- Dialogs -->
+    <string name="dialog_title_lost_password">Lost password</string>
+    <string name="dialog_message_lost_password">Password recovery is not possible. Do you wish to delete your user and re-register ?</string>
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java
index 61efc68bd..db3628f06 100644
--- a/briar-android/src/org/briarproject/android/BaseActivity.java
+++ b/briar-android/src/org/briarproject/android/BaseActivity.java
@@ -48,6 +48,11 @@ public abstract class BaseActivity extends RoboActivity {
         this.finish();
     }
 
+    protected void gotoAndFinish(Class classInstance)
+    {
+        this.gotoAndFinish(classInstance, Integer.MIN_VALUE);
+    }
+
     protected void hideSoftKeyboard()
     {
         Object o = getSystemService(INPUT_METHOD_SERVICE);
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 736991d90..86c3bc02e 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -9,12 +9,15 @@ import java.util.concurrent.Executor;
 import javax.inject.Inject;
 
 import org.briarproject.R;
+import org.briarproject.android.util.BriarIOUtils;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.SecretKey;
 import org.briarproject.api.db.DatabaseConfig;
 import org.briarproject.util.StringUtils;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Editable;
 import android.view.KeyEvent;
@@ -70,7 +73,7 @@ public class PasswordActivity extends BaseActivity {
 	@Override
 	protected void clearDbPrefs() {
 		super.clearDbPrefs();
-		this.delete(databaseConfig.getDatabaseDirectory());
+		BriarIOUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
 		this.gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
 	}
 
@@ -79,12 +82,19 @@ public class PasswordActivity extends BaseActivity {
 	}
 
 	public void onForgottenPasswordClick(View v) {
-		this.clearDbPrefs();
-	}
-
-	private void delete(File f) {
-		if (f.isFile()) f.delete();
-		else if (f.isDirectory()) for (File child : f.listFiles()) delete(child);
+		// TODO Encapsulate the dialog in a re-usable fragment
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle(R.string.dialog_title_lost_password);
+		builder.setMessage(R.string.dialog_message_lost_password);
+		builder.setNegativeButton(R.string.no, null);
+		builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				PasswordActivity.this.clearDbPrefs();
+			}
+		});
+		AlertDialog dialog = builder.create();
+		dialog.show();
 	}
 
 	private void validatePassword(final byte[] encrypted, Editable e) {
diff --git a/briar-android/src/org/briarproject/android/util/BriarIOUtils.java b/briar-android/src/org/briarproject/android/util/BriarIOUtils.java
new file mode 100644
index 000000000..f4a9ff38f
--- /dev/null
+++ b/briar-android/src/org/briarproject/android/util/BriarIOUtils.java
@@ -0,0 +1,18 @@
+package org.briarproject.android.util;
+
+import java.io.File;
+
+/**
+ * Created by Ernir Erlingsson (ernir@ymirmobile.com) on 9.12.2015.
+ */
+public class BriarIOUtils {
+
+    public static void deleteFileOrDir(File f)
+    {
+        if (f.isFile())
+            f.delete();
+        else if (f.isDirectory())
+            for (File child : f.listFiles())
+                deleteFileOrDir(child);
+    }
+}

From b83fe85910890f271b3b2910161859ffaadf4f9a Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Wed, 9 Dec 2015 11:50:26 +0100
Subject: [PATCH 5/7] code re-structure, mostly nitpicks :)

---
 .../briarproject/android/BaseActivity.java    | 70 +++++++++----------
 .../android/PasswordActivity.java             | 53 +++++++-------
 .../android/util/BriarIOUtils.java            | 18 -----
 .../briarproject/system/AndroidFileUtils.java |  8 +++
 4 files changed, 68 insertions(+), 81 deletions(-)
 delete mode 100644 briar-android/src/org/briarproject/android/util/BriarIOUtils.java

diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java
index db3628f06..f2b2fdeef 100644
--- a/briar-android/src/org/briarproject/android/BaseActivity.java
+++ b/briar-android/src/org/briarproject/android/BaseActivity.java
@@ -13,49 +13,47 @@ import roboguice.activity.RoboActivity;
 
 public abstract class BaseActivity extends RoboActivity {
 
-    private final static String PREFS_DB = "db";
-    private final static String KEY_DB_KEY = "key";
+	private final static String PREFS_DB = "db";
+	private final static String KEY_DB_KEY = "key";
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 
-        if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
-    }
+		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
+	}
 
-    private SharedPreferences getBriarPrefs(String prefsName) {
-        return getSharedPreferences(prefsName, MODE_PRIVATE);
-    }
+	private SharedPreferences getBriarPrefs(String prefsName) {
+		return getSharedPreferences(prefsName, MODE_PRIVATE);
+	}
 
-    protected String getDbKeyInHex() {
-        return getBriarPrefs(PREFS_DB).getString(KEY_DB_KEY, null);
-    }
+	protected String getDbKeyInHex() {
+		return getBriarPrefs(PREFS_DB).getString(KEY_DB_KEY, null);
+	}
 
-    private void clearPrefs(String prefsName) {
-        SharedPreferences.Editor editor = getBriarPrefs(prefsName).edit();
-        editor.clear();
-        editor.apply();
-    }
+	private void clearPrefs(String prefsName) {
+		SharedPreferences.Editor editor = getBriarPrefs(prefsName).edit();
+		editor.clear();
+		editor.apply();
+	}
 
-    protected void clearDbPrefs() {
-        this.clearPrefs(PREFS_DB);
-    }
+	protected void clearDbPrefs() {
+		this.clearPrefs(PREFS_DB);
+	}
 
-    protected void gotoAndFinish(Class classInstance, int resultCode) {
-        if (resultCode != Integer.MIN_VALUE)
-            this.setResult(resultCode);
-        this.startActivity(new Intent(this, classInstance));
-        this.finish();
-    }
+	protected void gotoAndFinish(Class classInstance, int resultCode) {
+		if (resultCode != Integer.MIN_VALUE)
+			setResult(resultCode);
+		startActivity(new Intent(this, classInstance));
+		finish();
+	}
 
-    protected void gotoAndFinish(Class classInstance)
-    {
-        this.gotoAndFinish(classInstance, Integer.MIN_VALUE);
-    }
+	protected void gotoAndFinish(Class classInstance) {
+		gotoAndFinish(classInstance, Integer.MIN_VALUE);
+	}
 
-    protected void hideSoftKeyboard()
-    {
-        Object o = getSystemService(INPUT_METHOD_SERVICE);
-        ((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
-    }
+	protected void hideSoftKeyboard() {
+		Object o = getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
+	}
 }
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 86c3bc02e..3d5ecd5e1 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -3,17 +3,16 @@ package org.briarproject.android;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
-import java.io.File;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 
 import org.briarproject.R;
-import org.briarproject.android.util.BriarIOUtils;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.SecretKey;
 import org.briarproject.api.db.DatabaseConfig;
+import org.briarproject.system.AndroidFileUtils;
 import org.briarproject.util.StringUtils;
 
 import android.app.AlertDialog;
@@ -32,10 +31,10 @@ import android.widget.TextView.OnEditorActionListener;
 public class PasswordActivity extends BaseActivity {
 
 	@Inject @CryptoExecutor private Executor cryptoExecutor;
-	private Button mSignInButton;
-	private ProgressBar mProgress;
-	private TextView mTitle;
-	private EditText mPassword;
+	private Button signInButton;
+	private ProgressBar progress;
+	private TextView title;
+	private EditText password;
 
 	private byte[] encrypted;
 
@@ -47,23 +46,23 @@ public class PasswordActivity extends BaseActivity {
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
-		String hex = this.getDbKeyInHex();
+		String hex = getDbKeyInHex();
 		if (hex == null || !databaseConfig.databaseExists()) {
-			this.clearDbPrefs();
+			clearDbPrefs();
 			return;
 		}
-		this.encrypted = StringUtils.fromHexString(hex);
+		encrypted = StringUtils.fromHexString(hex);
 
-		this.setContentView(R.layout.activity_password);
-		this.mSignInButton = (Button)findViewById(R.id.btn_sign_in);
-		this.mProgress = (ProgressBar)findViewById(R.id.progress_wheel);
-		this.mTitle = (TextView)findViewById(R.id.title_password);
-		this.mPassword = (EditText)findViewById(R.id.edit_password);
-		this.mPassword.setOnEditorActionListener(new OnEditorActionListener() {
+		setContentView(R.layout.activity_password);
+		signInButton = (Button)findViewById(R.id.btn_sign_in);
+		progress = (ProgressBar)findViewById(R.id.progress_wheel);
+		title = (TextView)findViewById(R.id.title_password);
+		password = (EditText)findViewById(R.id.edit_password);
+		password.setOnEditorActionListener(new OnEditorActionListener() {
 			@Override
 			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
 				if (actionId == EditorInfo.IME_ACTION_DONE) {
-					validatePassword(encrypted, PasswordActivity.this.mPassword.getText());
+					validatePassword(encrypted, password.getText());
 				}
 				return false;
 			}
@@ -73,12 +72,12 @@ public class PasswordActivity extends BaseActivity {
 	@Override
 	protected void clearDbPrefs() {
 		super.clearDbPrefs();
-		BriarIOUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
-		this.gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
+		AndroidFileUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
+		gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
 	}
 
 	public void onSignInClick(View v) {
-		this.validatePassword(this.encrypted, this.mPassword.getText());
+		validatePassword(encrypted, password.getText());
 	}
 
 	public void onForgottenPasswordClick(View v) {
@@ -90,7 +89,7 @@ public class PasswordActivity extends BaseActivity {
 		builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				PasswordActivity.this.clearDbPrefs();
+				clearDbPrefs();
 			}
 		});
 		AlertDialog dialog = builder.create();
@@ -98,10 +97,10 @@ public class PasswordActivity extends BaseActivity {
 	}
 
 	private void validatePassword(final byte[] encrypted, Editable e) {
-		this.hideSoftKeyboard();
+		hideSoftKeyboard();
 		// Replace the button with a progress bar
-		this.mSignInButton.setVisibility(View.INVISIBLE);
-		this.mProgress.setVisibility(VISIBLE);
+		signInButton.setVisibility(View.INVISIBLE);
+		progress.setVisibility(VISIBLE);
 		// Decrypt the database key in a background thread
 		final String password = e.toString();
 		cryptoExecutor.execute(new Runnable() {
@@ -120,10 +119,10 @@ public class PasswordActivity extends BaseActivity {
 	private void tryAgain() {
 		runOnUiThread(new Runnable() {
 			public void run() {
-				PasswordActivity.this.mTitle.setText(R.string.try_again);
-				PasswordActivity.this.mSignInButton.setVisibility(VISIBLE);
-				PasswordActivity.this.mProgress.setVisibility(GONE);
-				PasswordActivity.this.mPassword.setText("");
+				title.setText(R.string.try_again);
+				signInButton.setVisibility(VISIBLE);
+				progress.setVisibility(GONE);
+				password.setText("");
 			}
 		});
 	}
diff --git a/briar-android/src/org/briarproject/android/util/BriarIOUtils.java b/briar-android/src/org/briarproject/android/util/BriarIOUtils.java
deleted file mode 100644
index f4a9ff38f..000000000
--- a/briar-android/src/org/briarproject/android/util/BriarIOUtils.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.briarproject.android.util;
-
-import java.io.File;
-
-/**
- * Created by Ernir Erlingsson (ernir@ymirmobile.com) on 9.12.2015.
- */
-public class BriarIOUtils {
-
-    public static void deleteFileOrDir(File f)
-    {
-        if (f.isFile())
-            f.delete();
-        else if (f.isDirectory())
-            for (File child : f.listFiles())
-                deleteFileOrDir(child);
-    }
-}
diff --git a/briar-android/src/org/briarproject/system/AndroidFileUtils.java b/briar-android/src/org/briarproject/system/AndroidFileUtils.java
index c0beb54d8..3a5dfa352 100644
--- a/briar-android/src/org/briarproject/system/AndroidFileUtils.java
+++ b/briar-android/src/org/briarproject/system/AndroidFileUtils.java
@@ -14,4 +14,12 @@ public class AndroidFileUtils implements FileUtils {
 	public long getFreeSpace(File f) throws IOException {
 		return f.getUsableSpace();
 	}
+
+	public static void deleteFileOrDir(File f) {
+		if (f.isFile())
+			f.delete();
+		else if (f.isDirectory())
+			for (File child : f.listFiles())
+				deleteFileOrDir(child);
+	}
 }

From 8c0f295879a914821ff57657899a9ca1119be6e0 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Thu, 10 Dec 2015 10:49:28 +0100
Subject: [PATCH 6/7] Added dependency injections for FileUtils and removed
 redundant code

---
 .../android/CrashReportActivity.java          |  5 ++--
 .../android/PasswordActivity.java             |  5 ++--
 .../briarproject/system/AndroidFileUtils.java | 25 -------------------
 .../system/AndroidSystemModule.java           |  2 +-
 .../briarproject/api/system/FileUtils.java    |  2 ++
 .../briarproject/system/FileUtilsImpl.java    | 25 +++++++++++++++++++
 .../briarproject/system/DesktopFileUtils.java | 17 -------------
 .../system/DesktopSystemModule.java           |  2 +-
 .../org/briarproject/TestDatabaseModule.java  |  3 ++-
 .../src/org/briarproject/TestFileUtils.java   | 17 -------------
 .../org/briarproject/db/H2DatabaseTest.java   |  4 +--
 .../file/RemovableDrivePluginTest.java        |  5 ++--
 12 files changed, 42 insertions(+), 70 deletions(-)
 delete mode 100644 briar-android/src/org/briarproject/system/AndroidFileUtils.java
 create mode 100644 briar-core/src/org/briarproject/system/FileUtilsImpl.java
 delete mode 100644 briar-desktop/src/org/briarproject/system/DesktopFileUtils.java
 delete mode 100644 briar-tests/src/org/briarproject/TestFileUtils.java

diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java
index 539591cb7..a2b8b2ac9 100644
--- a/briar-android/src/org/briarproject/android/CrashReportActivity.java
+++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java
@@ -45,7 +45,6 @@ import org.briarproject.android.util.LayoutUtils;
 import org.briarproject.android.util.ListLoadingProgressBar;
 import org.briarproject.api.android.AndroidExecutor;
 import org.briarproject.api.system.FileUtils;
-import org.briarproject.system.AndroidFileUtils;
 import org.briarproject.util.StringUtils;
 
 import android.annotation.SuppressLint;
@@ -71,12 +70,14 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import javax.inject.Inject;
+
 public class CrashReportActivity extends Activity implements OnClickListener {
 
 	private static final Logger LOG =
 			Logger.getLogger(CrashReportActivity.class.getName());
 
-	private final FileUtils fileUtils = new AndroidFileUtils();
+	@Inject private FileUtils fileUtils;
 	private final AndroidExecutor androidExecutor = new AndroidExecutorImpl();
 
 	private ScrollView scroll = null;
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 3d5ecd5e1..383fa88b8 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -12,7 +12,7 @@ import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.SecretKey;
 import org.briarproject.api.db.DatabaseConfig;
-import org.briarproject.system.AndroidFileUtils;
+import org.briarproject.api.system.FileUtils;
 import org.briarproject.util.StringUtils;
 
 import android.app.AlertDialog;
@@ -41,6 +41,7 @@ public class PasswordActivity extends BaseActivity {
 	// Fields that are accessed from background threads must be volatile
 	@Inject private volatile CryptoComponent crypto;
 	@Inject private volatile DatabaseConfig databaseConfig;
+	@Inject private FileUtils fileUtils;
 
 	@Override
 	public void onCreate(Bundle state) {
@@ -72,7 +73,7 @@ public class PasswordActivity extends BaseActivity {
 	@Override
 	protected void clearDbPrefs() {
 		super.clearDbPrefs();
-		AndroidFileUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
+		fileUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
 		gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
 	}
 
diff --git a/briar-android/src/org/briarproject/system/AndroidFileUtils.java b/briar-android/src/org/briarproject/system/AndroidFileUtils.java
deleted file mode 100644
index 3a5dfa352..000000000
--- a/briar-android/src/org/briarproject/system/AndroidFileUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.briarproject.system;
-
-import org.briarproject.api.system.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-
-public class AndroidFileUtils implements FileUtils {
-
-	public long getTotalSpace(File f) throws IOException {
-		return f.getTotalSpace();
-	}
-
-	public long getFreeSpace(File f) throws IOException {
-		return f.getUsableSpace();
-	}
-
-	public static void deleteFileOrDir(File f) {
-		if (f.isFile())
-			f.delete();
-		else if (f.isDirectory())
-			for (File child : f.listFiles())
-				deleteFileOrDir(child);
-	}
-}
diff --git a/briar-android/src/org/briarproject/system/AndroidSystemModule.java b/briar-android/src/org/briarproject/system/AndroidSystemModule.java
index aa6769e59..03fd56dcc 100644
--- a/briar-android/src/org/briarproject/system/AndroidSystemModule.java
+++ b/briar-android/src/org/briarproject/system/AndroidSystemModule.java
@@ -14,7 +14,7 @@ public class AndroidSystemModule extends AbstractModule {
 		bind(Clock.class).to(SystemClock.class);
 		bind(Timer.class).to(SystemTimer.class);
 		bind(SeedProvider.class).to(AndroidSeedProvider.class);
-		bind(FileUtils.class).to(AndroidFileUtils.class);
+		bind(FileUtils.class).to(FileUtilsImpl.class);
 		bind(LocationUtils.class).to(AndroidLocationUtils.class);
 	}
 }
diff --git a/briar-api/src/org/briarproject/api/system/FileUtils.java b/briar-api/src/org/briarproject/api/system/FileUtils.java
index bde396049..baf68ca01 100644
--- a/briar-api/src/org/briarproject/api/system/FileUtils.java
+++ b/briar-api/src/org/briarproject/api/system/FileUtils.java
@@ -8,4 +8,6 @@ public interface FileUtils {
 	long getTotalSpace(File f) throws IOException;
 
 	long getFreeSpace(File f) throws IOException;
+
+	void deleteFileOrDir(File f);
 }
diff --git a/briar-core/src/org/briarproject/system/FileUtilsImpl.java b/briar-core/src/org/briarproject/system/FileUtilsImpl.java
new file mode 100644
index 000000000..923f35c9a
--- /dev/null
+++ b/briar-core/src/org/briarproject/system/FileUtilsImpl.java
@@ -0,0 +1,25 @@
+package org.briarproject.system;
+
+import org.briarproject.api.system.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+public class FileUtilsImpl implements FileUtils {
+
+    public long getTotalSpace(File f) throws IOException {
+        return f.getTotalSpace(); // Requires Java 1.6
+    }
+
+    public long getFreeSpace(File f) throws IOException {
+        return f.getUsableSpace(); // Requires Java 1.6
+    }
+
+    public void deleteFileOrDir(File f) {
+        if (f.isFile())
+            f.delete();
+        else if (f.isDirectory())
+            for (File child : f.listFiles())
+                deleteFileOrDir(child);
+    }
+}
diff --git a/briar-desktop/src/org/briarproject/system/DesktopFileUtils.java b/briar-desktop/src/org/briarproject/system/DesktopFileUtils.java
deleted file mode 100644
index c39706864..000000000
--- a/briar-desktop/src/org/briarproject/system/DesktopFileUtils.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.briarproject.system;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.briarproject.api.system.FileUtils;
-
-class DesktopFileUtils implements FileUtils {
-
-	public long getTotalSpace(File f) throws IOException {
-		return f.getTotalSpace(); // Requires Java 1.6
-	}
-
-	public long getFreeSpace(File f) throws IOException {
-		return f.getUsableSpace(); // Requires Java 1.6
-	}
-}
diff --git a/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java b/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
index e6286d17d..e605fe950 100644
--- a/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
+++ b/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
@@ -15,6 +15,6 @@ public class DesktopSystemModule extends AbstractModule {
 		bind(Timer.class).to(SystemTimer.class);
 		if (OsUtils.isLinux())
 			bind(SeedProvider.class).to(LinuxSeedProvider.class);
-		bind(FileUtils.class).to(DesktopFileUtils.class);
+		bind(FileUtils.class).to(FileUtilsImpl.class);
 	}
 }
diff --git a/briar-tests/src/org/briarproject/TestDatabaseModule.java b/briar-tests/src/org/briarproject/TestDatabaseModule.java
index 8cff99d56..5e5128eca 100644
--- a/briar-tests/src/org/briarproject/TestDatabaseModule.java
+++ b/briar-tests/src/org/briarproject/TestDatabaseModule.java
@@ -4,6 +4,7 @@ import java.io.File;
 
 import org.briarproject.api.db.DatabaseConfig;
 import org.briarproject.api.system.FileUtils;
+import org.briarproject.system.FileUtilsImpl;
 
 import com.google.inject.AbstractModule;
 
@@ -25,6 +26,6 @@ public class TestDatabaseModule extends AbstractModule {
 
 	protected void configure() {
 		bind(DatabaseConfig.class).toInstance(config);
-		bind(FileUtils.class).to(TestFileUtils.class);
+		bind(FileUtils.class).to(FileUtilsImpl.class);
 	}
 }
diff --git a/briar-tests/src/org/briarproject/TestFileUtils.java b/briar-tests/src/org/briarproject/TestFileUtils.java
deleted file mode 100644
index e81b16bde..000000000
--- a/briar-tests/src/org/briarproject/TestFileUtils.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.briarproject;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.briarproject.api.system.FileUtils;
-
-public class TestFileUtils implements FileUtils {
-
-	public long getTotalSpace(File f) throws IOException {
-		return f.getTotalSpace(); // Requires Java 1.6
-	}
-
-	public long getFreeSpace(File f) throws IOException {
-		return f.getUsableSpace(); // Requires Java 1.6
-	}
-}
diff --git a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
index ec21e4c6c..ce0ac374e 100644
--- a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
+++ b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.briarproject.BriarTestCase;
 import org.briarproject.TestDatabaseConfig;
-import org.briarproject.TestFileUtils;
 import org.briarproject.TestMessage;
 import org.briarproject.TestUtils;
 import org.briarproject.api.Author;
@@ -39,6 +38,7 @@ import org.briarproject.api.messaging.Message;
 import org.briarproject.api.messaging.MessageId;
 import org.briarproject.api.transport.Endpoint;
 import org.briarproject.api.transport.TemporarySecret;
+import org.briarproject.system.FileUtilsImpl;
 import org.briarproject.system.SystemClock;
 import org.junit.After;
 import org.junit.Before;
@@ -1605,7 +1605,7 @@ public class H2DatabaseTest extends BriarTestCase {
 
 	private Database<Connection> open(boolean resume) throws Exception {
 		Database<Connection> db = new H2Database(new TestDatabaseConfig(testDir,
-				MAX_SIZE), new TestFileUtils(), new SystemClock());
+				MAX_SIZE), new FileUtilsImpl(), new SystemClock());
 		if (!resume) TestUtils.deleteTestDirectory(testDir);
 		db.open();
 		return db;
diff --git a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
index 5ae0bbb50..a403833b6 100644
--- a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
@@ -1,5 +1,7 @@
 package org.briarproject.plugins.file;
 
+import com.google.inject.Inject;
+
 import static org.briarproject.api.transport.TransportConstants.MIN_STREAM_LENGTH;
 
 import java.io.File;
@@ -11,7 +13,6 @@ import java.util.List;
 import java.util.concurrent.Executor;
 
 import org.briarproject.BriarTestCase;
-import org.briarproject.TestFileUtils;
 import org.briarproject.TestUtils;
 import org.briarproject.api.ContactId;
 import org.briarproject.api.plugins.TransportConnectionWriter;
@@ -29,7 +30,7 @@ public class RemovableDrivePluginTest extends BriarTestCase {
 
 	private final File testDir = TestUtils.getTestDirectory();
 	private final ContactId contactId = new ContactId(234);
-	private final FileUtils fileUtils = new TestFileUtils();
+	@Inject private FileUtils fileUtils;
 
 	@Override
 	@Before

From 0fe514606fe66a3f14af6dd4dd8340687e5841eb Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Thu, 10 Dec 2015 10:51:09 +0100
Subject: [PATCH 7/7] removed sneaky iml file

---
 briar-android/briar-android.iml | 91 ---------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 briar-android/briar-android.iml

diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
deleted file mode 100644
index 87ea58344..000000000
--- a/briar-android/briar-android.iml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":briar-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="briar" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":briar-android" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="android-support-v4" level="project" />
-    <orderEntry type="library" exported="" name="jtorctl-briar" level="project" />
-    <orderEntry type="library" exported="" name="roboguice-2.0" level="project" />
-    <orderEntry type="library" exported="" name="jsocks" level="project" />
-    <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
-    <orderEntry type="library" exported="" name="spongy-core-1.53" level="project" />
-    <orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
-    <orderEntry type="library" exported="" name="javax.inject" level="project" />
-    <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
-    <orderEntry type="module" module-name="briar-api" exported="" />
-    <orderEntry type="module" module-name="briar-core" exported="" />
-  </component>
-</module>
\ No newline at end of file