Page MenuHomePhabricator
Differential D10137

[lib] Replace `LegacyThreadInfo` with `ThreadInfo` in `lib/shared`
ClosedPublic
Actions

Authored by atul on Dec 1 2023, 8:15 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 22, 1:13 PM
Unknown Object (File)
Fri, Apr 18, 4:13 PM
Unknown Object (File)
Wed, Apr 9, 1:17 PM
Unknown Object (File)
Wed, Apr 9, 12:13 PM
Unknown Object (File)
Wed, Apr 9, 7:30 AM
Unknown Object (File)
Wed, Apr 9, 5:48 AM
Unknown Object (File)
Wed, Apr 9, 5:26 AM
Unknown Object (File)
Mon, Apr 7, 10:21 PM
View All Files
Subscribers
None

Details

Reviewers
ashoat
ginsu
tomek
rohan
Commits
rCOMM67914187ef09: [lib] Replace `LegacyThreadInfo` with `ThreadInfo` in `lib/shared`
Summary

Updated message-spec and then made necessary changes.

We're now at 94 instances of LegacyThreadInfo down from 700+...

Depends on D10136

Test Plan

CI/flow/etc.

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

Diff 34126

View Options

lib/shared/messages/add-members-message-spec.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

lib/shared/messages/change-role-message-spec.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

lib/shared/messages/change-settings-message-spec.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

lib/shared/messages/create-entry-message-spec.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

lib/shared/messages/create-sidebar-message-spec.js

Loading...
View Options

lib/shared/messages/create-sub-thread-message-spec.js

Loading...
View Options

lib/shared/messages/create-thread-message-spec.js

Loading...
View Options

lib/shared/messages/delete-entry-message-spec.js

Loading...
View Options

lib/shared/messages/edit-entry-message-spec.js

Loading...
View Options

lib/shared/messages/join-thread-message-spec.js

Loading...
View Options

lib/shared/messages/leave-thread-message-spec.js

Loading...
View Options

lib/shared/messages/message-spec.js

Loading...
View Options

lib/shared/messages/multimedia-message-spec.js

Loading...
View Options

lib/shared/messages/reaction-message-spec.js

Loading...
View Options

lib/shared/messages/remove-members-message-spec.js

Loading...
View Options

lib/shared/messages/restore-entry-message-spec.js

Loading...
View Options

lib/shared/messages/text-message-spec.js

Loading...
View Options

lib/shared/messages/update-relationship-message-spec.js

Loading...
View Options

lib/shared/notif-utils.js

Loading...