From 211950ce6648a6ec948539c4494f0503bbd7ba2b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 12 Mar 2013 14:42:28 +0000
Subject: [PATCH] Added a factory method for unrestricted groups.
---
briar-api/src/net/sf/briar/api/messaging/GroupFactory.java | 4 ++++
briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java | 4 ++++
briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/briar-api/src/net/sf/briar/api/messaging/GroupFactory.java b/briar-api/src/net/sf/briar/api/messaging/GroupFactory.java
index 4d85ed88b7..dec240777b 100644
--- a/briar-api/src/net/sf/briar/api/messaging/GroupFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/GroupFactory.java
@@ -4,5 +4,9 @@ import java.io.IOException;
public interface GroupFactory {
+ /** Creates an unrestricted group. */
+ Group createGroup(String name) throws IOException;
+
+ /** Creates a restricted group. */
Group createGroup(String name, byte[] publicKey) throws IOException;
}
diff --git a/briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java
index 6ceeee6a1d..a7cf91f133 100644
--- a/briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java
@@ -26,6 +26,10 @@ class GroupFactoryImpl implements GroupFactory {
this.writerFactory = writerFactory;
}
+ public Group createGroup(String name) throws IOException {
+ return createGroup(name, null);
+ }
+
public Group createGroup(String name, byte[] publicKey) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
Writer w = writerFactory.createWriter(out);
diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
index 2c400f9ea0..fff45ea22d 100644
--- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
@@ -94,7 +94,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
new Random().nextBytes(secret);
// Create two groups: one restricted, one unrestricted
GroupFactory groupFactory = i.getInstance(GroupFactory.class);
- group = groupFactory.createGroup("Unrestricted group", null);
+ group = groupFactory.createGroup("Unrestricted group");
CryptoComponent crypto = i.getInstance(CryptoComponent.class);
KeyPair groupKeyPair = crypto.generateSignatureKeyPair();
group1 = groupFactory.createGroup("Restricted group",
--
GitLab