Merge branch '793-show-open-button-after-accepting-invitations' into 'master'
Show open button in private conversation after accepting invitations To keep the implementation simple, the Open button does appear where the Accept button had been previously. In order to make the Open button functional, I had to make the `GroupId` of the invitation target available to the UI. Most code in this MR is due to that.  Closes #793 See merge request !457
No related branches found
No related tags found
Showing
- briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java 26 additions, 0 deletions...arproject/briar/android/contact/ConversationActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationAdapter.java 3 additions, 0 deletions...iarproject/briar/android/contact/ConversationAdapter.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java 4 additions, 10 deletions.../briarproject/briar/android/contact/ConversationItem.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java 14 additions, 4 deletions...roject/briar/android/contact/ConversationRequestItem.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java 12 additions, 3 deletions.../briar/android/contact/ConversationRequestViewHolder.java
- briar-android/src/main/res/layout/list_item_conversation_request.xml 4 additions, 3 deletions...id/src/main/res/layout/list_item_conversation_request.xml
- briar-android/src/main/res/values/strings.xml 3 additions, 2 deletionsbriar-android/src/main/res/values/strings.xml
- briar-android/src/main/res/values/styles.xml 0 additions, 2 deletionsbriar-android/src/main/res/values/styles.xml
- briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java 4 additions, 3 deletions...rg/briarproject/briar/api/blog/BlogInvitationRequest.java
- briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java 5 additions, 4 deletions...g/briarproject/briar/api/blog/BlogInvitationResponse.java
- briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java 6 additions, 5 deletions.../briarproject/briar/api/forum/ForumInvitationRequest.java
- briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java 5 additions, 4 deletions...briarproject/briar/api/forum/ForumInvitationResponse.java
- briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java 4 additions, 3 deletions...r/api/privategroup/invitation/GroupInvitationRequest.java
- briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java 5 additions, 4 deletions.../api/privategroup/invitation/GroupInvitationResponse.java
- briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java 10 additions, 2 deletions...org/briarproject/briar/api/sharing/InvitationMessage.java
- briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java 13 additions, 6 deletions...org/briarproject/briar/api/sharing/InvitationRequest.java
- briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationResponse.java 4 additions, 2 deletions...rg/briarproject/briar/api/sharing/InvitationResponse.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngine.java 2 additions, 2 deletions.../briar/privategroup/invitation/CreatorProtocolEngine.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java 15 additions, 9 deletions...r/privategroup/invitation/GroupInvitationManagerImpl.java
- briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngine.java 3 additions, 3 deletions.../briar/privategroup/invitation/InviteeProtocolEngine.java
Loading
Please register or sign in to comment