Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '224-duplicate-contacts' into 'master'

Browse Source 
Allow multiple identities to have the same contact. #224



See merge request !82
This commit is contained in:
akwizgran
2016-01-29 13:12:48 +00:00
parent e1ba1465e0 0fd8a67ee0
commit 323a47d2f0
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/org/briarproject/db/Database.java
View File

@@ -155,11 +155,13 @@ interface Database<T> {
void addVisibility(T txn, ContactId c, GroupId g) throws DbException;
/**
* Returns true if the database contains the given contact.
* Returns true if the database contains the given contact for the given
* local pseudonym.
* <p>
* Locking: read.
*/
boolean containsContact(T txn, AuthorId a) throws DbException;
boolean containsContact(T txn, AuthorId remote, AuthorId local)
throws DbException;
/**
* Returns true if the database contains the given contact.

4
briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
View File

@@ -144,10 +144,10 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
try {
T txn = db.startTransaction();
try {
if (db.containsContact(txn, remote.getId()))
throw new ContactExistsException();
if (!db.containsLocalAuthor(txn, local))
throw new NoSuchLocalAuthorException();
if (db.containsContact(txn, remote.getId(), local))
throw new ContactExistsException();
ContactId c = db.addContact(txn, remote, local);
db.commitTransaction(txn);
return c;

10
briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -871,14 +871,16 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
public boolean containsContact(Connection txn, AuthorId a)
throws DbException {
public boolean containsContact(Connection txn, AuthorId remote,
AuthorId local) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
String sql = "SELECT NULL FROM contacts WHERE authorId = ?";
String sql = "SELECT NULL FROM contacts"
+ " WHERE authorId = ? AND localAuthorId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, a.getBytes());
ps.setBytes(1, remote.getBytes());
ps.setBytes(2, local.getBytes());
rs = ps.executeQuery();
boolean found = rs.next();
if (rs.next()) throw new DbStateException();

11
briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
View File

@@ -132,10 +132,10 @@ public class DatabaseComponentImplTest extends BriarTestCase {
will(returnValue(false));
oneOf(database).addLocalAuthor(txn, localAuthor);
// addContact()
oneOf(database).containsContact(txn, authorId);
will(returnValue(false));
oneOf(database).containsLocalAuthor(txn, localAuthorId);
will(returnValue(true));
oneOf(database).containsContact(txn, authorId, localAuthorId);
will(returnValue(false));
oneOf(database).addContact(txn, author, localAuthorId);
will(returnValue(contactId));
// getContacts()
@@ -447,9 +447,6 @@ public class DatabaseComponentImplTest extends BriarTestCase {
exactly(3).of(database).containsLocalAuthor(txn, localAuthorId);
will(returnValue(false));
exactly(3).of(database).abortTransaction(txn);
// This is needed for addContact() to proceed
exactly(1).of(database).containsContact(txn, authorId);
will(returnValue(false));
}});
DatabaseComponent db = createDatabaseComponent(database, eventBus,
shutdown);
@@ -624,10 +621,10 @@ public class DatabaseComponentImplTest extends BriarTestCase {
// addContact()
oneOf(database).startTransaction();
will(returnValue(txn));
oneOf(database).containsContact(txn, authorId);
will(returnValue(false));
oneOf(database).containsLocalAuthor(txn, localAuthorId);
will(returnValue(true));
oneOf(database).containsContact(txn, authorId, localAuthorId);
will(returnValue(false));
oneOf(database).addContact(txn, author, localAuthorId);
will(returnValue(contactId));
oneOf(database).commitTransaction(txn);