From d20457f338ad4afb29b37c7de7d2598ea2b43173 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 19 Jul 2022 17:49:01 +0100 Subject: [PATCH] Remove redundant method for recording successful connection. --- .../api/mailbox/MailboxSettingsManager.java | 3 --- .../mailbox/MailboxPairingTaskImpl.java | 3 ++- .../mailbox/MailboxSettingsManagerImpl.java | 24 ++++--------------- .../mailbox/MailboxPairingTaskImplTest.java | 3 ++- .../MailboxSettingsManagerImplTest.java | 9 +++---- 5 files changed, 11 insertions(+), 31 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java index e2c8580bd..9badc0611 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxSettingsManager.java @@ -32,9 +32,6 @@ public interface MailboxSettingsManager { MailboxStatus getOwnMailboxStatus(Transaction txn) throws DbException; - void recordSuccessfulConnection(Transaction txn, long now) - throws DbException; - void recordSuccessfulConnection(Transaction txn, long now, List versions) throws DbException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java index 621e8fa8f..4335b614a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java @@ -120,7 +120,8 @@ class MailboxPairingTaskImpl implements MailboxPairingTask { db.transaction(false, txn -> { mailboxSettingsManager .setOwnMailboxProperties(txn, ownerProperties); - mailboxSettingsManager.recordSuccessfulConnection(txn, time); + mailboxSettingsManager.recordSuccessfulConnection(txn, time, + ownerProperties.getServerSupports()); // A (possibly new) mailbox is paired. Reset message retransmission // timers for contacts who doesn't have their own mailbox. This way, // data stranded on our old mailbox will be re-uploaded to our new. diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java index 409750b6f..5cc6cd2d9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java @@ -112,34 +112,18 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager { serverSupports); } - @Override - public void recordSuccessfulConnection(Transaction txn, long now) - throws DbException { - recordSuccessfulConnection(txn, now, null); - } - @Override public void recordSuccessfulConnection(Transaction txn, long now, - @Nullable List versions) throws DbException { + List versions) throws DbException { Settings s = new Settings(); - // fetch version that the server supports first - List serverSupports; - if (versions == null) { - Settings oldSettings = - settingsManager.getSettings(txn, SETTINGS_NAMESPACE); - serverSupports = parseServerSupports(oldSettings); - } else { - serverSupports = versions; - // store new versions - encodeServerSupports(serverSupports, s); - } - // now record the successful connection + // record the successful connection s.putLong(SETTINGS_KEY_LAST_ATTEMPT, now); s.putLong(SETTINGS_KEY_LAST_SUCCESS, now); s.putInt(SETTINGS_KEY_ATTEMPTS, 0); + encodeServerSupports(versions, s); settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE); // broadcast status event - MailboxStatus status = new MailboxStatus(now, now, 0, serverSupports); + MailboxStatus status = new MailboxStatus(now, now, 0, versions); txn.attach(new OwnMailboxConnectionStatusEvent(status)); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java index 5dc7e379c..6a3e312ed 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java @@ -110,7 +110,8 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase { oneOf(db).transaction(with(false), withDbRunnable(txn)); oneOf(mailboxSettingsManager).setOwnMailboxProperties( with(txn), with(matches(ownerProperties))); - oneOf(mailboxSettingsManager).recordSuccessfulConnection(txn, time); + oneOf(mailboxSettingsManager).recordSuccessfulConnection(txn, time, + ownerProperties.getServerSupports()); oneOf(db).getContacts(txn); will(returnValue(singletonList(contact1))); oneOf(mailboxUpdateManager).getRemoteUpdate(txn, diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java index 4debd8d42..02e75c727 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java @@ -147,22 +147,19 @@ public class MailboxSettingsManagerImplTest extends BrambleMockTestCase { @Test public void testRecordsSuccess() throws Exception { Transaction txn = new Transaction(null, false); - Settings oldSettings = new Settings(); - oldSettings - .putIntArray(SETTINGS_KEY_SERVER_SUPPORTS, serverSupportsInts); Settings expectedSettings = new Settings(); expectedSettings.putLong(SETTINGS_KEY_LAST_ATTEMPT, now); expectedSettings.putLong(SETTINGS_KEY_LAST_SUCCESS, now); expectedSettings.putInt(SETTINGS_KEY_ATTEMPTS, 0); + expectedSettings.putIntArray(SETTINGS_KEY_SERVER_SUPPORTS, + serverSupportsInts); context.checking(new Expectations() {{ - oneOf(settingsManager).getSettings(txn, SETTINGS_NAMESPACE); - will(returnValue(oldSettings)); oneOf(settingsManager).mergeSettings(txn, expectedSettings, SETTINGS_NAMESPACE); }}); - manager.recordSuccessfulConnection(txn, now); + manager.recordSuccessfulConnection(txn, now, serverSupports); assertTrue(hasEvent(txn, OwnMailboxConnectionStatusEvent.class)); }