diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java index 3d1263815..6939552e9 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java @@ -563,7 +563,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl .parseCreatorSession(contactGroupId, ss.bdfSession); CreatorState state = session.getState(); if (state == START) return SharingStatus.SHAREABLE; - if (state == INVITED) return SharingStatus.INVITE_RECEIVED; + if (state == INVITED) return SharingStatus.INVITE_SENT; if (state == JOINED) return SharingStatus.SHARING; // Apart from the common case that the contact LEFT the group, // the creator can also be a LEFT state, after re-adding a contact 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 5db86bea8..234aa2733 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 @@ -29,7 +29,7 @@ import javax.annotation.Nullable; import static java.util.Collections.emptySet; import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.MIN_AUTO_DELETE_TIMER_MS; -import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.INVITE_RECEIVED; +import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.INVITE_SENT; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHAREABLE; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING; import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; @@ -322,7 +322,7 @@ public class GroupInvitationIntegrationTest sendInvitation(c0.getClock().currentTimeMillis(), null); // invitation is not allowed before the first hasn't been answered - assertEquals(INVITE_RECEIVED, groupInvitationManager0 + assertEquals(INVITE_SENT, groupInvitationManager0 .getSharingStatus(contact1From0, privateGroup.getId())); // deliver invitation and response diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java index 9e8f07b8e..f7c65328f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java @@ -64,7 +64,7 @@ import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_ import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID; import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.MAJOR_VERSION; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.ERROR; -import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.INVITE_RECEIVED; +import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.INVITE_SENT; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHAREABLE; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING; import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT; @@ -876,7 +876,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase { .getSharingStatus(contact, privateGroup.getId())); expectIsInvitationAllowed(CreatorState.INVITED); - assertEquals(INVITE_RECEIVED, groupInvitationManager + assertEquals(INVITE_SENT, groupInvitationManager .getSharingStatus(contact, privateGroup.getId())); expectIsInvitationAllowed(CreatorState.JOINED);