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

Rename "connected" state to "connecting".

Browse Source
This commit is contained in:
akwizgran
2019-06-06 17:21:52 +01:00
parent dc741e988c
commit 15d9ff1ebd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.bramble.api.contact;
public enum PendingContactState { public enum PendingContactState {
WAITING_FOR_CONNECTION, WAITING_FOR_CONNECTION,
CONNECTED, CONNECTING,
ADDING_CONTACT, ADDING_CONTACT,
FAILED FAILED
} }

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
View File

@@ -52,7 +52,7 @@ class PendingContactViewHolder extends ViewHolder {
.getColor(status.getContext(), R.color.briar_yellow); .getColor(status.getContext(), R.color.briar_yellow);
status.setText(R.string.waiting_for_contact_to_come_online); status.setText(R.string.waiting_for_contact_to_come_online);
break; break;
case CONNECTED: case CONNECTING:
status.setText(R.string.connecting); status.setText(R.string.connecting);
break; break;
case ADDING_CONTACT: case ADDING_CONTACT:

2
briar-headless/README.md
View File

@@ -131,7 +131,7 @@ This will return a JSON array of pending contacts and their states:
The state can be one of these values: The state can be one of these values:
* `waiting_for_connection` * `waiting_for_connection`
* `connected` * `connecting`
* `adding_contact` * `adding_contact`
* `failed` * `failed`

2
briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
View File

@@ -16,7 +16,7 @@ internal fun PendingContact.output() = JsonDict(
internal fun PendingContactState.output() = when(this) { internal fun PendingContactState.output() = when(this) {
WAITING_FOR_CONNECTION -> "waiting_for_connection" WAITING_FOR_CONNECTION -> "waiting_for_connection"
CONNECTED -> "connected" CONNECTING -> "connecting"
ADDING_CONTACT -> "adding_contact" ADDING_CONTACT -> "adding_contact"
FAILED -> "failed" FAILED -> "failed"
else -> throw AssertionError() else -> throw AssertionError()