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

Address review comments.

Browse Source
This commit is contained in:
akwizgran
2019-05-22 17:46:17 +01:00
parent 01ef367864
commit de97cce119
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
View File

@@ -10,7 +10,6 @@ import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.contact.PendingContact;
import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.contact.PendingContactId;
import org.briarproject.bramble.api.contact.PendingContactState; 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.PendingContactRemovedEvent;
import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent; import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -67,8 +66,7 @@ public class PendingContactListViewModel extends AndroidViewModel
@Override @Override
public void eventOccurred(Event e) { public void eventOccurred(Event e) {
if (e instanceof PendingContactAddedEvent || if (e instanceof PendingContactStateChangedEvent ||
e instanceof PendingContactStateChangedEvent ||
e instanceof PendingContactRemovedEvent) { e instanceof PendingContactRemovedEvent) {
loadPendingContacts(); loadPendingContacts();
} }

15
briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
View File

@@ -130,16 +130,11 @@ internal class ContactControllerTest : ControllerTest() {
every { contactManager.pendingContacts } returns listOf( every { contactManager.pendingContacts } returns listOf(
Pair(pendingContact, WAITING_FOR_CONNECTION) Pair(pendingContact, WAITING_FOR_CONNECTION)
) )
every { val dict = JsonDict(
ctx.json( "pendingContact" to pendingContact.output(),
listOf( "state" to WAITING_FOR_CONNECTION.output()
JsonDict( )
"pendingContact" to pendingContact.output(), every { ctx.json(listOf(dict)) } returns ctx
"state" to WAITING_FOR_CONNECTION.output()
)
)
)
} returns ctx
controller.listPendingContacts(ctx) controller.listPendingContacts(ctx)
} }