Revert "core: relay key and member id as immutable relay link data (#6711)"

This reverts commit d665b1f5d8.

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -88,13 +88,6 @@ object ChannelRelaysModel {
     this.groupRelays.addAll(groupRelays)
   }
 
-  fun updateRelay(groupInfo: GroupInfo, relay: GroupRelay) {
-    if (groupId.value == groupInfo.groupId) {
-      val i = groupRelays.indexOfFirst { it.groupRelayId == relay.groupRelayId }
-      if (i >= 0) groupRelays[i] = relay
-    }
-  }
-
   fun reset() {
     groupId.value = null
     groupRelays.clear()

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -2993,13 +2993,6 @@ object ChatController {
             }
           }
         }
-      is CR.GroupRelayUpdated ->
-        if (active(r.user)) {
-          withContext(Dispatchers.Main) {
-            chatModel.chatsContext.upsertGroupMember(rhId, r.groupInfo, r.member)
-            ChannelRelaysModel.updateRelay(r.groupInfo, r.groupRelay)
-          }
-        }
       is CR.NewMemberContactReceivedInv ->
         if (active(r.user)) {
           withContext(Dispatchers.Main) {
@@ -6308,7 +6301,6 @@ sealed class CR {
   @Serializable @SerialName("connectedToGroupMember") class ConnectedToGroupMember(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val memberContact: Contact? = null): CR()
   @Serializable @SerialName("groupUpdated") class GroupUpdated(val user: UserRef, val toGroup: GroupInfo): CR()
   @Serializable @SerialName("groupLinkDataUpdated") class GroupLinkDataUpdated(val user: UserRef, val groupInfo: GroupInfo, val groupLink: GroupLink, val groupRelays: List<GroupRelay>, val relaysChanged: Boolean): CR()
-  @Serializable @SerialName("groupRelayUpdated") class GroupRelayUpdated(val user: UserRef, val groupInfo: GroupInfo, val member: GroupMember, val groupRelay: GroupRelay): CR()
   @Serializable @SerialName("groupLinkCreated") class GroupLinkCreated(val user: UserRef, val groupInfo: GroupInfo, val groupLink: GroupLink): CR()
   @Serializable @SerialName("groupLink") class CRGroupLink(val user: UserRef, val groupInfo: GroupInfo, val groupLink: GroupLink): CR()
   @Serializable @SerialName("groupLinkDeleted") class GroupLinkDeleted(val user: UserRef, val groupInfo: GroupInfo): CR()
@@ -6494,7 +6486,6 @@ sealed class CR {
     is ConnectedToGroupMember -> "connectedToGroupMember"
     is GroupUpdated -> "groupUpdated"
     is GroupLinkDataUpdated -> "groupLinkDataUpdated"
-    is GroupRelayUpdated -> "groupRelayUpdated"
     is GroupLinkCreated -> "groupLinkCreated"
     is CRGroupLink -> "groupLink"
     is GroupLinkDeleted -> "groupLinkDeleted"
@@ -6673,7 +6664,6 @@ sealed class CR {
     is ConnectedToGroupMember -> withUser(user, "groupInfo: $groupInfo\nmember: $member\nmemberContact: $memberContact")
     is GroupUpdated -> withUser(user, json.encodeToString(toGroup))
     is GroupLinkDataUpdated -> withUser(user, "groupInfo: $groupInfo\ngroupLink: $groupLink\ngroupRelays: $groupRelays\nrelaysChanged: $relaysChanged")
-    is GroupRelayUpdated -> withUser(user, "groupInfo: $groupInfo\nmember: $member\ngroupRelay: $groupRelay")
     is GroupLinkCreated -> withUser(user, "groupInfo: $groupInfo\ngroupLink: $groupLink")
     is CRGroupLink -> withUser(user, "groupInfo: $groupInfo\ngroupLink: $groupLink")
     is GroupLinkDeleted -> withUser(user, json.encodeToString(groupInfo))

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ChatRelayView.kt

@@ -62,6 +62,7 @@ fun validRelayAddress(address: String): Boolean {
     (parsedMd.first().format as Format.SimplexLink).linkType == SimplexLinkType.relay
 }
 
+// TODO [relays] TBC matching relay to operator by domain (relay address can be hosted on operator server)
 fun addChatRelay(
   relay: UserChatRelay,
   userServers: MutableState<List<UserOperatorServers>>,