Merge branch '1341-account-manager-refactoring' into 'master'

Refactor authentication and account management code

Closes #1341

See merge request briar/briar!866

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java

@@ -4,6 +4,8 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 
 import java.util.List;
 
+// TODO: Create a module for this so it doesn't have to be public
+
 public interface CircumventionProvider {
 
 	/**

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java

@@ -16,6 +16,8 @@ import java.util.Set;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+// TODO: Create a module for this so it doesn't need to be public
+
 public class CircumventionProviderImpl implements CircumventionProvider {
 
 	private final static String BRIDGE_FILE_NAME = "bridges";