From 34337486e9e2db3b975389410138ca25c86045cf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 27 May 2022 13:00:43 +0100
Subject: [PATCH] Use status endpoint for contact connectivity check.

---
 .../mailbox/ContactMailboxConnectivityChecker.java     |  7 +++----
 .../mailbox/ContactMailboxConnectivityCheckerTest.java | 10 +++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java
index 03ca2e257..8759aa595 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityChecker.java
@@ -9,8 +9,6 @@ import java.io.IOException;
 
 import javax.annotation.concurrent.ThreadSafe;
 
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-
 @ThreadSafe
 @NotNullByDefault
 class ContactMailboxConnectivityChecker extends ConnectivityCheckerImpl {
@@ -29,8 +27,9 @@ class ContactMailboxConnectivityChecker extends ConnectivityCheckerImpl {
 		return new SimpleApiCall() {
 			@Override
 			void tryToCallApi() throws IOException, ApiException {
-				mailboxApi.getFiles(properties,
-						requireNonNull(properties.getInboxId()));
+				if (!mailboxApi.checkStatus(properties)) {
+					throw new ApiException();
+				}
 				// Call the observers and cache the result
 				onConnectivityCheckSucceeded(clock.currentTimeMillis());
 			}
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityCheckerTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityCheckerTest.java
index 222226c00..2378e3d1b 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityCheckerTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxConnectivityCheckerTest.java
@@ -13,8 +13,6 @@ import org.junit.Test;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static java.util.Collections.emptyList;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.mailbox.MailboxApi.CLIENT_SUPPORTS;
 import static org.briarproject.bramble.test.TestUtils.getMailboxProperties;
 import static org.junit.Assert.assertFalse;
@@ -54,9 +52,8 @@ public class ContactMailboxConnectivityCheckerTest extends BrambleMockTestCase {
 
 		// When the check succeeds the observer should be called
 		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getFiles(properties,
-					requireNonNull(properties.getInboxId()));
-			will(returnValue(emptyList()));
+			oneOf(mailboxApi).checkStatus(properties);
+			will(returnValue(true));
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(observer).onConnectivityCheckSucceeded();
@@ -86,8 +83,7 @@ public class ContactMailboxConnectivityCheckerTest extends BrambleMockTestCase {
 
 		// When the check fails, the observer should not be called
 		context.checking(new Expectations() {{
-			oneOf(mailboxApi).getFiles(properties,
-					requireNonNull(properties.getInboxId()));
+			oneOf(mailboxApi).checkStatus(properties);
 			will(throwException(new IOException()));
 		}});