Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '461-forum-invitation-can-not-be-accepted-if-forum-already-added' into 'master'

Browse Source 
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:

![device-2016-07-07-144141](/uploads/9c8d06decdd19117250e3faca0c38192/device-2016-07-07-144141.png)
![device-2016-07-07-144150](/uploads/9803f567c962a721b24d79359974a29f/device-2016-07-07-144150.png)

Closes #461

See merge request !241
This commit is contained in:
str4d
2016-07-12 23:34:22 +00:00
parent 89469f9d35 85f96d8865
commit 67aa7c3269
21 changed files with 333 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/AndroidManifest.xml
View File

@@ -100,8 +100,8 @@
</activity>
<activity
android:name=".android.forum.AvailableForumsActivity"
android:label="@string/available_forums_title"
android:name=".android.forum.ForumInvitationsActivity"
android:label="@string/forum_invitations_title"
android:parentActivityName=".android.NavDrawerActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"