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

Fix Blog Sharing Backend and Add Blog Sharing Integration Tests

Browse Source
This commit is contained in:
Torsten Grote
2016-08-02 15:16:03 -03:00
parent a552d1b6a6
commit a69a4028b0
12 changed files with 808 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java
View File

@@ -26,6 +26,8 @@ import org.briarproject.api.event.BlogInvitationReceivedEvent;
import org.briarproject.api.event.BlogInvitationResponseReceivedEvent;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.sharing.InvitationMessage;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.GroupId;
@@ -50,6 +52,8 @@ class BlogSharingManagerImpl extends
"bee438b5de0b3a685badc4e49d76e72d"
+ "21e01c4b569a775112756bdae267a028"));
@Inject
IdentityManager identityManager;
private final BlogManager blogManager;
private final SFactory sFactory;
@@ -84,10 +88,19 @@ class BlogSharingManagerImpl extends
}
@Override
public boolean canBeShared(GroupId g, Contact c) throws DbException {
Blog b = blogManager.getPersonalBlog(c.getAuthor());
protected boolean canBeShared(Transaction txn, GroupId g, Contact c)
throws DbException {
// check if g is our personal blog
LocalAuthor author = identityManager.getLocalAuthor(txn);
Blog b = blogManager.getPersonalBlog(author);
if (b.getId().equals(g)) return false;
return super.canBeShared(g, c);
// check if g is c's personal blog
b = blogManager.getPersonalBlog(c.getAuthor());
if (b.getId().equals(g)) return false;
return super.canBeShared(txn, g, c);
}
@Override

2
briar-core/src/org/briarproject/sharing/BlogSharingValidator.java
View File

@@ -58,7 +58,7 @@ class BlogSharingValidator extends BdfMessageValidator {
checkLength(name, 1, MAX_BLOG_TITLE_LENGTH);
String desc = body.getString(3);
checkLength(desc, 1, MAX_BLOG_DESC_LENGTH);
checkLength(desc, 0, MAX_BLOG_DESC_LENGTH);
BdfList author = body.getList(4);
checkSize(author, 2);

2
briar-core/src/org/briarproject/sharing/SharingManagerImpl.java
View File

@@ -500,7 +500,7 @@ abstract class SharingManagerImpl<S extends Shareable, I extends Invitation, IS
return canBeShared;
}
private boolean canBeShared(Transaction txn, GroupId g, Contact c)
protected boolean canBeShared(Transaction txn, GroupId g, Contact c)
throws DbException {
try {