Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Address issues found in code review

Browse Source
This commit is contained in:
Torsten Grote
2016-10-18 15:50:05 -02:00
parent 7bf4aebdaf
commit 0523c4e718
15 changed files with 235 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-api/src/org/briarproject/api/blogs/Blog.java
View File

@@ -2,19 +2,22 @@ package org.briarproject.api.blogs;
import org.briarproject.api.clients.BaseGroup;
import org.briarproject.api.identity.Author;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sharing.Shareable;
import org.briarproject.api.sync.Group;
import org.jetbrains.annotations.NotNull;
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@NotNullByDefault
public class Blog extends BaseGroup implements Shareable {
private final String description;
private final Author author;
public Blog(@NotNull Group group, @NotNull String name,
@NotNull String description, @NotNull Author author) {
super(group, name, null);
public Blog(Group group, String name, String description, Author author) {
super(group, name);
this.description = description;
this.author = author;
}

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

@@ -1,19 +1,22 @@
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.ThreadSafe;
@ThreadSafe
@NotNullByDefault
public abstract class BaseGroup {
private final Group group;
private final String name;
private final byte[] salt;
public BaseGroup(@NotNull Group group, @NotNull String name, byte[] salt) {
public BaseGroup(Group group, String name) {
this.group = group;
this.name = name;
this.salt = salt;
}
@NotNull
@@ -31,10 +34,6 @@ public abstract class BaseGroup {
return name;
}
public byte[] getSalt() {
return salt;
}
@Override
public int hashCode() {
return group.hashCode();

29
briar-api/src/org/briarproject/api/clients/NamedGroup.java Normal file
View File

@@ -0,0 +1,29 @@
package org.briarproject.api.clients;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.Group;
import org.jetbrains.annotations.NotNull;
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@NotNullByDefault
public abstract class NamedGroup extends BaseGroup {
private final byte[] salt;
public NamedGroup(@NotNull Group group, @NotNull String name, byte[] salt) {
super(group, name);
this.salt = salt;
}
public byte[] getSalt() {
return salt;
}
@Override
public boolean equals(Object o) {
return o instanceof NamedGroup && super.equals(o);
}
}

9
briar-api/src/org/briarproject/api/forum/Forum.java
View File

@@ -1,10 +1,15 @@
package org.briarproject.api.forum;
import org.briarproject.api.clients.BaseGroup;
import org.briarproject.api.clients.NamedGroup;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sharing.Shareable;
import org.briarproject.api.sync.Group;
public class Forum extends BaseGroup implements Shareable {
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@NotNullByDefault
public class Forum extends NamedGroup implements Shareable {
public Forum(Group group, String name, byte[] salt) {
super(group, name, salt);

9
briar-api/src/org/briarproject/api/privategroup/PrivateGroup.java
View File

@@ -1,11 +1,16 @@
package org.briarproject.api.privategroup;
import org.briarproject.api.clients.BaseGroup;
import org.briarproject.api.clients.NamedGroup;
import org.briarproject.api.identity.Author;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.Group;
import org.jetbrains.annotations.NotNull;
public class PrivateGroup extends BaseGroup {
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@NotNullByDefault
public class PrivateGroup extends NamedGroup {
private final Author author;