Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Removed unused field, renamed nickname methods.

Browse Source
This commit is contained in:
akwizgran
2016-11-01 17:17:40 +00:00
parent c85767d2a0
commit 642fa7df18
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/AppModule.java
View File

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

2
briar-android/src/org/briarproject/android/BriarService.java
View File

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

6
briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
View File

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

2
briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java
View File

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

4
briar-api/src/org/briarproject/api/db/DatabaseConfig.java
View File

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

4
briar-tests/src/org/briarproject/TestDatabaseConfig.java
View File

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