Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-06-11 16:45:35 +02:00
Code Issues Projects Releases Wiki Activity

Moved some API classes into packages.

Browse Source
This commit is contained in:
akwizgran
2015-12-16 13:46:08 +00:00
parent 9fbdb08cf1
commit c5282c5b17
115 changed files with 408 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
briar-api/src/org/briarproject/api/android/AndroidNotificationManager.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.android;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.sync.GroupId;
briar-api/src/org/briarproject/api/Contact.java → briar-api/src/org/briarproject/api/contact/Contact.java
+4 -1
View File
@@ -1,4 +1,7 @@
package org.briarproject.api;
package org.briarproject.api.contact;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
public class Contact {
briar-api/src/org/briarproject/api/ContactId.java → briar-api/src/org/briarproject/api/contact/ContactId.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.briarproject.api;
package org.briarproject.api.contact;
/**
* Type-safe wrapper for an integer that uniquely identifies a contact within
briar-api/src/org/briarproject/api/contact/ContactManager.java
+2 -4
View File
@@ -1,10 +1,8 @@
package org.briarproject.api.contact;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorId;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
import java.util.Collection;
briar-api/src/org/briarproject/api/db/DatabaseComponent.java
+5 -5
View File
@@ -1,14 +1,14 @@
package org.briarproject.api.db;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorId;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.Settings;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.sync.Ack;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
briar-api/src/org/briarproject/api/event/ContactAddedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/** An event that is broadcast when a contact is added. */
public class ContactAddedEvent extends Event {
briar-api/src/org/briarproject/api/event/ContactConnectedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a contact connects that was not previously
briar-api/src/org/briarproject/api/event/ContactDisconnectedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a contact disconnects and is no longer
briar-api/src/org/briarproject/api/event/ContactRemovedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/** An event that is broadcast when a contact is removed. */
public class ContactRemovedEvent extends Event {
briar-api/src/org/briarproject/api/event/LocalAuthorAddedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.AuthorId;
import org.briarproject.api.identity.AuthorId;
/** An event that is broadcast when a local pseudonym is added. */
public class LocalAuthorAddedEvent extends Event {
briar-api/src/org/briarproject/api/event/LocalAuthorRemovedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.AuthorId;
import org.briarproject.api.identity.AuthorId;
/** An event that is broadcast when a local pseudonym is removed. */
public class LocalAuthorRemovedEvent extends Event {
briar-api/src/org/briarproject/api/event/LocalSubscriptionsUpdatedEvent.java
+2 -2
View File
@@ -1,8 +1,8 @@
package org.briarproject.api.event;
import java.util.Collection;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.ContactId;
import java.util.Collection;
/**
* An event that is broadcast when the set of subscriptions visible to one or
briar-api/src/org/briarproject/api/event/MessageAddedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.sync.Group;
/** An event that is broadcast when a message is added to the database. */
briar-api/src/org/briarproject/api/event/MessageRequestedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/** An event that is broadcast when a message is requested by a contact. */
public class MessageRequestedEvent extends Event {
briar-api/src/org/briarproject/api/event/MessageToAckEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a message is received from or offered by a
briar-api/src/org/briarproject/api/event/MessageToRequestEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a message is offered by a contact and needs
briar-api/src/org/briarproject/api/event/MessagesAckedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.sync.MessageId;
import java.util.Collection;
briar-api/src/org/briarproject/api/event/MessagesSentEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.sync.MessageId;
import java.util.Collection;
briar-api/src/org/briarproject/api/event/RemoteSubscriptionsUpdatedEvent.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
/** An event that is broadcast when a contact's subscriptions are updated. */
public class RemoteSubscriptionsUpdatedEvent extends Event {
briar-api/src/org/briarproject/api/event/RemoteTransportsUpdatedEvent.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.event;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a contact's remote transport properties
briar-api/src/org/briarproject/api/forum/ForumManager.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.forum;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
briar-api/src/org/briarproject/api/Author.java → briar-api/src/org/briarproject/api/identity/Author.java
+3 -5
View File
@@ -1,13 +1,11 @@
package org.briarproject.api;
import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
package org.briarproject.api.identity;
import java.io.UnsupportedEncodingException;
/** A pseudonym for a user. */
public class Author {
public enum Status { ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED };
public enum Status { ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED }
private final AuthorId id;
private final String name;
@@ -20,7 +18,7 @@ public class Author {
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
if (length == 0 || length > MAX_AUTHOR_NAME_LENGTH)
if (length == 0 || length > AuthorConstants.MAX_AUTHOR_NAME_LENGTH)
throw new IllegalArgumentException();
this.id = id;
this.name = name;
briar-api/src/org/briarproject/api/AuthorConstants.java → briar-api/src/org/briarproject/api/identity/AuthorConstants.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.briarproject.api;
package org.briarproject.api.identity;
public interface AuthorConstants {
briar-api/src/org/briarproject/api/AuthorFactory.java → briar-api/src/org/briarproject/api/identity/AuthorFactory.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.briarproject.api;
package org.briarproject.api.identity;
public interface AuthorFactory {
briar-api/src/org/briarproject/api/AuthorId.java → briar-api/src/org/briarproject/api/identity/AuthorId.java
+3 -1
View File
@@ -1,4 +1,6 @@
package org.briarproject.api;
package org.briarproject.api.identity;
import org.briarproject.api.UniqueId;
import java.util.Arrays;
briar-api/src/org/briarproject/api/identity/IdentityManager.java
-2
View File
@@ -1,7 +1,5 @@
package org.briarproject.api.identity;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.db.DbException;
import java.util.Collection;
briar-api/src/org/briarproject/api/LocalAuthor.java → briar-api/src/org/briarproject/api/identity/LocalAuthor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.briarproject.api;
package org.briarproject.api.identity;
/** A pseudonym for the local user. */
public class LocalAuthor extends Author {
briar-api/src/org/briarproject/api/invitation/InvitationTaskFactory.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.invitation;
import org.briarproject.api.AuthorId;
import org.briarproject.api.identity.AuthorId;
/** Creates tasks for exchanging invitations with remote peers. */
public interface InvitationTaskFactory {
briar-api/src/org/briarproject/api/messaging/MessagingManager.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.messaging;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
briar-api/src/org/briarproject/api/plugins/ConnectionManager.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.plugins;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
public interface ConnectionManager {
briar-api/src/org/briarproject/api/plugins/ConnectionRegistry.java
+3 -3
View File
@@ -1,9 +1,9 @@
package org.briarproject.api.plugins;
import java.util.Collection;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import java.util.Collection;
/**
* Keeps track of which contacts are currently connected by which transports.
briar-api/src/org/briarproject/api/plugins/Plugin.java
+3 -3
View File
@@ -1,11 +1,11 @@
package org.briarproject.api.plugins;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import java.io.IOException;
import java.util.Collection;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
public interface Plugin {
/** Returns the plugin's transport identifier. */
briar-api/src/org/briarproject/api/plugins/PluginCallback.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.briarproject.api.plugins;
import java.util.Map;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.contact.ContactId;
import java.util.Map;
/**
* An interface through which a transport plugin interacts with the rest of
briar-api/src/org/briarproject/api/plugins/duplex/DuplexPlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.plugins.duplex;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.Plugin;
briar-api/src/org/briarproject/api/plugins/duplex/DuplexPluginCallback.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.plugins.duplex;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.plugins.PluginCallback;
/**
briar-api/src/org/briarproject/api/plugins/simplex/SimplexPlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.plugins.simplex;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.TransportConnectionReader;
import org.briarproject.api.plugins.TransportConnectionWriter;
briar-api/src/org/briarproject/api/plugins/simplex/SimplexPluginCallback.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.plugins.simplex;
import org.briarproject.api.ContactId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.plugins.PluginCallback;
import org.briarproject.api.plugins.TransportConnectionReader;
import org.briarproject.api.plugins.TransportConnectionWriter;
briar-api/src/org/briarproject/api/sync/Message.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.sync;
import org.briarproject.api.Author;
import org.briarproject.api.identity.Author;
public interface Message {
@@ -20,7 +20,7 @@ public interface Message {
Group getGroup();
/**
* Returns the message's {@link org.briarproject.api.Author Author}, or null
* Returns the message's {@link Author Author}, or null
* if this is an anonymous message.
*/
Author getAuthor();
briar-api/src/org/briarproject/api/sync/MessageFactory.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.sync;
import org.briarproject.api.Author;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.identity.Author;
import java.io.IOException;
import java.security.GeneralSecurityException;
briar-api/src/org/briarproject/api/sync/MessageHeader.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.sync;
import org.briarproject.api.Author;
import org.briarproject.api.identity.Author;
public class MessageHeader {
briar-api/src/org/briarproject/api/sync/MessagingSessionFactory.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.sync;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import java.io.InputStream;
import java.io.OutputStream;
briar-api/src/org/briarproject/api/sync/UnverifiedMessage.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.briarproject.api.sync;
import org.briarproject.api.Author;
import org.briarproject.api.identity.Author;
/** A {@link Message} that has not yet had its signatures (if any) verified. */
public class UnverifiedMessage {
@@ -45,7 +45,7 @@ public class UnverifiedMessage {
}
/**
* Returns the message's {@link org.briarproject.api.Author Author}, or null
* Returns the message's {@link Author Author}, or null
* if this is an anonymous message.
*/
public Author getAuthor() {
briar-api/src/org/briarproject/api/transport/KeyManager.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.transport;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.Service;
briar-api/src/org/briarproject/api/transport/StreamContext.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.briarproject.api.transport;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.crypto.SecretKey;
public class StreamContext {