Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Update blog backend to match current usage

Browse Source
This commit is contained in:
Torsten Grote
2016-10-27 12:55:54 -02:00
parent a18317e912
commit 9e553ef9c8
28 changed files with 154 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-api/src/org/briarproject/api/clients/BaseGroup.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.api.clients;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.jetbrains.annotations.NotNull;
import javax.annotation.concurrent.Immutable;
@@ -12,28 +11,19 @@ import javax.annotation.concurrent.Immutable;
public abstract class BaseGroup {
private final Group group;
private final String name;
public BaseGroup(Group group, String name) {
public BaseGroup(Group group) {
this.group = group;
this.name = name;
}
@NotNull
public GroupId getId() {
return group.getId();
}
@NotNull
public Group getGroup() {
return group;
}
@NotNull
public String getName() {
return name;
}
@Override
public int hashCode() {
return group.hashCode();

8
briar-api/src/org/briarproject/api/clients/NamedGroup.java
View File

@@ -10,13 +10,19 @@ import javax.annotation.concurrent.Immutable;
@NotNullByDefault
public abstract class NamedGroup extends BaseGroup {
private final String name;
private final byte[] salt;
public NamedGroup(@NotNull Group group, @NotNull String name, byte[] salt) {
super(group, name);
super(group);
this.name = name;
this.salt = salt;
}
public String getName() {
return name;
}
public byte[] getSalt() {
return salt;
}