Use namespaced strings for client IDs

This commit is contained in:
Torsten Grote
2016-11-07 19:30:23 -02:00
parent 1809943f1d
commit e96b3a8c68
48 changed files with 131 additions and 195 deletions

View File

@@ -30,7 +30,6 @@ import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.lifecycle.IoExecutor;
import org.briarproject.api.plugins.TorConstants;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.system.Clock;
@@ -73,11 +72,6 @@ class FeedManagerImpl implements FeedManager, Client, EventListener {
private static final Logger LOG =
Logger.getLogger(FeedManagerImpl.class.getName());
private static final ClientId CLIENT_ID =
new ClientId(StringUtils.fromHexString(
"466565644d616e6167657202fb797097"
+ "255af837abbf8c16e250b3c2ccc286eb"));
private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds
private final ScheduledExecutorService feedExecutor;
@@ -114,11 +108,6 @@ class FeedManagerImpl implements FeedManager, Client, EventListener {
this.torSocketFactory = torSocketFactory;
}
@Override
public ClientId getClientId() {
return CLIENT_ID;
}
@Override
public void eventOccurred(Event e) {
if (e instanceof TransportEnabledEvent) {
@@ -510,7 +499,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener {
}
private Group getLocalGroup() {
return contactGroupFactory.createLocalGroup(getClientId());
return contactGroupFactory.createLocalGroup(CLIENT_ID);
}
}