diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java index 2d8e8812d..9fdb13442 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.api.contact; public enum PendingContactState { WAITING_FOR_CONNECTION, - CONNECTED, + CONNECTING, ADDING_CONTACT, FAILED } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java index 3bf020fea..b3c68c802 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java @@ -52,7 +52,7 @@ class PendingContactViewHolder extends ViewHolder { .getColor(status.getContext(), R.color.briar_yellow); status.setText(R.string.waiting_for_contact_to_come_online); break; - case CONNECTED: + case CONNECTING: status.setText(R.string.connecting); break; case ADDING_CONTACT: diff --git a/briar-headless/README.md b/briar-headless/README.md index 0804e6d26..19004e25a 100644 --- a/briar-headless/README.md +++ b/briar-headless/README.md @@ -131,7 +131,7 @@ This will return a JSON array of pending contacts and their states: The state can be one of these values: * `waiting_for_connection` - * `connected` + * `connecting` * `adding_contact` * `failed` diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt index 853e0eb1f..b6226b627 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt @@ -16,7 +16,7 @@ internal fun PendingContact.output() = JsonDict( internal fun PendingContactState.output() = when(this) { WAITING_FOR_CONNECTION -> "waiting_for_connection" - CONNECTED -> "connected" + CONNECTING -> "connecting" ADDING_CONTACT -> "adding_contact" FAILED -> "failed" else -> throw AssertionError()