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 4d85ed88b70b38707009211abe941a47ade8c2c6..dec240777b3fe0c7818da19d96432cd902059518 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 6ceeee6a1d35c0c4202da168ebff2dae51961b04..a7cf91f133eb9ec7784b2f619dce94ff05944090 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 2c400f9ea0a327d7653747b9c46aa2eea4fc24af..fff45ea22d559dc5b9063b8011072a3b2c928ebc 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",