From 642fa7df18433245bc6554d52ddbe0a5bfb2583c Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 1 Nov 2016 17:17:40 +0000
Subject: [PATCH] Removed unused field, renamed nickname methods.
---
briar-android/src/org/briarproject/android/AppModule.java | 4 ++--
.../src/org/briarproject/android/BriarService.java | 2 +-
.../android/controller/NavDrawerControllerImpl.java | 6 +-----
.../android/controller/SetupControllerImpl.java | 2 +-
briar-api/src/org/briarproject/api/db/DatabaseConfig.java | 4 ++--
briar-tests/src/org/briarproject/TestDatabaseConfig.java | 4 ++--
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/AppModule.java b/briar-android/src/org/briarproject/android/AppModule.java
index 4ab69314a0..f0f1954e42 100644
--- a/briar-android/src/org/briarproject/android/AppModule.java
+++ b/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;
}
diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index b6fc6b28eb..4707a41a14 100644
--- a/briar-android/src/org/briarproject/android/BriarService.java
+++ b/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;
diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
index ce1bb1e3e0..fb75cfce2a 100644
--- a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
+++ b/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
diff --git a/briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java b/briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java
index a881422d63..356137008c 100644
--- a/briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java
+++ b/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);
diff --git a/briar-api/src/org/briarproject/api/db/DatabaseConfig.java b/briar-api/src/org/briarproject/api/db/DatabaseConfig.java
index 7d34a18472..3233f68730 100644
--- a/briar-api/src/org/briarproject/api/db/DatabaseConfig.java
+++ b/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();
}
diff --git a/briar-tests/src/org/briarproject/TestDatabaseConfig.java b/briar-tests/src/org/briarproject/TestDatabaseConfig.java
index e4fd78f727..af847ec2cf 100644
--- a/briar-tests/src/org/briarproject/TestDatabaseConfig.java
+++ b/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;
}
--
GitLab