Skip to content
Snippets Groups Projects
Verified Commit f01e3fea authored by Julian Dehm's avatar Julian Dehm
Browse files

hotfix

parent af927c4b
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ import javax.annotation.Nullable; ...@@ -33,6 +33,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.api.contact.ContactType.CONTACT_MAILBOX;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.mailbox.IntroduceeState.AWAIT_AUTH; import static org.briarproject.briar.mailbox.IntroduceeState.AWAIT_AUTH;
import static org.briarproject.briar.mailbox.IntroduceeState.LOCAL_ACCEPTED; import static org.briarproject.briar.mailbox.IntroduceeState.LOCAL_ACCEPTED;
...@@ -207,9 +208,8 @@ class IntroduceeProtocolEngine ...@@ -207,9 +208,8 @@ class IntroduceeProtocolEngine
long timestamp = Math.min(s.getLocal().acceptTimestamp, long timestamp = Math.min(s.getLocal().acceptTimestamp,
s.getRemote().acceptTimestamp); s.getRemote().acceptTimestamp);
if (timestamp == -1) throw new AssertionError(); if (timestamp == -1) throw new AssertionError();
contactManager db.addContact(txn, s.getRemote().author, localAuthor.getId(), false,
.addContact(txn, s.getRemote().author, localAuthor.getId(), true, CONTACT_MAILBOX);
false, true);
// Only add transport properties and keys when the contact was added // Only add transport properties and keys when the contact was added
// This will be changed once we have a way to reset state for peers // This will be changed once we have a way to reset state for peers
// that were contacts already at some point in the past. // that were contacts already at some point in the past.
......
...@@ -41,6 +41,7 @@ import javax.annotation.Nullable; ...@@ -41,6 +41,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static org.briarproject.bramble.api.contact.ContactManager.ContactHook; import static org.briarproject.bramble.api.contact.ContactManager.ContactHook;
import static org.briarproject.bramble.api.contact.ContactType.CONTACT;
import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER; import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER;
import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX; import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX;
import static org.briarproject.bramble.api.contact.ContactType.values; import static org.briarproject.bramble.api.contact.ContactType.values;
...@@ -316,9 +317,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook ...@@ -316,9 +317,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook
public void addingContact(Transaction txn, Contact c) throws DbException { public void addingContact(Transaction txn, Contact c) throws DbException {
switch (c.getType()) { switch (c.getType()) {
case PRIVATE_MAILBOX: case PRIVATE_MAILBOX:
break;
case MAILBOX_OWNER: case MAILBOX_OWNER:
break;
case CONTACT: case CONTACT:
contactAdded(txn, c); contactAdded(txn, c);
break; break;
...@@ -344,6 +343,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook ...@@ -344,6 +343,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook
} catch (FormatException e) { } catch (FormatException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }
if (c.getType() != CONTACT) return;
Collection<Contact> pm = db.getContactsByType(txn, PRIVATE_MAILBOX); Collection<Contact> pm = db.getContactsByType(txn, PRIVATE_MAILBOX);
if (pm.isEmpty()) return; if (pm.isEmpty()) return;
Collection<MailboxInfo> mailboxes = db.getContactMailboxes(txn); Collection<MailboxInfo> mailboxes = db.getContactMailboxes(txn);
......
...@@ -40,6 +40,7 @@ import javax.annotation.Nullable; ...@@ -40,6 +40,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static org.briarproject.bramble.api.contact.ContactManager.ContactHook; import static org.briarproject.bramble.api.contact.ContactManager.ContactHook;
import static org.briarproject.bramble.api.contact.ContactType.CONTACT;
import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER; import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER;
import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX; import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX;
import static org.briarproject.bramble.api.contact.ContactType.values; import static org.briarproject.bramble.api.contact.ContactType.values;
...@@ -315,9 +316,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook ...@@ -315,9 +316,7 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook
public void addingContact(Transaction txn, Contact c) throws DbException { public void addingContact(Transaction txn, Contact c) throws DbException {
switch (c.getType()) { switch (c.getType()) {
case PRIVATE_MAILBOX: case PRIVATE_MAILBOX:
break;
case MAILBOX_OWNER: case MAILBOX_OWNER:
break;
case CONTACT: case CONTACT:
contactAdded(txn, c); contactAdded(txn, c);
break; break;
...@@ -343,23 +342,6 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook ...@@ -343,23 +342,6 @@ class MailboxIntroductionManagerImpl extends BdfIncomingMessageHook
} catch (FormatException e) { } catch (FormatException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }
Collection<Contact> pm = db.getContactsByType(txn, PRIVATE_MAILBOX);
if (pm.isEmpty()) return;
Collection<MailboxInfo> mailboxes = db.getContactMailboxes(txn);
for (MailboxInfo mailboxInfo : mailboxes) {
if (mailboxInfo.getContactId().equals(c.getId())) return;
}
ioExecutor.execute(
() -> {
try {
makeIntroduction((PrivateMailbox) pm.iterator().next(),
c,
clock.currentTimeMillis());
} catch (DbException e) {
LOG.warning(
"Mailbox introduction failed: " + e.toString());
}
});
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment