core: track network statuses, use in commands/events (#3211)

* core: track network statuses, use in commands/events * ui types, test * remove comment
2026-06-03 21:21:46 +00:00 · 2023-10-13 11:51:01 +01:00
parent 675fc19745
commit ab290fb068
13 changed files with 275 additions and 102 deletions
@@ -789,16 +789,19 @@ sealed class NetworkStatus {
  val statusExplanation: String get() =
    when (this) {
      is Connected -> generalGetString(MR.strings.connected_to_server_to_receive_messages_from_contact)
-      is Error -> String.format(generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages_with_error), error)
+      is Error -> String.format(generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages_with_error), connectionError)
      else -> generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages)
    }

  @Serializable @SerialName("unknown") class Unknown: NetworkStatus()
  @Serializable @SerialName("connected") class Connected: NetworkStatus()
  @Serializable @SerialName("disconnected") class Disconnected: NetworkStatus()
-  @Serializable @SerialName("error") class Error(val error: String): NetworkStatus()
+  @Serializable @SerialName("error") class Error(val connectionError: String): NetworkStatus()
 }

+@Serializable
+data class ConnNetworkStatus(val agentConnId: String, val networkStatus: NetworkStatus)
+
@Serializable
 data class Contact(
  val contactId: Long,
@@ -1051,6 +1054,9 @@ data class GroupInfo (
  }
 }

+@Serializable
+data class GroupRef(val groupId: Long, val localDisplayName: String)
+
@Serializable
 data class GroupProfile (
  override val displayName: String,
@@ -1159,11 +1165,17 @@ data class GroupMember (
 data class GroupMemberSettings(val showMessages: Boolean) {}

@Serializable
-class GroupMemberRef(
+data class GroupMemberRef(
  val groupMemberId: Long,
  val profile: Profile
 )

+@Serializable
+data class GroupMemberIds(
+  val groupMemberId: Long,
+  val groupId: Long
+)
+
@Serializable
 enum class GroupMemberRole(val memberRole: String) {
  @SerialName("observer") Observer("observer"), // order matters in comparisons
@@ -1257,7 +1269,7 @@ class LinkPreview (

@Serializable
 class MemberSubError (
-  val member: GroupMember,
+  val member: GroupMemberIds,
  val memberError: ChatError
 )

@@ -1082,6 +1082,13 @@ object ChatController {
    return r is CR.CmdOk
  }

+  suspend fun apiGetNetworkStatuses(): List<ConnNetworkStatus>? {
+    val r = sendCmd(CC.ApiGetNetworkStatuses())
+    if (r is CR.NetworkStatuses) return r.networkStatuses
+    Log.e(TAG, "apiGetNetworkStatuses bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun apiChatRead(type: ChatType, id: Long, range: CC.ItemRange): Boolean {
    val r = sendCmd(CC.ApiChatRead(type, id, range))
    if (r is CR.CmdOk) return true
@@ -1425,12 +1432,6 @@ object ChatController {
      }
      is CR.ContactsSubscribed -> updateContactsStatus(r.contactRefs, NetworkStatus.Connected())
      is CR.ContactsDisconnected -> updateContactsStatus(r.contactRefs, NetworkStatus.Disconnected())
-      is CR.ContactSubError -> {
-        if (active(r.user)) {
-          chatModel.updateContact(r.contact)
-        }
-        processContactSubError(r.contact, r.chatError)
-      }
      is CR.ContactSubSummary -> {
        for (sub in r.contactSubscriptions) {
          if (active(r.user)) {
@@ -1444,6 +1445,16 @@ object ChatController {
          }
        }
      }
+      is CR.NetworkStatusResp -> {
+        for (cId in r.connections) {
+          chatModel.networkStatuses[cId] = r.networkStatus
+        }
+      }
+      is CR.NetworkStatuses -> {
+        for (s in r.networkStatuses) {
+          chatModel.networkStatuses[s.agentConnId] = s.networkStatus
+        }
+      }
      is CR.NewChatItem -> {
        val cInfo = r.chatItem.chatInfo
        val cItem = r.chatItem.chatItem
@@ -1915,6 +1926,7 @@ sealed class CC {
  class ApiSendCallExtraInfo(val contact: Contact, val extraInfo: WebRTCExtraInfo): CC()
  class ApiEndCall(val contact: Contact): CC()
  class ApiCallStatus(val contact: Contact, val callStatus: WebRTCCallStatus): CC()
+  class ApiGetNetworkStatuses(): CC()
  class ApiAcceptContact(val incognito: Boolean, val contactReqId: Long): CC()
  class ApiRejectContact(val contactReqId: Long): CC()
  class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
@@ -2024,6 +2036,7 @@ sealed class CC {
    is ApiSendCallExtraInfo -> "/_call extra @${contact.apiId} ${json.encodeToString(extraInfo)}"
    is ApiEndCall -> "/_call end @${contact.apiId}"
    is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus.value}"
+    is ApiGetNetworkStatuses -> "/_network_statuses"
    is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
    is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
    is ReceiveFile -> "/freceive $fileId encrypt=${onOff(encrypted)}" + (if (inline == null) "" else " inline=${onOff(inline)}")
@@ -2120,6 +2133,7 @@ sealed class CC {
    is ApiSendCallExtraInfo -> "apiSendCallExtraInfo"
    is ApiEndCall -> "apiEndCall"
    is ApiCallStatus -> "apiCallStatus"
+    is ApiGetNetworkStatuses -> "apiGetNetworkStatuses"
    is ApiChatRead -> "apiChatRead"
    is ApiChatUnread -> "apiChatUnread"
    is ReceiveFile -> "receiveFile"
@@ -3333,11 +3347,14 @@ sealed class CR {
  @Serializable @SerialName("acceptingContactRequest") class AcceptingContactRequest(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("contactRequestRejected") class ContactRequestRejected(val user: UserRef): CR()
  @Serializable @SerialName("contactUpdated") class ContactUpdated(val user: UserRef, val toContact: Contact): CR()
+  // TODO remove below
  @Serializable @SerialName("contactsSubscribed") class ContactsSubscribed(val server: String, val contactRefs: List<ContactRef>): CR()
  @Serializable @SerialName("contactsDisconnected") class ContactsDisconnected(val server: String, val contactRefs: List<ContactRef>): CR()
-  @Serializable @SerialName("contactSubError") class ContactSubError(val user: UserRef, val contact: Contact, val chatError: ChatError): CR()
  @Serializable @SerialName("contactSubSummary") class ContactSubSummary(val user: UserRef, val contactSubscriptions: List<ContactSubStatus>): CR()
-  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val user: UserRef, val group: GroupInfo): CR()
+  // TODO remove above
+  @Serializable @SerialName("networkStatus") class NetworkStatusResp(val networkStatus: NetworkStatus, val connections: List<String>): CR()
+  @Serializable @SerialName("networkStatuses") class NetworkStatuses(val user_: UserRef?, val networkStatuses: List<ConnNetworkStatus>): CR()
+  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val user: UserRef, val group: GroupRef): CR()
  @Serializable @SerialName("memberSubErrors") class MemberSubErrors(val user: UserRef, val memberSubErrors: List<MemberSubError>): CR()
  @Serializable @SerialName("groupEmpty") class GroupEmpty(val user: UserRef, val group: GroupInfo): CR()
  @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
@@ -3467,8 +3484,9 @@ sealed class CR {
    is ContactUpdated -> "contactUpdated"
    is ContactsSubscribed -> "contactsSubscribed"
    is ContactsDisconnected -> "contactsDisconnected"
-    is ContactSubError -> "contactSubError"
    is ContactSubSummary -> "contactSubSummary"
+    is NetworkStatusResp -> "networkStatus"
+    is NetworkStatuses -> "networkStatuses"
    is GroupSubscribed -> "groupSubscribed"
    is MemberSubErrors -> "memberSubErrors"
    is GroupEmpty -> "groupEmpty"
@@ -3596,8 +3614,9 @@ sealed class CR {
    is ContactUpdated -> withUser(user, json.encodeToString(toContact))
    is ContactsSubscribed -> "server: $server\ncontacts:\n${json.encodeToString(contactRefs)}"
    is ContactsDisconnected -> "server: $server\ncontacts:\n${json.encodeToString(contactRefs)}"
-    is ContactSubError -> withUser(user, "error:\n${chatError.string}\ncontact:\n${json.encodeToString(contact)}")
    is ContactSubSummary -> withUser(user, json.encodeToString(contactSubscriptions))
+    is NetworkStatusResp -> "networkStatus $networkStatus\nconnections: $connections"
+    is NetworkStatuses -> withUser(user_, json.encodeToString(networkStatuses))
    is GroupSubscribed -> withUser(user, json.encodeToString(group))
    is MemberSubErrors -> withUser(user, json.encodeToString(memberSubErrors))
    is GroupEmpty -> withUser(user, json.encodeToString(group))