Paths

Table of Contentst

-
lib/shared/
-
shared/
-
thread-utils.js

[lib] update threadLabel to handle thick threads
ClosedPublic
Actions

Authored by inka on Sep 13 2024, 5:45 AM.

Details

Reviewers

tomek
kamil
ashoat

Commits

rCOMM48db54e22644: [lib] update threadLabel to handle thick threads

Summary

issue: ENG-9173

Test Plan

Tested that when creating a chat:

if a chat for the selected list of users exists and is thin, proper label for the thin tye is shown
if the chat for the selected list of users doesn't exist - "Local DM" is shown, with a lock icon

Tested that in thread settings:

if thread is thick, "Local DM" is shown, with a lock icon
if thread is thick sidebar, "Thread" with the align-right icon is shown
if thread is thin, proper label and icon are shown

Diff Detail

Repository

rCOMM Comm

Branch

inka/fix_marcin

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

inka created this revision.Sep 13 2024, 5:45 AM

inka added a parent revision: D13320: [web][native] Update UI to not display GENESIS over thick threads.Sep 13 2024, 5:45 AM

inka edited parent revisions, added: D13275: Update search header in chat creation on native not to show GENESIS for thick threads; removed: D13320: [web][native] Update UI to not display GENESIS over thick threads.

Harbormaster completed remote builds in B31610: Diff 44159.Sep 13 2024, 6:02 AM

inka requested review of this revision.Sep 13 2024, 6:02 AM

tomek accepted this revision.Sep 13 2024, 6:07 AM

tomek added inline comments.

lib/shared/thread-utils.js
1223–1224 ↗	(On Diff #44159)	Isn't it already handled by `threadTypeIsSidebar(threadType)`?

This revision is now accepted and ready to land.Sep 13 2024, 6:07 AM

Simplify

tomek accepted this revision.Sep 13 2024, 6:15 AM

Harbormaster completed remote builds in B31613: Diff 44173.Sep 13 2024, 6:31 AM

inka added a child revision: D13335: [lib][web][native] Refactor usingOlmViaTunnelbrokerForDMs.Sep 13 2024, 6:58 AM

Closed by commit rCOMM48db54e22644: [lib] update threadLabel to handle thick threads (authored by inka). · Explain WhySep 13 2024, 8:59 AM

This revision was automatically updated to reflect the committed changes.

inka added a commit: rCOMM48db54e22644: [lib] update threadLabel to handle thick threads.

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-utils.js

2 lines

Diff 44173

View Options

lib/shared/thread-utils.js

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Lines	bool CryptoModule::hasSessionFor(const std::string &targetUserId) {
return (this->sessions.find(targetUserId) != this->sessions.end());		return (this->sessions.find(targetUserId) != this->sessions.end());
}		}

std::shared_ptr<Session>		std::shared_ptr<Session>
CryptoModule::getSessionByUserId(const std::string &userId) {		CryptoModule::getSessionByUserId(const std::string &userId) {
return this->sessions.at(userId);		return this->sessions.at(userId);
}		}

bool CryptoModule::matchesInboundSession(
const std::string &targetUserId,
EncryptedData encryptedData,
const OlmBuffer &theirIdentityKey) const {
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();
// Check that the inbound session matches the message it was created from.
OlmBuffer tmpEncryptedMessage(encryptedData.message);
if (1 !=
::olm_matches_inbound_session(
session, tmpEncryptedMessage.data(), tmpEncryptedMessage.size())) {
return false;
}

// Check that the inbound session matches the key this message is supposed
// to be from.
tmpEncryptedMessage = OlmBuffer(encryptedData.message);
return 1 ==
::olm_matches_inbound_session_from(
session,
theirIdentityKey.data() + ID_KEYS_PREFIX_OFFSET,
KEYSIZE,
tmpEncryptedMessage.data(),
tmpEncryptedMessage.size());
}

Persist CryptoModule::storeAsB64(const std::string &secretKey) {		Persist CryptoModule::storeAsB64(const std::string &secretKey) {
Persist persist;		Persist persist;
size_t accountPickleLength = ::olm_pickle_account_length(this->account);		size_t accountPickleLength = ::olm_pickle_account_length(this->account);
OlmBuffer accountPickleBuffer(accountPickleLength);		OlmBuffer accountPickleBuffer(accountPickleLength);
if (accountPickleLength !=		if (accountPickleLength !=
::olm_pickle_account(		::olm_pickle_account(
this->account,		this->account,
secretKey.data(),		secretKey.data(),
▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Lines	if (-1 ==
encryptedMessage.size())) {		encryptedMessage.size())) {
throw std::runtime_error{"error encrypt => ::olm_encrypt"};		throw std::runtime_error{"error encrypt => ::olm_encrypt"};
}		}
return {encryptedMessage, messageType};		return {encryptedMessage, messageType};
}		}

std::string CryptoModule::decrypt(		std::string CryptoModule::decrypt(
const std::string &targetUserId,		const std::string &targetUserId,
EncryptedData encryptedData,		EncryptedData encryptedData) {
const OlmBuffer &theirIdentityKey) {
if (!this->hasSessionFor(targetUserId)) {		if (!this->hasSessionFor(targetUserId)) {
throw std::runtime_error{"error decrypt => uninitialized session"};		throw std::runtime_error{"error decrypt => uninitialized session"};
}		}
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();		OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();

OlmBuffer tmpEncryptedMessage(encryptedData.message);		OlmBuffer tmpEncryptedMessage(encryptedData.message);

if (encryptedData.messageType == (size_t)olm::MessageType::PRE_KEY) {
if (!this->matchesInboundSession(
targetUserId, encryptedData, theirIdentityKey)) {
throw std::runtime_error{"error decrypt => matchesInboundSession"};
}
}

size_t maxSize = ::olm_decrypt_max_plaintext_length(		size_t maxSize = ::olm_decrypt_max_plaintext_length(
session,		session,
encryptedData.messageType,		encryptedData.messageType,
tmpEncryptedMessage.data(),		tmpEncryptedMessage.data(),
tmpEncryptedMessage.size());		tmpEncryptedMessage.size());
OlmBuffer decryptedMessage(maxSize);		OlmBuffer decryptedMessage(maxSize);
size_t decryptedSize = ::olm_decrypt(		size_t decryptedSize = ::olm_decrypt(
session,		session,
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines

[lib] update threadLabel to handle thick threadsClosedPublicActions