Skip to content

Commit 3643660

Browse files
authored
Merge pull request #184 from ably/connection-status-missing-values
connection: add missing closed/closing values to enum
2 parents eaf1b29 + 39b04ad commit 3643660

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

chat/api/android/chat.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public final class com/ably/chat/ConnectionKt {
5353
}
5454

5555
public final class com/ably/chat/ConnectionStatus : java/lang/Enum {
56+
public static final field Closed Lcom/ably/chat/ConnectionStatus;
57+
public static final field Closing Lcom/ably/chat/ConnectionStatus;
5658
public static final field Connected Lcom/ably/chat/ConnectionStatus;
5759
public static final field Connecting Lcom/ably/chat/ConnectionStatus;
5860
public static final field Disconnected Lcom/ably/chat/ConnectionStatus;

chat/api/jvm/chat.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public final class com/ably/chat/ConnectionKt {
5353
}
5454

5555
public final class com/ably/chat/ConnectionStatus : java/lang/Enum {
56+
public static final field Closed Lcom/ably/chat/ConnectionStatus;
57+
public static final field Closing Lcom/ably/chat/ConnectionStatus;
5658
public static final field Connected Lcom/ably/chat/ConnectionStatus;
5759
public static final field Connecting Lcom/ably/chat/ConnectionStatus;
5860
public static final field Disconnected Lcom/ably/chat/ConnectionStatus;

chat/src/commonMain/kotlin/com/ably/chat/Connection.kt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@ public enum class ConnectionStatus(public val stateName: String) {
4343
* (CHA-CS1f) The library is currently disconnected from Ably and will not attempt to reconnect.
4444
*/
4545
Failed("failed"),
46+
47+
/**
48+
* (CHA-CS1g) An explicit request by the developer to close the connection has been sent
49+
* to the Ably service. If a reply is not received from Ably within a short period of
50+
* time, the connection is forcibly terminated and the connection status becomes Closed.
51+
*/
52+
Closing("closing"),
53+
54+
/**
55+
* (CHA-CS1h) The connection has been explicitly closed by the client. In the closed state,
56+
* no reconnection attempts are made automatically. No connection state is preserved by
57+
* the service or the library.
58+
*/
59+
Closed("closed"),
4660
}
4761

4862
/**
@@ -187,7 +201,7 @@ private fun mapPubSubStatusToChat(status: ConnectionState): ConnectionStatus {
187201
ConnectionState.disconnected -> ConnectionStatus.Disconnected
188202
ConnectionState.suspended -> ConnectionStatus.Suspended
189203
ConnectionState.failed -> ConnectionStatus.Failed
190-
ConnectionState.closing -> ConnectionStatus.Failed
191-
ConnectionState.closed -> ConnectionStatus.Failed
204+
ConnectionState.closing -> ConnectionStatus.Closing
205+
ConnectionState.closed -> ConnectionStatus.Closed
192206
}
193207
}

0 commit comments

Comments
 (0)