From 54f320465f13d854a769708f59e83250e2874eae Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Feb 2016 13:15:11 -0300
Subject: [PATCH] Add information about whether Contact is active to
ContactAddedEvent
---
.../src/org/briarproject/api/event/ContactAddedEvent.java | 8 +++++++-
.../src/org/briarproject/db/DatabaseComponentImpl.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/briar-api/src/org/briarproject/api/event/ContactAddedEvent.java b/briar-api/src/org/briarproject/api/event/ContactAddedEvent.java
index b8d29bf27c..0b2e5017cc 100644
--- a/briar-api/src/org/briarproject/api/event/ContactAddedEvent.java
+++ b/briar-api/src/org/briarproject/api/event/ContactAddedEvent.java
@@ -6,12 +6,18 @@ import org.briarproject.api.contact.ContactId;
public class ContactAddedEvent extends Event {
private final ContactId contactId;
+ private final boolean active;
- public ContactAddedEvent(ContactId contactId) {
+ public ContactAddedEvent(ContactId contactId, boolean active) {
this.contactId = contactId;
+ this.active = active;
}
public ContactId getContactId() {
return contactId;
}
+
+ public boolean isActive() {
+ return active;
+ }
}
diff --git a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
index 150d0a43a2..d3e48748c6 100644
--- a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
+++ b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
@@ -161,7 +161,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
if (db.containsContact(txn, remote.getId(), local))
throw new ContactExistsException();
ContactId c = db.addContact(txn, remote, local, active);
- transaction.attach(new ContactAddedEvent(c));
+ transaction.attach(new ContactAddedEvent(c, active));
if (active) transaction.attach(new ContactStatusChangedEvent(c, true));
return c;
}
--
GitLab