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

Remove local author from contacts.

Browse Source
This commit is contained in:
akwizgran
2019-04-16 14:49:35 +01:00
parent 421c9c44d6
commit 3c290a320e
51 changed files with 760 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-api/src/main/java/org/briarproject/briar/api/conversation/ConversationManager.java
View File

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.Group;
import org.briarproject.bramble.api.sync.GroupId;
@@ -39,7 +40,7 @@ public interface ConversationManager {
@NotNullByDefault
interface ConversationClient {
Group getContactGroup(Contact c);
Group getContactGroup(Contact c, AuthorId local);
Collection<ConversationMessageHeader> getMessageHeaders(Transaction txn,
ContactId contactId) throws DbException;

5
briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java
View File

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.crypto.CryptoExecutor;
import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.identity.LocalAuthor;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
@@ -20,8 +21,8 @@ public interface GroupInvitationFactory {
* included in the member's join message.
*/
@CryptoExecutor
byte[] signInvitation(Contact c, GroupId privateGroupId, long timestamp,
byte[] privateKey);
byte[] signInvitation(LocalAuthor creator, Contact member,
GroupId privateGroupId, long timestamp);
/**
* Returns a token to be signed by the creator when inviting a member to

6
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.test;
import org.briarproject.bramble.api.FormatException;
import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
@@ -24,9 +23,4 @@ public interface TestDataCreator {
@IoExecutor
Contact addContact(String name) throws DbException;
@IoExecutor
void addPrivateMessage(Contact contact, String text, long time,
boolean local) throws DbException, FormatException;
}