Merge branch '470-second-invitation-doesn-t-disappear-from-available-forums' into 'master'
Return proper Invitation objects in SharingManager Fixes #470 See merge request !265
Showing
- briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java 7 additions, 7 deletions...est/java/org/briarproject/BlogSharingIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 24 additions, 16 deletions...st/java/org/briarproject/ForumSharingIntegrationTest.java
- briar-android/src/org/briarproject/android/forum/ForumListFragment.java 2 additions, 1 deletion...src/org/briarproject/android/forum/ForumListFragment.java
- briar-android/src/org/briarproject/android/sharing/BlogInvitationAdapter.java 1 addition, 0 deletions...g/briarproject/android/sharing/BlogInvitationAdapter.java
- briar-android/src/org/briarproject/android/sharing/ForumInvitationAdapter.java 1 addition, 0 deletions.../briarproject/android/sharing/ForumInvitationAdapter.java
- briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java 4 additions, 2 deletions...c/org/briarproject/android/sharing/InvitationAdapter.java
- briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java 1 addition, 0 deletions...org/briarproject/android/sharing/InvitationsActivity.java
- briar-android/src/org/briarproject/android/sharing/InvitationsBlogActivity.java 5 additions, 17 deletions...briarproject/android/sharing/InvitationsBlogActivity.java
- briar-android/src/org/briarproject/android/sharing/InvitationsForumActivity.java 5 additions, 17 deletions...riarproject/android/sharing/InvitationsForumActivity.java
- briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java 2 additions, 1 deletion...pi/src/org/briarproject/api/blogs/BlogSharingManager.java
- briar-api/src/org/briarproject/api/forum/ForumSharingManager.java 2 additions, 1 deletion...i/src/org/briarproject/api/forum/ForumSharingManager.java
- briar-api/src/org/briarproject/api/sharing/InvitationItem.java 32 additions, 0 deletions...-api/src/org/briarproject/api/sharing/InvitationItem.java
- briar-api/src/org/briarproject/api/sharing/SharingManager.java 2 additions, 2 deletions...-api/src/org/briarproject/api/sharing/SharingManager.java
- briar-core/src/org/briarproject/sharing/SharingManagerImpl.java 47 additions, 15 deletions...core/src/org/briarproject/sharing/SharingManagerImpl.java
Loading
Please register or sign in to comment