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

Simplify logic.

Browse Source
This commit is contained in:
akwizgran
2022-08-08 12:30:20 +01:00
parent d3a06cf2c0
commit 42243f73f4
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxClientManager.java
View File

@@ -330,29 +330,26 @@ class MailboxClientManager implements Service, EventListener {
for (Entry<ContactId, Updates> e : contactUpdates.entrySet()) {
ContactId c = e.getKey();
Updates u = e.getValue();
boolean isOwnMailboxUsable =
isOwnMailboxUsable(ownProperties, u.remote);
if (!isOwnMailboxUsable(ownProperties, u.remote)) {
// Our mailbox isn't usable for communicating with this
// contact, so don't assign/reassign this contact
continue;
}
if (isContactMailboxUsable(u.remote)) {
// The contact has a usable mailbox, so the contact should
// currently be assigned to the contact's mailbox for upload
// and download
if (isOwnMailboxUsable) {
// Reassign the contact to our mailbox for download
MailboxClient contactClient =
requireNonNull(contactClients.get(c));
contactClient.deassignContactForDownload(c);
assignContactToOwnMailboxForDownload(c, u);
}
// Else the contact remains assigned to the contact's mailbox
// for download
} else if (isOwnMailboxUsable) {
// and download. Reassign the contact to our mailbox for
// download
MailboxClient contactClient =
requireNonNull(contactClients.get(c));
contactClient.deassignContactForDownload(c);
assignContactToOwnMailboxForDownload(c, u);
} else {
// The contact doesn't have a usable mailbox, so assign the
// contact to our mailbox for upload and download
assignContactToOwnMailboxForUpload(c, u);
assignContactToOwnMailboxForDownload(c, u);
}
// Else the contact doesn't have a usable mailbox and neither do we,
// so the contact remains unassigned for upload and download
}
}