Merge branch '709-reveal-relationships' into 'master'
Mark relationship visible when syncing group with peer This branch updates the private group invitation protocol to use @grote's new method for marking a contact relationship visible to the group. I've changed the method slightly because the protocol state machine allows us to leave and re-enter the BOTH_JOINED state (see diagram on #659), so the relationship may already be visible when the method is called. In that case the visibility isn't updated, so we stick with whichever of revealed-by-us and revealed-by-contact happened first. See merge request !402
Showing
- .idea/codeStyleSettings.xml 2 additions, 0 deletions.idea/codeStyleSettings.xml
- briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationManager.java 20 additions, 0 deletions...t/api/privategroup/invitation/GroupInvitationManager.java
- briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java 12 additions, 7 deletions...rg/briarproject/privategroup/PrivateGroupManagerImpl.java
- briar-core/src/org/briarproject/privategroup/invitation/GroupInvitationManagerImpl.java 24 additions, 3 deletions...t/privategroup/invitation/GroupInvitationManagerImpl.java
- briar-core/src/org/briarproject/privategroup/invitation/PeerProtocolEngine.java 21 additions, 0 deletions...arproject/privategroup/invitation/PeerProtocolEngine.java
Loading
Please register or sign in to comment