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

Merge branch '557-use-namespaced-strings-for-client-ids' into 'master'

Browse Source 
Use namespaced strings for client IDs

Closes #557

See merge request !393
This commit is contained in:
akwizgran
2016-11-08 13:25:41 +00:00
parent e47e3242a6 e96b3a8c68
commit 55ecdd9a13
48 changed files with 131 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java
View File

@@ -21,6 +21,7 @@ import java.util.concurrent.Executor;
import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
import static org.briarproject.api.privategroup.PrivateGroupManager.CLIENT_ID;
public class GroupInvitationControllerImpl
extends InvitationControllerImpl<GroupInvitationItem>
@@ -51,7 +52,7 @@ public class GroupInvitationControllerImpl
@Override
protected ClientId getShareableClientId() {
return privateGroupManager.getClientId();
return CLIENT_ID;
}
@Override

5
briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java
View File

@@ -35,6 +35,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.api.privategroup.PrivateGroupManager.CLIENT_ID;
public class GroupListControllerImpl extends DbControllerImpl
implements GroupListController, EventListener {
@@ -98,14 +99,14 @@ public class GroupListControllerImpl extends DbControllerImpl
} else if (e instanceof GroupAddedEvent) {
GroupAddedEvent g = (GroupAddedEvent) e;
ClientId id = g.getGroup().getClientId();
if (id.equals(groupManager.getClientId())) {
if (id.equals(CLIENT_ID)) {
LOG.info("Private group added");
onGroupAdded(g.getGroup().getId());
}
} else if (e instanceof GroupRemovedEvent) {
GroupRemovedEvent g = (GroupRemovedEvent) e;
ClientId id = g.getGroup().getClientId();
if (id.equals(groupManager.getClientId())) {
if (id.equals(CLIENT_ID)) {
LOG.info("Private group removed");
onGroupRemoved(g.getGroup().getId());
}