[Konversation-devel] Review Request 112733: Fix numerous topic related encryption bugs for 1.5

[Travis McHenry]

-----------------------------------------------------------
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.


Changes
-------

Moved the invalidation of the cipherfilterproxymodel from channel to the model itself.

Used a signal to reset the topicEdit if the model is changed.

Changed it so the cipherfilterproxymodel is always used, and reacts the same if
there is no cipher, or qca is disabled.


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 (updated)
-----

  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/c864861c/attachment.html>