Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug where available invitations were marked answered

Browse Source 
Now an invitiation was answered when it is no longer available
This commit is contained in:
Torsten Grote
2018-09-18 09:39:11 -03:00
parent 4b325f797b
commit 2309e73216
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java
View File

@@ -15,9 +15,9 @@ public abstract class InvitationRequest<S extends Shareable> extends
public InvitationRequest(MessageId messageId, GroupId groupId, long time, public InvitationRequest(MessageId messageId, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read, boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, S object, @Nullable String message, SessionId sessionId, S object, @Nullable String message,
boolean answered, boolean canBeOpened) { boolean available, boolean canBeOpened) {
super(messageId, groupId, time, local, sent, seen, read, sessionId, super(messageId, groupId, time, local, sent, seen, read, sessionId,
object, message, answered); object, message, !available);
this.canBeOpened = canBeOpened; this.canBeOpened = canBeOpened;
} }

2
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java
View File

@@ -104,6 +104,7 @@ public class GroupInvitationIntegrationTest
assertFalse(request.isLocal()); assertFalse(request.isLocal());
assertFalse(request.isRead()); assertFalse(request.isRead());
assertFalse(request.canBeOpened()); assertFalse(request.canBeOpened());
assertFalse(request.wasAnswered());
} }
@Test @Test
@@ -181,6 +182,7 @@ public class GroupInvitationIntegrationTest
} else { } else {
GroupInvitationRequest request = (GroupInvitationRequest) m; GroupInvitationRequest request = (GroupInvitationRequest) m;
assertEquals(privateGroup0, request.getNameable()); assertEquals(privateGroup0, request.getNameable());
assertTrue(request.wasAnswered());
assertTrue(request.canBeOpened()); assertTrue(request.canBeOpened());
} }
} }

6
briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java
View File

@@ -153,7 +153,7 @@ public class BlogSharingIntegrationTest
if (m instanceof BlogInvitationRequest) { if (m instanceof BlogInvitationRequest) {
BlogInvitationRequest invitation = (BlogInvitationRequest) m; BlogInvitationRequest invitation = (BlogInvitationRequest) m;
assertEquals(blog2, invitation.getNameable()); assertEquals(blog2, invitation.getNameable());
assertFalse(invitation.wasAnswered()); assertTrue(invitation.wasAnswered());
assertEquals(blog2.getAuthor().getName(), assertEquals(blog2.getAuthor().getName(),
invitation.getName()); invitation.getName());
assertFalse(invitation.getNameable().isRssFeed()); assertFalse(invitation.getNameable().isRssFeed());
@@ -226,7 +226,7 @@ public class BlogSharingIntegrationTest
if (m instanceof BlogInvitationRequest) { if (m instanceof BlogInvitationRequest) {
BlogInvitationRequest invitation = (BlogInvitationRequest) m; BlogInvitationRequest invitation = (BlogInvitationRequest) m;
assertEquals(rssBlog, invitation.getNameable()); assertEquals(rssBlog, invitation.getNameable());
assertFalse(invitation.wasAnswered()); assertTrue(invitation.wasAnswered());
assertEquals(rssBlog.getAuthor().getName(), assertEquals(rssBlog.getAuthor().getName(),
invitation.getName()); invitation.getName());
assertTrue(invitation.getNameable().isRssFeed()); assertTrue(invitation.getNameable().isRssFeed());
@@ -288,7 +288,7 @@ public class BlogSharingIntegrationTest
if (m instanceof BlogInvitationRequest) { if (m instanceof BlogInvitationRequest) {
BlogInvitationRequest invitation = (BlogInvitationRequest) m; BlogInvitationRequest invitation = (BlogInvitationRequest) m;
assertEquals(blog2, invitation.getNameable()); assertEquals(blog2, invitation.getNameable());
assertFalse(invitation.wasAnswered()); assertTrue(invitation.wasAnswered());
assertEquals(blog2.getAuthor().getName(), assertEquals(blog2.getAuthor().getName(),
invitation.getName()); invitation.getName());
assertEquals(null, invitation.getMessage()); assertEquals(null, invitation.getMessage());

4
briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
View File

@@ -135,7 +135,7 @@ public class ForumSharingIntegrationTest
for (PrivateMessageHeader m : list) { for (PrivateMessageHeader m : list) {
if (m instanceof ForumInvitationRequest) { if (m instanceof ForumInvitationRequest) {
ForumInvitationRequest invitation = (ForumInvitationRequest) m; ForumInvitationRequest invitation = (ForumInvitationRequest) m;
assertFalse(invitation.wasAnswered()); assertTrue(invitation.wasAnswered());
assertEquals(forum0.getName(), invitation.getName()); assertEquals(forum0.getName(), invitation.getName());
assertEquals(forum0, invitation.getNameable()); assertEquals(forum0, invitation.getNameable());
assertEquals("Hi!", invitation.getMessage()); assertEquals("Hi!", invitation.getMessage());
@@ -192,7 +192,7 @@ public class ForumSharingIntegrationTest
if (m instanceof ForumInvitationRequest) { if (m instanceof ForumInvitationRequest) {
ForumInvitationRequest invitation = (ForumInvitationRequest) m; ForumInvitationRequest invitation = (ForumInvitationRequest) m;
assertEquals(forum0, invitation.getNameable()); assertEquals(forum0, invitation.getNameable());
assertFalse(invitation.wasAnswered()); assertTrue(invitation.wasAnswered());
assertEquals(forum0.getName(), invitation.getName()); assertEquals(forum0.getName(), invitation.getName());
assertEquals(null, invitation.getMessage()); assertEquals(null, invitation.getMessage());
assertFalse(invitation.canBeOpened()); assertFalse(invitation.canBeOpened());