[Konversation-devel] Review Request 112733: Fix numerous topic related encryption bugs for 1.5
Travis McHenry
wordsizzle at gmail.com
Sat Sep 28 21:15:54 UTC 2013
> On Sept. 27, 2013, 12:27 a.m., Eike Hein wrote:
> > src/irc/topichistorymodel.h, line 85
> > <http://git.reviewboard.kde.org/r/112733/diff/1/?file=189632#file189632line85>
> >
> > Shouldn't these be in the proxy model instead, and the proxy model figures out what to emit dataChanged() for when a cipher is set or unset? (Or, if it's lazy, just emits reset signals for the whole model.) The idea of model/view that models inform views when data has changed, they shouldn't have to go look for it manually.
> >
> > As it stands it seems the topic view in the Channel Options dialog wouldn't notice a cipher change and get new data - but the dialog is non-modal, i.e. a ciper change is possible (and even likely, with someone running /setkey after looking at the dialog) while the dialog is open.
Although the channeloptiosndialog topicview would have been reset (from the invalidate() in Channel) the topicEdit would not have been reset. I also moved the invalidation to the model itself so now the model is informing the view instead of the other way around.
- Travis
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/112733/#review40902
-----------------------------------------------------------
On Sept. 28, 2013, 2:13 p.m., Travis McHenry wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/112733/
> -----------------------------------------------------------
>
> (Updated Sept. 28, 2013, 2:13 p.m.)
>
>
> Review request for Konversation.
>
>
> Description
> -------
>
> Fix numerous topic related encryption bugs
>
> Added a QSortFilterProxyModel that is put behind the various
> views that use the topicHistoryModel. When equipped with a
> 'cipher' object it will begin deciphering encrypted content
>
> Took the decryption for topics out of server.cpp, this caused
> decrypted text to get into the model, they are now decrypted
> in the cipherFilterModel, and in the channel messages that go
> to ircview. When the cipher is deleted, the topics in topicLine
> and in TopicHistoryView return to their encrypted forms. They
> remain decrypted in ircview however.
>
> Changed some of the logic in decrypting topics so that when
> nothing is decrypted we return nothing, and when something IS
> decrypted, we return only the decrypted text, no prefixes. These
> prefixes are now added by the cipherFilterModel. The ERROR:
> prefix denoting unencrypted text has now been changed to (u) to
> be more in line with the (e) for encrypted text, and make it the
> same character length, so it's easier to strip later.
>
>
> Diffs
> -----
>
> src/cipher.cpp 514e3903397ad85a75e836ca238138c77e82d4cd
> src/irc/channel.h 355bf61d4099fdd80f1b1d7056943bc88030aa8a
> src/irc/channel.cpp 6911473e19919e24975fcca3b1a6ff14fa04c420
> src/irc/server.cpp abb42c23ff750493758a5d5ff0b7876e22c53a36
> src/irc/topichistorymodel.h f3c42ab8e732de8edde83f972248bb00442dbc0a
> src/irc/topichistorymodel.cpp ace208558ba51f72076d145a915ed6c12e36e69c
> src/viewer/channeloptionsdialog.h ac2f7de6a052ba43b1d50f49c2de998ab4c3aa0b
> src/viewer/channeloptionsdialog.cpp c1d19e2cdac7cc9fa9f7601ceed4fb657c83eca4
>
> Diff: http://git.reviewboard.kde.org/r/112733/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> Travis McHenry
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/konversation-devel/attachments/20130928/38dd39d9/attachment.html>
More information about the Konversation-devel
mailing list