diff --git a/src/app/modules/main/profile_section/contacts/controller.nim b/src/app/modules/main/profile_section/contacts/controller.nim index ad194fceda..103ef6201f 100644 --- a/src/app/modules/main/profile_section/contacts/controller.nim +++ b/src/app/modules/main/profile_section/contacts/controller.nim @@ -39,15 +39,15 @@ proc init*(self: Controller) = self.events.on(SIGNAL_CONTACT_BLOCKED) do(e: Args): var args = ContactArgs(e) - self.delegate.contactBlocked(args.contactId) + self.delegate.addOrUpdateContactItem(args.contactId) self.events.on(SIGNAL_CONTACT_UNBLOCKED) do(e: Args): var args = ContactArgs(e) - self.delegate.contactUnblocked(args.contactId) + self.delegate.addOrUpdateContactItem(args.contactId) self.events.on(SIGNAL_CONTACT_REMOVED) do(e: Args): var args = ContactArgs(e) - self.delegate.contactRemoved(args.contactId) + self.delegate.addOrUpdateContactItem(args.contactId) self.events.on(SIGNAL_CONTACT_NICKNAME_CHANGED) do(e: Args): var args = ContactArgs(e) @@ -67,7 +67,7 @@ proc init*(self: Controller) = self.events.on(SIGNAL_CONTACT_UPDATED) do(e: Args): var args = ContactArgs(e) - self.delegate.contactUpdated(args.contactId) + self.delegate.addOrUpdateContactItem(args.contactId) self.events.on(SIGNAL_CONTACTS_STATUS_UPDATED) do(e: Args): let args = ContactsStatusUpdatedArgs(e) diff --git a/src/app/modules/main/profile_section/contacts/io_interface.nim b/src/app/modules/main/profile_section/contacts/io_interface.nim index 007b6886fc..9eabd2f89f 100644 --- a/src/app/modules/main/profile_section/contacts/io_interface.nim +++ b/src/app/modules/main/profile_section/contacts/io_interface.nim @@ -62,13 +62,7 @@ method removeContact*(self: AccessInterface, publicKey: string) {.base.} = # Controller Delegate Interface -method contactBlocked*(self: AccessInterface, publicKey: string) {.base.} = - raise newException(ValueError, "No implementation available") - -method contactUnblocked*(self: AccessInterface, publicKey: string) {.base.} = - raise newException(ValueError, "No implementation available") - -method contactRemoved*(self: AccessInterface, publicKey: string) {.base.} = +method addOrUpdateContactItem*(self: AccessInterface, publicKey: string) {.base.} = raise newException(ValueError, "No implementation available") method contactNicknameChanged*(self: AccessInterface, publicKey: string) {.base.} = @@ -77,9 +71,6 @@ method contactNicknameChanged*(self: AccessInterface, publicKey: string) {.base. method contactTrustStatusChanged*(self: AccessInterface, publicKey: string, trustStatus: TrustStatus) {.base.} = raise newException(ValueError, "No implementation available") -method contactUpdated*(self: AccessInterface, publicKey: string) {.base.} = - raise newException(ValueError, "No implementation available") - method contactsStatusUpdated*(self: AccessInterface, statusUpdates: seq[StatusUpdateDto]) {.base.} = raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/main/profile_section/contacts/module.nim b/src/app/modules/main/profile_section/contacts/module.nim index 950fe5145d..546c5a27dc 100644 --- a/src/app/modules/main/profile_section/contacts/module.nim +++ b/src/app/modules/main/profile_section/contacts/module.nim @@ -157,7 +157,7 @@ method removeContact*(self: Module, publicKey: string) = method changeContactNickname*(self: Module, publicKey: string, nickname: string) = self.controller.changeContactNickname(publicKey, nickname) -proc addOrUpdateContactItem(self: Module, publicKey: string) = +proc addOrUpdateContactItem*(self: Module, publicKey: string) = let ind = self.view.contactsModel().findIndexByPubKey(publicKey) let item = self.createItemFromPublicKey(publicKey) if ind == -1: @@ -186,18 +186,6 @@ proc addOrUpdateContactItem(self: Module, publicKey: string) = item.isRemoved, ) -method contactBlocked*(self: Module, publicKey: string) = - self.addOrUpdateContactItem(publicKey) - -method contactUnblocked*(self: Module, publicKey: string) = - self.addOrUpdateContactItem(publicKey) - -method contactRemoved*(self: Module, publicKey: string) = - self.addOrUpdateContactItem(publicKey) - -method contactUpdated*(self: Module, publicKey: string) = - self.addOrUpdateContactItem(publicKey) - method contactsStatusUpdated*(self: Module, statusUpdates: seq[StatusUpdateDto]) = for s in statusUpdates: self.view.contactsModel().setOnlineStatus(s.publicKey, toOnlineStatus(s.statusType))