Changed the root package from net.sf.briar to org.briarproject.

briar-api/src/org/briarproject/api/invitation/InvitationConstants.java

@@ -0,0 +1,14 @@
+package org.briarproject.api.invitation;
+
+public interface InvitationConstants {
+
+	long CONNECTION_TIMEOUT = 30 * 1000; // Milliseconds
+
+	long CONFIRMATION_TIMEOUT = 60 * 1000; // Milliseconds
+
+	int CODE_BITS = 19; // Codes must fit into six decimal digits
+
+	int HASH_LENGTH = 48; // Bytes
+
+	int MAX_PUBLIC_KEY_LENGTH = 97; // Bytes
+}

briar-api/src/org/briarproject/api/invitation/InvitationListener.java

@@ -0,0 +1,47 @@
+package org.briarproject.api.invitation;
+
+/**
+ * An interface for receiving updates about the state of an
+ * {@link InvitationTask}.
+ */
+public interface InvitationListener {
+
+	/** Called if a connection to the remote peer is established. */
+	void connectionSucceeded();
+
+	/**
+	 * Called if a connection to the remote peer cannot be established. This
+	 * indicates that the protocol has ended unsuccessfully.
+	 */
+	void connectionFailed();
+
+	/** Called if key agreement with the remote peer succeeds. */
+	void keyAgreementSucceeded(int localCode, int remoteCode);
+
+	/**
+	 * Called if key agreement with the remote peer fails or the connection is
+	 * lost. This indicates that the protocol has ended unsuccessfully.
+	 */
+	void keyAgreementFailed();
+
+	/** Called if the remote peer's confirmation check succeeds. */
+	void remoteConfirmationSucceeded();
+
+	/**
+	 * Called if remote peer's confirmation check fails or the connection is
+	 * lost. This indicates that the protocol has ended unsuccessfully.
+	 */
+	void remoteConfirmationFailed();
+
+	/**
+	 * Called if the exchange of pseudonyms succeeds. This indicates that the
+	 * protocol has ended successfully.
+	 */
+	void pseudonymExchangeSucceeded(String remoteName);
+
+	/**
+	 * Called if the exchange of pseudonyms fails or the connection is lost.
+	 * This indicates that the protocol has ended unsuccessfully.
+	 */
+	void pseudonymExchangeFailed();
+}

briar-api/src/org/briarproject/api/invitation/InvitationState.java

@@ -0,0 +1,73 @@
+package org.briarproject.api.invitation;
+
+public class InvitationState {
+
+	private final int localInvitationCode, remoteInvitationCode;
+	private final int localConfirmationCode, remoteConfirmationCode;
+	private final boolean connected, connectionFailed;
+	private final boolean localCompared, remoteCompared;
+	private final boolean localMatched, remoteMatched;
+	private final String contactName;
+
+	public InvitationState(int localInvitationCode, int remoteInvitationCode,
+			int localConfirmationCode, int remoteConfirmationCode,
+			boolean connected, boolean connectionFailed, boolean localCompared,
+			boolean remoteCompared, boolean localMatched,
+			boolean remoteMatched, String contactName) {
+		this.localInvitationCode = localInvitationCode;
+		this.remoteInvitationCode = remoteInvitationCode;
+		this.localConfirmationCode = localConfirmationCode;
+		this.remoteConfirmationCode = remoteConfirmationCode;
+		this.connected = connected;
+		this.connectionFailed = connectionFailed;
+		this.localCompared = localCompared;
+		this.remoteCompared = remoteCompared;
+		this.localMatched = localMatched;
+		this.remoteMatched = remoteMatched;
+		this.contactName = contactName;
+	}
+
+	public int getLocalInvitationCode() {
+		return localInvitationCode;
+	}
+
+	public int getRemoteInvitationCode() {
+		return remoteInvitationCode;
+	}
+
+	public int getLocalConfirmationCode() {
+		return localConfirmationCode;
+	}
+
+	public int getRemoteConfirmationCode() {
+		return remoteConfirmationCode;
+	}
+
+	public boolean getConnected() {
+		return connected;
+	}
+
+	public boolean getConnectionFailed() {
+		return connectionFailed;
+	}
+
+	public boolean getLocalCompared() {
+		return localCompared;
+	}
+
+	public boolean getRemoteCompared() {
+		return remoteCompared;
+	}
+
+	public boolean getLocalMatched() {
+		return localMatched;
+	}
+
+	public boolean getRemoteMatched() {
+		return remoteMatched;
+	}
+
+	public String getContactName() {
+		return contactName;
+	}
+}

briar-api/src/org/briarproject/api/invitation/InvitationTask.java

@@ -0,0 +1,29 @@
+package org.briarproject.api.invitation;
+
+/** A task for exchanging invitations with a remote peer. */
+public interface InvitationTask {
+
+	/**
+	 * Adds a listener to be informed of state changes and returns the
+	 * task's current state.
+	 */
+	InvitationState addListener(InvitationListener l);
+
+	/** Removes the given listener. */
+	void removeListener(InvitationListener l);
+
+	/** Asynchronously starts the connection process. */
+	void connect();
+
+	/**
+	 * Asynchronously informs the remote peer that the local peer's
+	 * confirmation codes matched.
+	 */
+	void localConfirmationSucceeded();
+
+	/**
+	 * Asynchronously informs the remote peer that the local peer's
+	 * confirmation codes did not match.
+	 */
+	void localConfirmationFailed();
+}

briar-api/src/org/briarproject/api/invitation/InvitationTaskFactory.java

@@ -0,0 +1,11 @@
+package org.briarproject.api.invitation;
+
+import org.briarproject.api.AuthorId;
+
+/** Creates tasks for exchanging invitations with remote peers. */
+public interface InvitationTaskFactory {
+
+	/** Creates a task using the given pseudonym and invitation codes. */
+	InvitationTask createTask(AuthorId localAuthorId, int localCode,
+			int remoteCode);
+}