Merge branch '461-forum-invitation-can-not-be-accepted-if-forum-already-added' into 'master'
Show all Forum Invitations, not only the first one to prevent cut-offs and forks This MR solves the problems outlined in #461 by always showing forum invitations, even if the user already subscribed to the forum. Available Forums have been renamed to Forum Invitations in the UI:   Closes #461 See merge request !241
No related branches found
No related tags found
Showing
- briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java 12 additions, 0 deletions...ests/src/test/java/org/briarproject/ForumManagerTest.java
- briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 159 additions, 19 deletions...st/java/org/briarproject/ForumSharingIntegrationTest.java
- briar-android/AndroidManifest.xml 2 additions, 2 deletionsbriar-android/AndroidManifest.xml
- briar-android/res/layout/list_item_available_forum.xml 34 additions, 15 deletionsbriar-android/res/layout/list_item_available_forum.xml
- briar-android/res/layout/list_item_forum_invitation_in.xml 1 addition, 1 deletionbriar-android/res/layout/list_item_forum_invitation_in.xml
- briar-android/res/values-pt-rBR/strings.xml 1 addition, 1 deletionbriar-android/res/values-pt-rBR/strings.xml
- briar-android/res/values/strings.xml 3 additions, 2 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/ActivityComponent.java 2 additions, 2 deletions...droid/src/org/briarproject/android/ActivityComponent.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/forum/AvailableForumsItem.java 0 additions, 23 deletions...c/org/briarproject/android/forum/AvailableForumsItem.java
- briar-android/src/org/briarproject/android/forum/ForumInvitationAdapter.java 30 additions, 19 deletions...rg/briarproject/android/forum/ForumInvitationAdapter.java
- briar-android/src/org/briarproject/android/forum/ForumInvitationItem.java 10 additions, 2 deletions...c/org/briarproject/android/forum/ForumInvitationItem.java
- briar-android/src/org/briarproject/android/forum/ForumInvitationsActivity.java 21 additions, 22 deletions.../briarproject/android/forum/ForumInvitationsActivity.java
- briar-android/src/org/briarproject/android/forum/ForumListFragment.java 2 additions, 2 deletions...src/org/briarproject/android/forum/ForumListFragment.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/ForumSharingManager.java 2 additions, 2 deletions...i/src/org/briarproject/api/forum/ForumSharingManager.java
- briar-api/src/org/briarproject/api/sharing/SharingConstants.java 0 additions, 1 deletion...pi/src/org/briarproject/api/sharing/SharingConstants.java
- briar-api/src/org/briarproject/api/sharing/SharingManager.java 3 additions, 5 deletions...-api/src/org/briarproject/api/sharing/SharingManager.java
- briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java 0 additions, 5 deletions.../src/org/briarproject/sharing/BlogSharingManagerImpl.java
- briar-core/src/org/briarproject/sharing/ForumSharingManagerImpl.java 0 additions, 5 deletions...src/org/briarproject/sharing/ForumSharingManagerImpl.java
Loading
Please register or sign in to comment