From de97cce119038a1f1d19c16b1fdccd0fb5f033c9 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 22 May 2019 17:46:17 +0100
Subject: [PATCH] Address review comments.

---
 .../add/remote/PendingContactListViewModel.java   |  4 +---
 .../headless/contact/ContactControllerTest.kt     | 15 +++++----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
index 86b4d3fdb..cf3c86242 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
@@ -10,7 +10,6 @@ import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.contact.PendingContactState;
-import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent;
 import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -67,8 +66,7 @@ public class PendingContactListViewModel extends AndroidViewModel
 
 	@Override
 	public void eventOccurred(Event e) {
-		if (e instanceof PendingContactAddedEvent ||
-				e instanceof PendingContactStateChangedEvent ||
+		if (e instanceof PendingContactStateChangedEvent ||
 				e instanceof PendingContactRemovedEvent) {
 			loadPendingContacts();
 		}
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
index 506089903..3b2d2dcb5 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
@@ -130,16 +130,11 @@ internal class ContactControllerTest : ControllerTest() {
         every { contactManager.pendingContacts } returns listOf(
             Pair(pendingContact, WAITING_FOR_CONNECTION)
         )
-        every {
-            ctx.json(
-                listOf(
-                    JsonDict(
-                        "pendingContact" to pendingContact.output(),
-                        "state" to WAITING_FOR_CONNECTION.output()
-                    )
-                )
-            )
-        } returns ctx
+        val dict = JsonDict(
+            "pendingContact" to pendingContact.output(),
+            "state" to WAITING_FOR_CONNECTION.output()
+        )
+        every { ctx.json(listOf(dict)) } returns ctx
         controller.listPendingContacts(ctx)
     }