From 2309e7321641b1fe255deb1dc30fe8b6cd536296 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 18 Sep 2018 09:39:11 -0300 Subject: [PATCH] Fix bug where available invitations were marked answered Now an invitiation was answered when it is no longer available --- .../briarproject/briar/api/sharing/InvitationRequest.java | 4 ++-- .../invitation/GroupInvitationIntegrationTest.java | 2 ++ .../briar/sharing/BlogSharingIntegrationTest.java | 6 +++--- .../briar/sharing/ForumSharingIntegrationTest.java | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java b/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java index e8ea62907..7cf456eb6 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java @@ -15,9 +15,9 @@ public abstract class InvitationRequest extends public InvitationRequest(MessageId messageId, GroupId groupId, long time, boolean local, boolean sent, boolean seen, boolean read, SessionId sessionId, S object, @Nullable String message, - boolean answered, boolean canBeOpened) { + boolean available, boolean canBeOpened) { super(messageId, groupId, time, local, sent, seen, read, sessionId, - object, message, answered); + object, message, !available); this.canBeOpened = canBeOpened; } diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java index 37b376af7..5ae80caf5 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java @@ -104,6 +104,7 @@ public class GroupInvitationIntegrationTest assertFalse(request.isLocal()); assertFalse(request.isRead()); assertFalse(request.canBeOpened()); + assertFalse(request.wasAnswered()); } @Test @@ -181,6 +182,7 @@ public class GroupInvitationIntegrationTest } else { GroupInvitationRequest request = (GroupInvitationRequest) m; assertEquals(privateGroup0, request.getNameable()); + assertTrue(request.wasAnswered()); assertTrue(request.canBeOpened()); } } diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java index 3c95794e0..44a1d3995 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java @@ -153,7 +153,7 @@ public class BlogSharingIntegrationTest if (m instanceof BlogInvitationRequest) { BlogInvitationRequest invitation = (BlogInvitationRequest) m; assertEquals(blog2, invitation.getNameable()); - assertFalse(invitation.wasAnswered()); + assertTrue(invitation.wasAnswered()); assertEquals(blog2.getAuthor().getName(), invitation.getName()); assertFalse(invitation.getNameable().isRssFeed()); @@ -226,7 +226,7 @@ public class BlogSharingIntegrationTest if (m instanceof BlogInvitationRequest) { BlogInvitationRequest invitation = (BlogInvitationRequest) m; assertEquals(rssBlog, invitation.getNameable()); - assertFalse(invitation.wasAnswered()); + assertTrue(invitation.wasAnswered()); assertEquals(rssBlog.getAuthor().getName(), invitation.getName()); assertTrue(invitation.getNameable().isRssFeed()); @@ -288,7 +288,7 @@ public class BlogSharingIntegrationTest if (m instanceof BlogInvitationRequest) { BlogInvitationRequest invitation = (BlogInvitationRequest) m; assertEquals(blog2, invitation.getNameable()); - assertFalse(invitation.wasAnswered()); + assertTrue(invitation.wasAnswered()); assertEquals(blog2.getAuthor().getName(), invitation.getName()); assertEquals(null, invitation.getMessage()); diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java index 9f72d1b04..682b6d1a0 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java @@ -135,7 +135,7 @@ public class ForumSharingIntegrationTest for (PrivateMessageHeader m : list) { if (m instanceof ForumInvitationRequest) { ForumInvitationRequest invitation = (ForumInvitationRequest) m; - assertFalse(invitation.wasAnswered()); + assertTrue(invitation.wasAnswered()); assertEquals(forum0.getName(), invitation.getName()); assertEquals(forum0, invitation.getNameable()); assertEquals("Hi!", invitation.getMessage()); @@ -192,7 +192,7 @@ public class ForumSharingIntegrationTest if (m instanceof ForumInvitationRequest) { ForumInvitationRequest invitation = (ForumInvitationRequest) m; assertEquals(forum0, invitation.getNameable()); - assertFalse(invitation.wasAnswered()); + assertTrue(invitation.wasAnswered()); assertEquals(forum0.getName(), invitation.getName()); assertEquals(null, invitation.getMessage()); assertFalse(invitation.canBeOpened());