Merge branch '472-forum-no-message-for-the-inviter-if-an-invitee-accepts-or-declines' into 'master'
Show Responses to Forum Invitations in Private Conversation Closes #472 See merge request !257
No related branches found
No related tags found
Showing
- briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 61 additions, 32 deletions...st/java/org/briarproject/ForumSharingIntegrationTest.java
- briar-android/res/values/strings.xml 4 additions, 0 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/contact/ContactListFragment.java 18 additions, 4 deletions...org/briarproject/android/contact/ContactListFragment.java
- briar-android/src/org/briarproject/android/contact/ConversationActivity.java 24 additions, 6 deletions...rg/briarproject/android/contact/ConversationActivity.java
- briar-android/src/org/briarproject/android/contact/ConversationAdapter.java 2 additions, 2 deletions...org/briarproject/android/contact/ConversationAdapter.java
- briar-android/src/org/briarproject/android/contact/ConversationForumInvitationInItem.java 2 additions, 2 deletions...ct/android/contact/ConversationForumInvitationInItem.java
- briar-android/src/org/briarproject/android/contact/ConversationForumInvitationItem.java 4 additions, 4 deletions...ject/android/contact/ConversationForumInvitationItem.java
- briar-android/src/org/briarproject/android/contact/ConversationForumInvitationOutItem.java 2 additions, 2 deletions...t/android/contact/ConversationForumInvitationOutItem.java
- briar-android/src/org/briarproject/android/contact/ConversationItem.java 37 additions, 4 deletions...rc/org/briarproject/android/contact/ConversationItem.java
- briar-api/src/org/briarproject/api/blogs/BlogInvitationRequest.java 3 additions, 2 deletions...src/org/briarproject/api/blogs/BlogInvitationRequest.java
- briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java 2 additions, 2 deletions...pi/src/org/briarproject/api/blogs/BlogSharingManager.java
- briar-api/src/org/briarproject/api/forum/ForumInvitationRequest.java 3 additions, 4 deletions...rc/org/briarproject/api/forum/ForumInvitationRequest.java
- briar-api/src/org/briarproject/api/forum/ForumInvitationResponse.java 17 additions, 0 deletions...c/org/briarproject/api/forum/ForumInvitationResponse.java
- briar-api/src/org/briarproject/api/forum/ForumSharingManager.java 3 additions, 2 deletions...i/src/org/briarproject/api/forum/ForumSharingManager.java
- briar-api/src/org/briarproject/api/sharing/InvitationMessage.java 1 addition, 14 deletions...i/src/org/briarproject/api/sharing/InvitationMessage.java
- briar-api/src/org/briarproject/api/sharing/InvitationRequest.java 30 additions, 0 deletions...i/src/org/briarproject/api/sharing/InvitationRequest.java
- briar-api/src/org/briarproject/api/sharing/InvitationResponse.java 22 additions, 0 deletions.../src/org/briarproject/api/sharing/InvitationResponse.java
- briar-api/src/org/briarproject/api/sharing/SharingMessage.java 0 additions, 1 deletion...-api/src/org/briarproject/api/sharing/SharingMessage.java
- briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java 18 additions, 13 deletions.../src/org/briarproject/sharing/BlogSharingManagerImpl.java
- briar-core/src/org/briarproject/sharing/ForumSharerSessionState.java 4 additions, 4 deletions...src/org/briarproject/sharing/ForumSharerSessionState.java
Loading
Please register or sign in to comment