Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-group-invitation-state' into 'master'

Browse Source 
fix SharingState for private group creator

See merge request briar/briar!1805
This commit is contained in:
akwizgran
2023-08-15 15:33:37 +00:00
parent c7e382c1af 38a7217c3f
commit 1ef1ccc1f7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java
View File

@@ -563,7 +563,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
.parseCreatorSession(contactGroupId, ss.bdfSession); .parseCreatorSession(contactGroupId, ss.bdfSession);
CreatorState state = session.getState(); CreatorState state = session.getState();
if (state == START) return SharingStatus.SHAREABLE; 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; if (state == JOINED) return SharingStatus.SHARING;
// Apart from the common case that the contact LEFT the group, // Apart from the common case that the contact LEFT the group,
// the creator can also be a LEFT state, after re-adding a contact // the creator can also be a LEFT state, after re-adding a contact

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

@@ -29,7 +29,7 @@ import javax.annotation.Nullable;
import static java.util.Collections.emptySet; 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.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.SHAREABLE;
import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING;
import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount;
@@ -322,7 +322,7 @@ public class GroupInvitationIntegrationTest
sendInvitation(c0.getClock().currentTimeMillis(), null); sendInvitation(c0.getClock().currentTimeMillis(), null);
// invitation is not allowed before the first hasn't been answered // invitation is not allowed before the first hasn't been answered
assertEquals(INVITE_RECEIVED, groupInvitationManager0 assertEquals(INVITE_SENT, groupInvitationManager0
.getSharingStatus(contact1From0, privateGroup.getId())); .getSharingStatus(contact1From0, privateGroup.getId()));
// deliver invitation and response // deliver invitation and response

4
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java
View File

@@ -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.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.MAJOR_VERSION; 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.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.SHAREABLE;
import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING; import static org.briarproject.briar.api.sharing.SharingManager.SharingStatus.SHARING;
import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT; import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT;
@@ -876,7 +876,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
.getSharingStatus(contact, privateGroup.getId())); .getSharingStatus(contact, privateGroup.getId()));
expectIsInvitationAllowed(CreatorState.INVITED); expectIsInvitationAllowed(CreatorState.INVITED);
assertEquals(INVITE_RECEIVED, groupInvitationManager assertEquals(INVITE_SENT, groupInvitationManager
.getSharingStatus(contact, privateGroup.getId())); .getSharingStatus(contact, privateGroup.getId()));
expectIsInvitationAllowed(CreatorState.JOINED); expectIsInvitationAllowed(CreatorState.JOINED);