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

Renamed some factory methods.

Browse Source
This commit is contained in:
akwizgran
2013-03-12 13:59:55 +00:00
parent 127ed22c40
commit be3b0bf4d6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
View File

@@ -11,12 +11,12 @@ public interface MessageFactory {
byte[] body) throws IOException, GeneralSecurityException; byte[] body) throws IOException, GeneralSecurityException;
/** Creates an anonymous message to an unrestricted group. */ /** Creates an anonymous message to an unrestricted group. */
Message createAnonymousGroupMessage(MessageId parent, Group group, Message createAnonymousMessage(MessageId parent, Group group,
String contentType, byte[] body) throws IOException, String contentType, byte[] body) throws IOException,
GeneralSecurityException; GeneralSecurityException;
/** Creates an anonymous message to a restricted group. */ /** Creates an anonymous message to a restricted group. */
Message createAnonymousGroupMessage(MessageId parent, Group group, Message createAnonymousMessage(MessageId parent, Group group,
PrivateKey groupKey, String contentType, byte[] body) PrivateKey groupKey, String contentType, byte[] body)
throws IOException, GeneralSecurityException; throws IOException, GeneralSecurityException;

8
briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
View File

@@ -63,14 +63,14 @@ class MessageFactoryImpl implements MessageFactory {
return createMessage(parent, null, null, null, null, contentType, body); return createMessage(parent, null, null, null, null, contentType, body);
} }
public Message createAnonymousGroupMessage(MessageId parent, Group group, public Message createAnonymousMessage(MessageId parent, Group group,
String contentType, byte[] body) throws IOException, String contentType, byte[] body) throws IOException,
GeneralSecurityException { GeneralSecurityException {
return createMessage(parent, group, null, null, null, contentType, return createMessage(parent, group, null, null, null, contentType,
body); body);
} }
public Message createAnonymousGroupMessage(MessageId parent, Group group, public Message createAnonymousMessage(MessageId parent, Group group,
PrivateKey groupKey, String contentType, byte[] body) PrivateKey groupKey, String contentType, byte[] body)
throws IOException, GeneralSecurityException { throws IOException, GeneralSecurityException {
return createMessage(parent, group, groupKey, null, null, contentType, return createMessage(parent, group, groupKey, null, null, contentType,
@@ -78,8 +78,8 @@ class MessageFactoryImpl implements MessageFactory {
} }
public Message createPseudonymousMessage(MessageId parent, Group group, public Message createPseudonymousMessage(MessageId parent, Group group,
Author author, PrivateKey authorKey, String contentType, byte[] body) Author author, PrivateKey authorKey, String contentType,
throws IOException, GeneralSecurityException { byte[] body) throws IOException, GeneralSecurityException {
return createMessage(parent, group, null, author, authorKey, return createMessage(parent, group, null, author, authorKey,
contentType, body); contentType, body);
} }

4
briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -106,9 +106,9 @@ public class ProtocolIntegrationTest extends BriarTestCase {
authorKeyPair.getPublic().getEncoded()); authorKeyPair.getPublic().getEncoded());
// Create two messages to each group: one anonymous, one pseudonymous // Create two messages to each group: one anonymous, one pseudonymous
MessageFactory messageFactory = i.getInstance(MessageFactory.class); MessageFactory messageFactory = i.getInstance(MessageFactory.class);
message = messageFactory.createAnonymousGroupMessage(null, group, message = messageFactory.createAnonymousMessage(null, group,
contentType, messageBody.getBytes("UTF-8")); contentType, messageBody.getBytes("UTF-8"));
message1 = messageFactory.createAnonymousGroupMessage(null, group1, message1 = messageFactory.createAnonymousMessage(null, group1,
groupKeyPair.getPrivate(), contentType, groupKeyPair.getPrivate(), contentType,
messageBody.getBytes("UTF-8")); messageBody.getBytes("UTF-8"));
message2 = messageFactory.createPseudonymousMessage(null, group, message2 = messageFactory.createPseudonymousMessage(null, group,