Page MenuHomePhabricator
Differential D14339

[lib] Fix DM push notifs code to fetch message from SQLite instead of Redux
ClosedPublic
Actions

Authored by ashoat on Feb 11 2025, 12:22 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 3:58 PM
Unknown Object (File)
Tue, Mar 11, 4:16 PM
Unknown Object (File)
Tue, Mar 11, 3:48 PM
Unknown Object (File)
Thu, Mar 6, 8:08 PM
Unknown Object (File)
Feb 27 2025, 9:43 AM
Unknown Object (File)
Feb 27 2025, 4:40 AM
Unknown Object (File)
Feb 25 2025, 10:54 AM
Unknown Object (File)
Feb 25 2025, 7:31 AM
View All 26 Files
Subscribers
None

Details

Reviewers
tomek
angelika
Commits
rCOMM4415c8a4e056: [lib] Fix DM push notifs code to fetch message from SQLite instead of Redux
Summary

This code fetches a message that is reacted to in order to check its author, but it's currently set up to only check Redux.

Instead, we should query SQLite in case the message is not currently in Redux. getLatestMessageEdit also contains a fallback to check Redux if the data is not in SQLite yet.

Technically getLatestMessageEdit doesn't return just the RawMessageInfo that was queried for; rather, it returns the latest edit (only applies to messageTypes.TEXT). I think this is fine in this case, since we only need to use the creatorID. It might be preferable in a future use case, but hard to know for sure.

Depends on D14337

Test Plan

Tested in combination with later diffs, to confirm that it's possible for some message types to not set a thread to unread

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
push/
7 lines
15 lines
2 lines

Diff 47034

View Options

lib/push/send-hooks.react.js

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines size_t decryptedSize = ::olm_decrypt(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt => " + std::string{::olm_session_last_error(session)} + "error decrypt => " + std::string{::olm_session_last_error(session)} +
". Hash: " + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
std::string Session::decryptSequential(EncryptedData &encryptedData) { std::string Session::decryptSequential(EncryptedData &encryptedData) {
OlmSession *session = this->getOlmSession(); OlmSession *session = this->getOlmSession();
OlmBuffer utilityBuffer(::olm_utility_size()); OlmBuffer utilityBuffer(::olm_utility_size());
OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data()); OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data());
Show All 28 Lines size_t decryptedSize = ::olm_decrypt_sequential(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt_sequential => " + "error decrypt_sequential => " +
std::string{::olm_session_last_error(session)} + ". Hash: " + std::string{::olm_session_last_error(session)} + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
int Session::getVersion() { int Session::getVersion() {
return this->version; return this->version;
} }
void Session::setVersion(int newVersion) { void Session::setVersion(int newVersion) {
this->version = newVersion; this->version = newVersion;
} }
} // namespace crypto } // namespace crypto
} // namespace comm } // namespace comm
View Options

lib/push/send-utils.js

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines size_t decryptedSize = ::olm_decrypt(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt => " + std::string{::olm_session_last_error(session)} + "error decrypt => " + std::string{::olm_session_last_error(session)} +
". Hash: " + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
std::string Session::decryptSequential(EncryptedData &encryptedData) { std::string Session::decryptSequential(EncryptedData &encryptedData) {
OlmSession *session = this->getOlmSession(); OlmSession *session = this->getOlmSession();
OlmBuffer utilityBuffer(::olm_utility_size()); OlmBuffer utilityBuffer(::olm_utility_size());
OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data()); OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data());
Show All 28 Lines size_t decryptedSize = ::olm_decrypt_sequential(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt_sequential => " + "error decrypt_sequential => " +
std::string{::olm_session_last_error(session)} + ". Hash: " + std::string{::olm_session_last_error(session)} + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
int Session::getVersion() { int Session::getVersion() {
return this->version; return this->version;
} }
void Session::setVersion(int newVersion) { void Session::setVersion(int newVersion) {
this->version = newVersion; this->version = newVersion;
} }
} // namespace crypto } // namespace crypto
} // namespace comm } // namespace comm
View Options

lib/push/utils.js

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines size_t decryptedSize = ::olm_decrypt(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt => " + std::string{::olm_session_last_error(session)} + "error decrypt => " + std::string{::olm_session_last_error(session)} +
". Hash: " + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
std::string Session::decryptSequential(EncryptedData &encryptedData) { std::string Session::decryptSequential(EncryptedData &encryptedData) {
OlmSession *session = this->getOlmSession(); OlmSession *session = this->getOlmSession();
OlmBuffer utilityBuffer(::olm_utility_size()); OlmBuffer utilityBuffer(::olm_utility_size());
OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data()); OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data());
Show All 28 Lines size_t decryptedSize = ::olm_decrypt_sequential(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt_sequential => " + "error decrypt_sequential => " +
std::string{::olm_session_last_error(session)} + ". Hash: " + std::string{::olm_session_last_error(session)} + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
int Session::getVersion() { int Session::getVersion() {
return this->version; return this->version;
} }
void Session::setVersion(int newVersion) { void Session::setVersion(int newVersion) {
this->version = newVersion; this->version = newVersion;
} }
} // namespace crypto } // namespace crypto
} // namespace comm } // namespace comm