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

Removed direct calls to DB's contact/identity methods.

Browse Source
This commit is contained in:
akwizgran
2016-02-08 11:44:57 +00:00
parent 623707af0f
commit 675ce4bfef
10 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java
View File

@@ -71,16 +71,16 @@ class MessagingManagerImpl implements MessagingManager, AddContactHook,
}
@Override
public void addingContact(ContactId c) {
public void addingContact(Contact c) {
try {
// Create a group to share with the contact
Group g = getContactGroup(db.getContact(c));
Group g = getContactGroup(c);
// Store the group and share it with the contact
db.addGroup(g);
db.setVisibility(g.getId(), Collections.singletonList(c));
db.setVisibility(g.getId(), Collections.singletonList(c.getId()));
// Attach the contact ID to the group
BdfDictionary d = new BdfDictionary();
d.put("contactId", c.getInt());
d.put("contactId", c.getId().getInt());
db.mergeGroupMetadata(g.getId(), metadataEncoder.encode(d));
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
@@ -94,9 +94,9 @@ class MessagingManagerImpl implements MessagingManager, AddContactHook,
}
@Override
public void removingContact(ContactId c) {
public void removingContact(Contact c) {
try {
db.removeGroup(getContactGroup(db.getContact(c)));
db.removeGroup(getContactGroup(c));
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}