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

Show all Forum Invitations, not only the first

Browse Source
This commit is contained in:
Torsten Grote
2016-07-07 13:43:35 -03:00
parent fa5304c145
commit c577efacbe
10 changed files with 72 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java
View File

@@ -38,9 +38,9 @@ public interface BlogSharingManager
ContactId contactId) throws DbException;
/**
* Returns all blogs to which the user could subscribe.
* Returns all blogs to which the user has been invited.
*/
Collection<Blog> getAvailable() throws DbException;
Collection<Blog> getInvited() throws DbException;
/**
* Returns all contacts who are sharing the given blog with us.

4
briar-api/src/org/briarproject/api/forum/ForumSharingManager.java
View File

@@ -34,8 +34,8 @@ public interface ForumSharingManager extends SharingManager<Forum, ForumInvitati
Collection<ForumInvitationMessage> getInvitationMessages(
ContactId contactId) throws DbException;
/** Returns all forums to which the user could subscribe. */
Collection<Forum> getAvailable() throws DbException;
/** Returns all forums to which the user has been invited. */
Collection<Forum> getInvited() throws DbException;
/** Returns all contacts who are sharing the given forum with us. */
Collection<Contact> getSharedBy(GroupId g) throws DbException;

1
briar-api/src/org/briarproject/api/sharing/SharingConstants.java
View File

@@ -25,7 +25,6 @@ public interface SharingConstants {
int SHARE_MSG_TYPE_DECLINE = 3;
int SHARE_MSG_TYPE_LEAVE = 4;
int SHARE_MSG_TYPE_ABORT = 5;
String TASK = "task";
int TASK_ADD_SHAREABLE_TO_LIST_SHARED_WITH_US = 0;
int TASK_REMOVE_SHAREABLE_FROM_LIST_SHARED_WITH_US = 1;
int TASK_ADD_SHARED_SHAREABLE = 2;

8
briar-api/src/org/briarproject/api/sharing/SharingManager.java
View File

@@ -3,8 +3,6 @@ package org.briarproject.api.sharing;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.forum.Forum;
import org.briarproject.api.forum.ForumInvitationMessage;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.GroupId;
@@ -16,7 +14,7 @@ public interface SharingManager<S extends Shareable, IM extends InvitationMessag
ClientId getClientId();
/**
* Sends an invitation to share the given group with the given contact
* Sends an invitation to share the given shareable with the given contact
* and sends an optional message along with it.
*/
void sendInvitation(GroupId groupId, ContactId contactId,
@@ -35,8 +33,8 @@ public interface SharingManager<S extends Shareable, IM extends InvitationMessag
Collection<IM> getInvitationMessages(
ContactId contactId) throws DbException;
/** Returns all groups to which the user could subscribe. */
Collection<S> getAvailable() throws DbException;
/** Returns all shareables to which the user has been invited. */
Collection<S> getInvited() throws DbException;
/** Returns all contacts who are sharing the given group with us. */
Collection<Contact> getSharedBy(GroupId g) throws DbException;