Merge branch '646-shared-with-subtitle-groups' into 'master'
Add sharing information to private group ActionBar subtitle  Closes #646 See merge request !455
Showing
- briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java 7 additions, 8 deletions...riar/android/privategroup/conversation/GroupActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java 3 additions, 1 deletion...ar/android/privategroup/conversation/GroupController.java
- briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java 38 additions, 3 deletions...ndroid/privategroup/conversation/GroupControllerImpl.java
- briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/ContactRelationshipRevealedEvent.java 8 additions, 1 deletion.../privategroup/event/ContactRelationshipRevealedEvent.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java 5 additions, 2 deletions...arproject/briar/privategroup/PrivateGroupManagerImpl.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java 1 addition, 1 deletion.../briar/privategroup/invitation/CreatorProtocolEngine.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java 10 additions, 10 deletions...r/privategroup/invitation/GroupInvitationManagerImpl.java
- briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java 3 additions, 0 deletions...riar/privategroup/PrivateGroupManagerIntegrationTest.java
Loading
Please register or sign in to comment