Removed unused field, renamed nickname methods.

briar-android/src/org/briarproject/android/AppModule.java

@@ -97,12 +97,12 @@ public class AppModule {
 			}
 
 			@Override
-			public void setAuthorNick(String nickname) {
+			public void setLocalAuthorName(String nickname) {
 				this.nickname = nickname;
 			}
 
 			@Override
-			public String getAuthorNick() {
+			public String getLocalAuthorName() {
 				return nickname;
 			}
 

briar-android/src/org/briarproject/android/BriarService.java

@@ -93,7 +93,7 @@ public class BriarService extends Service {
 		new Thread() {
 			@Override
 			public void run() {
-				String nickname = databaseConfig.getAuthorNick();
+				String nickname = databaseConfig.getLocalAuthorName();
 				StartResult result = lifecycleManager.startServices(nickname);
 				if (result == SUCCESS) {
 					started = true;

briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java

@@ -9,7 +9,6 @@ import org.briarproject.api.event.EventBus;
 import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.TransportDisabledEvent;
 import org.briarproject.api.event.TransportEnabledEvent;
-import org.briarproject.api.identity.IdentityManager;
 import org.briarproject.api.lifecycle.LifecycleManager;
 import org.briarproject.api.plugins.Plugin;
 import org.briarproject.api.plugins.PluginManager;
@@ -29,19 +28,16 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 
 	private final PluginManager pluginManager;
 	private final EventBus eventBus;
-	private final IdentityManager identityManager;
 
 	private volatile TransportStateListener listener;
 
 	@Inject
 	NavDrawerControllerImpl(@DatabaseExecutor Executor dbExecutor,
 			LifecycleManager lifecycleManager,
-			PluginManager pluginManager, EventBus eventBus,
-			IdentityManager identityManager) {
+			PluginManager pluginManager, EventBus eventBus) {
 		super(dbExecutor, lifecycleManager);
 		this.pluginManager = pluginManager;
 		this.eventBus = eventBus;
-		this.identityManager = identityManager;
 	}
 
 	@Override

briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java

@@ -38,7 +38,7 @@ public class SetupControllerImpl extends PasswordControllerImpl
 		cryptoExecutor.execute(new Runnable() {
 			@Override
 			public void run() {
-				databaseConfig.setAuthorNick(nickname);
+				databaseConfig.setLocalAuthorName(nickname);
 				SecretKey key = crypto.generateSecretKey();
 				databaseConfig.setEncryptionKey(key);
 				String hex = encryptDatabaseKey(key, password);

briar-api/src/org/briarproject/api/db/DatabaseConfig.java

@@ -14,9 +14,9 @@ public interface DatabaseConfig {
 
 	SecretKey getEncryptionKey();
 
-	void setAuthorNick(String nickname);
+	void setLocalAuthorName(String nickname);
 
-	String getAuthorNick();
+	String getLocalAuthorName();
 
 	long getMaxSize();
 }

briar-tests/src/org/briarproject/TestDatabaseConfig.java

@@ -39,12 +39,12 @@ public class TestDatabaseConfig implements DatabaseConfig {
 	}
 
 	@Override
-	public void setAuthorNick(String nickname) {
+	public void setLocalAuthorName(String nickname) {
 
 	}
 
 	@Override
-	public String getAuthorNick() {
+	public String getLocalAuthorName() {
 		return null;
 	}