status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-26 21:41:11 +00:00
Code Issues Projects Releases Wiki Activity

fix: Defer QModelIndex delete when it is created

Browse Source 
It's fixing a crash on dataChanged when SortFilterProxyModel is used in qml on top of nim models. The model index is destroyed too early and the SFPM will use a deleted index.

(cherry picked from commit 8032cf7244ed1e1ab7aaa51cad50ddefc51a3142)
This commit is contained in:
Alex Jbanca 2023-09-05 15:46:00 +03:00 committed by Jonathan Rainville
parent 856b0d8139
commit 4f2f9646ec
19 changed files with 106 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/modules/main/activity_center/model.nim
View File

@ -49,6 +49,8 @@ QtObject:
let topLeft = self.createIndex(0, 0, nil)
let bottomRight = self.createIndex(self.activityCenterNotifications.len - 1, 0, nil)
defer: topLeft.delete
defer: bottomRight.delete
self.dataChanged(topLeft, bottomRight, @[NotifRoles.Read.int])
method rowCount*(self: Model, index: QModelIndex = nil): int = self.activityCenterNotifications.len
@ -113,6 +115,7 @@ QtObject:
if (acnViewItem.id == notificationId):
acnViewItem.read = false
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[NotifRoles.Read.int])
break
i.inc
@ -123,6 +126,7 @@ QtObject:
if (acnViewItem.id == notificationId):
acnViewItem.read = true
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[NotifRoles.Read.int])
break
i.inc
@ -140,7 +144,9 @@ QtObject:
i = 0
for index in indexesToDelete:
let indexUpdated = index - i
self.beginRemoveRows(newQModelIndex(), indexUpdated, indexUpdated)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginRemoveRows(modelIndex, indexUpdated, indexUpdated)
self.activityCenterNotifications.delete(indexUpdated)
self.endRemoveRows()
i = i + 1
@ -151,13 +157,17 @@ QtObject:
self.endResetModel()
proc addActivityNotificationItemToList*(self: Model, activityCenterNotification: Item, addToCount: bool = true) =
self.beginInsertRows(newQModelIndex(), 0, 0)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, 0, 0)
self.activityCenterNotifications.insert(activityCenterNotification, 0)
self.endInsertRows()
if self.activityCenterNotifications.len > 1:
let topLeft = self.createIndex(0, 0, nil)
let bottomRight = self.createIndex(1, 0, nil)
defer: topLeft.delete
defer: bottomRight.delete
self.dataChanged(topLeft, bottomRight, @[NotifRoles.Timestamp.int, NotifRoles.PreviousTimestamp.int])
proc addActivityNotificationItemsToList*(self: Model, activityCenterNotifications: seq[Item]) =

4
src/app/modules/main/app_search/result_model.nim
View File

@ -117,7 +117,9 @@ QtObject:
result = newQVariant(item.colorHash)
proc add*(self: Model, item: Item) =
self.beginInsertRows(newQModelIndex(), self.resultList.len, self.resultList.len)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, self.resultList.len, self.resultList.len)
self.resultList.add(item)
self.endInsertRows()

18
src/app/modules/main/chat_section/model.nim
View File

@ -222,6 +222,7 @@ QtObject:
if self.items[i].categoryId == categoryId:
self.items[i].categoryOpened = opened
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.CategoryOpened.int])
proc removeItemByIndex(self: Model, idx: int) =
@ -267,6 +268,7 @@ QtObject:
return
self.items[index].hasUnreadMessages = unread
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.HasUnreadMessages.int])
proc setActiveItem*(self: Model, id: string) =
@ -274,6 +276,7 @@ QtObject:
let isChannelToSetActive = (self.items[i].id == id)
if self.items[i].active != isChannelToSetActive:
let index = self.createIndex(i, 0, nil)
defer: index.delete
# Set active channel to true and others to false
self.items[i].active = isChannelToSetActive
if (isChannelToSetActive):
@ -288,6 +291,7 @@ QtObject:
return
self.items[index].locked = locked
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Locked.int])
proc setItemPermissionsRequired*(self: Model, id: string, value: bool) =
@ -296,6 +300,7 @@ QtObject:
return
self.items[index].requiresPermissions = value
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.RequiresPermissions.int])
proc getItemPermissionsRequired*(self: Model, id: string): bool =
@ -313,12 +318,14 @@ QtObject:
return
self.items[index].muted = muted
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Muted.int])
proc changeMutedOnItemByCategoryId*(self: Model, categoryId: string, muted: bool) =
for i in 0 ..< self.items.len:
if self.items[i].categoryId == categoryId and self.items[i].muted != muted:
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].muted = muted
self.dataChanged(index, index, @[ModelRole.Muted.int])
@ -330,6 +337,7 @@ QtObject:
return
self.items[index].blocked = blocked
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Blocked.int])
proc updateItemDetailsById*(self: Model, id, name, icon: string, trustStatus: TrustStatus) =
@ -372,6 +380,7 @@ QtObject:
self.items[index].color = color
self.items[index].icon = icon
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[
ModelRole.Name.int,
ModelRole.Color.int,
@ -390,6 +399,7 @@ QtObject:
self.items[categoryIndex].name = newCategoryName
self.items[categoryIndex].categoryPosition = newCategoryPosition
let modelIndex = self.createIndex(categoryIndex, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[
ModelRole.Name.int,
ModelRole.CategoryPosition.int,
@ -416,6 +426,7 @@ QtObject:
item.categoryId = chat.categoryId
item.categoryPosition = if nowHasCategory: newCategoryPosition else: -1
let modelIndex = self.createIndex(i, 0, nil)
defer: modelIndex.delete
var roleChanges = @[
ModelRole.Position.int,
ModelRole.CategoryId.int,
@ -448,6 +459,7 @@ QtObject:
item.categoryPosition = -1
item.categoryOpened = true
let modelIndex = self.createIndex(i, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[
ModelRole.Position.int,
ModelRole.CategoryId.int,
@ -464,6 +476,7 @@ QtObject:
return
self.items[index].name = newName
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Name.int])
proc renameItemById*(self: Model, id, name: string) =
@ -474,6 +487,7 @@ QtObject:
return
self.items[index].name = name
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Name.int])
proc updateItemOnlineStatusById*(self: Model, id: string, onlineStatus: OnlineStatus) =
@ -484,6 +498,7 @@ QtObject:
return
self.items[index].onlineStatus = onlineStatus
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.OnlineStatus.int])
proc updateNotificationsForItemById*(self: Model, id: string, hasUnreadMessages: bool,
@ -494,6 +509,7 @@ QtObject:
self.items[index].hasUnreadMessages = hasUnreadMessages
self.items[index].notificationsCount = notificationsCount
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.HasUnreadMessages.int, ModelRole.NotificationsCount.int])
proc incrementNotificationsForItemByIdAndGetNotificationCount*(self: Model, id: string): int =
@ -558,6 +574,7 @@ QtObject:
continue
item.categoryPosition = position
let modelIndex = self.createIndex(i, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.CategoryPosition.int])
proc clearItems*(self: Model) =
@ -580,4 +597,5 @@ QtObject:
self.items[index].loaderActive = false
self.items[index].active = false
let modelIndex = self.createIndex(index, 0, nil)
defer: modelIndex.delete
self.dataChanged(modelIndex, modelIndex, @[ModelRole.Active.int, ModelRole.LoaderActive.int])

2
src/app/modules/main/communities/models/discord_categories_model.nim
View File

@ -98,6 +98,7 @@ QtObject:
let idx = self.findIndexById(id)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.items[idx].selected = false
self.dataChanged(index, index, @[ModelRole.Selected.int])
@ -105,6 +106,7 @@ QtObject:
let idx = self.findIndexById(id)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.items[idx].selected = true
self.dataChanged(index, index, @[ModelRole.Selected.int])

4
src/app/modules/main/communities/models/discord_channels_model.nim
View File

@ -176,6 +176,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getCategoryId() == id):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].selected = false
self.dataChanged(index, index, @[ModelRole.Selected.int])
self.hasSelectedItemsChanged()
@ -184,6 +185,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getCategoryId() == id):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].selected = true
self.dataChanged(index, index, @[ModelRole.Selected.int])
self.hasSelectedItemsChanged()
@ -203,6 +205,7 @@ QtObject:
let idx = self.findIndexById(id)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.items[idx].selected = false
self.dataChanged(index, index, @[ModelRole.Selected.int])
self.hasSelectedItemsChanged()
@ -211,6 +214,7 @@ QtObject:
let idx = self.findIndexById(id)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.items[idx].selected = true
self.dataChanged(index, index, @[ModelRole.Selected.int])
self.hasSelectedItemsChanged()

2
src/app/modules/main/communities/models/discord_file_list_model.nim
View File

@ -156,6 +156,7 @@ QtObject:
proc setAllValidated*(self: DiscordFileListModel) =
for i in 0 ..< self.items.len:
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].validated = true
self.dataChanged(index, index, @[ModelRole.Validated.int])
self.selectedFilesValidChanged()
@ -164,6 +165,7 @@ QtObject:
let idx = self.findIndexByFilePath(filePath)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.items[idx].errorMessage = errorMessage
self.items[idx].errorCode = errorCode
self.items[idx].selected = false

1
src/app/modules/main/communities/models/discord_import_tasks_model.nim
View File

@ -93,6 +93,7 @@ QtObject:
let idx = self.findIndexByType(item.`type`)
if idx > -1:
let index = self.createIndex(idx, 0, nil)
defer: index.delete
let errorsAndWarningsCount = self.items[idx].warningsCount + self.items[idx].errorsCount
self.items[idx].progress = item.progress
self.items[idx].state = item.state

1
src/app/modules/main/profile_section/ens_usernames/model.nim
View File

@ -106,4 +106,5 @@ QtObject:
self.items[ind].isPending = pendingStatus
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.IsPending.int])

2
src/app/modules/main/profile_section/notifications/model.nim
View File

@ -157,6 +157,7 @@ QtObject:
self.items[ind].otherMessages = otherMessages
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.MuteAllMessages.int, ModelRole.PersonalMentions.int,
ModelRole.GlobalMentions.int, ModelRole.OtherMessages.int, ModelRole.Customized.int])
@ -168,4 +169,5 @@ QtObject:
self.items[ind].name = name
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Name.int])

8
src/app/modules/main/stickers/models/sticker_list.nim
View File

@ -48,7 +48,9 @@ QtObject:
proc addStickerToList*(self: StickerList, sticker: Item) =
if(self.stickers.any(proc(existingSticker: Item): bool = return existingSticker.getHash == sticker.getHash)):
return
self.beginInsertRows(newQModelIndex(), 0, 0)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, 0, 0)
self.stickers.insert(sticker, 0)
self.endInsertRows()
@ -62,6 +64,8 @@ QtObject:
let idx = self.findIndexByPackId(packId)
if idx == -1:
return
self.beginRemoveRows(newQModelIndex(), idx, idx)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginRemoveRows(modelIndex, idx, idx)
self.stickers.delete(idx)
self.endRemoveRows()

9
src/app/modules/main/stickers/models/sticker_pack_list.nim
View File

@ -99,13 +99,17 @@ QtObject:
result = eth_utils.find(self.packs, (view: StickerPackView) => view.pack.id == packId).pack
proc addStickerPackToList*(self: StickerPackList, pack: PackItem, stickers: StickerList, installed, bought, pending: bool) =
self.beginInsertRows(newQModelIndex(), 0, 0)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, 0, 0)
self.packs.insert((pack: pack, stickers: stickers, installed: installed, bought: bought, pending: pending), 0)
self.endInsertRows()
proc removeStickerPackFromList*(self: StickerPackList, packId: string) =
let idx = self.findIndexById(packId)
self.beginRemoveRows(newQModelIndex(), idx, idx)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginRemoveRows(modelIndex, idx, idx)
self.packs.delete(idx)
self.endRemoveRows()
@ -114,6 +118,7 @@ QtObject:
if idx == -1:
return
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.packs.apply(proc(it: var StickerPackView) =
if it.pack.id == packId:
it.installed = installed

9
src/app/modules/main/wallet_section/send/network_model.nim
View File

@ -154,6 +154,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getChainId() == chainId):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].tokenBalance = tokenBalance
self.dataChanged(index, index, @[ModelRole.TokenBalance.int])
@ -172,6 +173,7 @@ QtObject:
for i in 0 ..< self.items.len:
if path.getToNetwork() == self.items[i].getChainId():
let index = self.createIndex(i, 0, nil)
defer: index.delete
if self.items[i].getAmountOut().len != 0:
self.items[i].amountOut = $(parseInt(self.items[i].getAmountOut()) + parseInt(path.getAmountOut()))
else:
@ -196,6 +198,7 @@ QtObject:
try:
for i in 0 ..< self.items.len:
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isPreferred = false
self.items[i].isEnabled = false
if chainIds.len == 0:
@ -222,6 +225,7 @@ QtObject:
for i in 0 ..< self.items.len:
if not self.items[i].getIsPreferred():
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isEnabled = false
self.dataChanged(index, index, @[ModelRole.IsEnabled.int])
@ -229,12 +233,14 @@ QtObject:
for i in 0 ..< self.items.len:
if not self.items[i].getIsPreferred():
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isEnabled = true
self.dataChanged(index, index, @[ModelRole.IsEnabled.int])
proc setAllNetworksAsRoutePreferredChains*(self: NetworkModel) {.slot.} =
for i in 0 ..< self.items.len:
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isPreferred = true
self.dataChanged(index, index, @[ModelRole.IsPreferred.int])
@ -260,6 +266,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getChainId() == chainId):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isEnabled = not self.items[i].getIsEnabled()
self.dataChanged(index, index, @[ModelRole.IsEnabled.int])
@ -267,6 +274,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getChainId() == chainId):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].isEnabled = not disabled
self.dataChanged(index, index, @[ModelRole.IsEnabled.int])
@ -282,6 +290,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].getChainId() == chainId):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.items[i].locked = lock
self.dataChanged(index, index, @[ModelRole.Locked.int])
if self.items[i].getLocked():

11
src/app/modules/shared_models/member_model.nim
View File

@ -161,7 +161,9 @@ QtObject:
result = newQVariant(item.membershipRequestState.int)
proc addItem*(self: Model, item: MemberItem) =
self.beginInsertRows(newQModelIndex(), self.items.len, self.items.len)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, self.items.len, self.items.len)
self.items.add(item)
self.endInsertRows()
self.countChanged()
@ -196,6 +198,7 @@ QtObject:
self.items[ind].localNickname = localNickname
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.DisplayName.int,
ModelRole.EnsName.int,
@ -210,6 +213,7 @@ QtObject:
self.items[ind].icon = icon
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Icon.int])
proc updateItem*(
@ -244,6 +248,7 @@ QtObject:
self.items[ind].isUntrustworthy = isUntrustworthy
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.DisplayName.int,
ModelRole.IsEnsVerified.int,
@ -286,6 +291,7 @@ QtObject:
self.items[ind].isUntrustworthy = isUntrustworthy
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.DisplayName.int,
ModelRole.EnsName.int,
@ -308,6 +314,7 @@ QtObject:
self.items[idx].onlineStatus = onlineStatus
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.OnlineStatus.int
])
@ -322,6 +329,7 @@ QtObject:
self.items[idx].airdropAddress = airdropAddress
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.AirdropAddress.int
])
@ -345,6 +353,7 @@ QtObject:
self.items[idx].requestToJoinLoading = requestToJoinLoading
let index = self.createIndex(idx, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.RequestToJoinLoading.int
])

15
src/app/modules/shared_models/message_model.nim
View File

@ -360,6 +360,7 @@ QtObject:
oldItem.quotedMessageText = newItem.unparsedText
oldItem.quotedMessageContentType = newItem.contentType
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.QuotedMessageFrom.int,
ModelRole.QuotedMessageAuthorDisplayName.int,
@ -420,6 +421,7 @@ QtObject:
for i in 0 ..< self.items.len:
if(self.items[i].responseToMessageWithId == messageId):
let ind = self.createIndex(i, 0, nil)
defer: ind.delete
var item = self.items[i]
item.quotedMessageText = ""
item.quotedMessageParsedText = ""
@ -481,6 +483,7 @@ QtObject:
return
self.items[ind].outgoingStatus = status
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.OutgoingStatus.int])
proc itemSending*(self: Model, messageId: string) =
@ -501,6 +504,7 @@ QtObject:
return
self.items[ind].resendError = error
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.ResendError.int])
proc addReaction*(self: Model, messageId: string, emojiId: EmojiId, didIReactWithThisEmoji: bool,
@ -512,6 +516,7 @@ QtObject:
self.items[ind].addReaction(emojiId, didIReactWithThisEmoji, userPublicKey, userDisplayName, reactionId)
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Reactions.int])
proc removeReaction*(self: Model, messageId: string, emojiId: EmojiId, reactionId: string, didIRemoveThisReaction: bool) =
@ -522,6 +527,7 @@ QtObject:
self.items[ind].removeReaction(emojiId, reactionId, didIRemoveThisReaction)
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Reactions.int])
proc pinUnpinMessage*(self: Model, messageId: string, pin: bool, pinnedBy: string) =
@ -533,6 +539,7 @@ QtObject:
self.items[ind].pinnedBy = pinnedBy
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Pinned.int, ModelRole.PinnedBy.int])
proc getMessageByIdAsJson*(self: Model, messageId: string): JsonNode =
@ -573,6 +580,7 @@ QtObject:
if(roles.len > 0):
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, roles)
proc setEditModeOn*(self: Model, messageId: string) =
@ -583,6 +591,7 @@ QtObject:
self.items[ind].editMode = true
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.EditMode.int])
proc setEditModeOff*(self: Model, messageId: string) =
@ -593,6 +602,7 @@ QtObject:
self.items[ind].editMode = false
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.EditMode.int])
proc updateEditedMsg*(
@ -620,6 +630,7 @@ QtObject:
self.items[ind].parsedText = updatedParsedText
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.MessageText.int,
ModelRole.UnparsedText.int,
@ -637,6 +648,7 @@ QtObject:
self.items[i].quotedMessageText = updatedRawMsg
self.items[i].quotedMessageContentType = contentType
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.QuotedMessageText.int,
ModelRole.QuotedMessageParsedText.int,
@ -712,6 +724,7 @@ QtObject:
if not item.seen:
item.seen = true
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Seen.int])
proc markAsSeen*(self: Model, messages: seq[string]) =
@ -723,6 +736,7 @@ QtObject:
if messagesSet.contains(currentItemID):
self.items[i].seen = true
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Seen.int])
messagesSet.excl(currentItemID)
@ -751,6 +765,7 @@ QtObject:
item.albumMessageIds = albumMessagesIds
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.AlbumMessageImages.int])
return true
return false

2
src/app/modules/shared_models/section_model.nim
View File

@ -339,6 +339,8 @@ QtObject:
let topIndex = self.createIndex(topInd, 0, nil)
let bottomIndex = self.createIndex(bottomInd, 0, nil)
defer: topIndex.delete
defer: bottomIndex.delete
self.dataChanged(topIndex, bottomIndex, @[ModelRole.Enabled.int])
# This signal is emitted to update buttons visibility in the left navigation bar,

1
src/app/modules/shared_models/token_permission_chat_list_model.nim
View File

@ -72,5 +72,6 @@ QtObject:
if self.items[i].getKey() == chatId:
self.items[i] = initTokenPermissionChatListItem(chatId, newName)
let index = self.createIndex(i, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.ChannelName.int])
return

6
src/app/modules/shared_models/user_model.nim
View File

@ -211,6 +211,7 @@ QtObject:
self.items[ind].localNickname = localNickname
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.DisplayName.int,
ModelRole.EnsName.int,
@ -226,6 +227,7 @@ QtObject:
self.items[ind].icon = icon
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.Icon.int])
self.itemChanged(pubKey)
@ -253,6 +255,7 @@ QtObject:
self.items[ind].isUntrustworthy = isUntrustworthy
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.DisplayName.int,
ModelRole.EnsName.int,
@ -276,6 +279,7 @@ QtObject:
self.items[ind].incomingVerificationStatus = requestStatus
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[
ModelRole.IncomingVerificationStatus.int
])
@ -288,6 +292,8 @@ QtObject:
let first = self.createIndex(ind, 0, nil)
let last = self.createIndex(ind, 0, nil)
defer: first.delete
defer: last.delete
self.items[ind].isUntrustworthy = isUntrustworthy
self.dataChanged(first, last, @[ModelRole.IsUntrustworthy.int])
self.itemChanged(pubKey)

4
src/app/modules/shared_modules/keycard_popup/models/keycard_model.nim
View File

@ -47,7 +47,9 @@ QtObject:
self.lockedItemsCountChanged()
proc addItem*(self: KeycardModel, item: KeycardItem) =
self.beginInsertRows(newQModelIndex(), self.items.len, self.items.len)
let modelIndex = newQModelIndex()
defer: modelIndex.delete
self.beginInsertRows(modelIndex, self.items.len, self.items.len)
self.items.add(item)
self.endInsertRows()
self.countChanged()

2
src/app/modules/startup/models/fetching_data_model.nim
View File

@ -93,6 +93,7 @@ QtObject:
return
self.items[ind].receivedMessageAtPosition(position)
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.LoadedMessages.int])
proc evaluateWhetherToProcessReceivedData*(self: Model, backedUpMsgClock: uint64, entities: seq[tuple[entity: string, icon: string]]): bool =
@ -119,6 +120,7 @@ QtObject:
self.items[ind].totalMessages = totalMessages
self.reevaluateAllTotals()
let index = self.createIndex(ind, 0, nil)
defer: index.delete
self.dataChanged(index, index, @[ModelRole.TotalMessages.int, ModelRole.LoadedMessages.int])
proc removeSection*(self: Model, entity: string) =