Paths

Table of Contentst

-
native/account/
-
account/
-
restore.js

Differential D14533

[lib] attempt restoring User Data after restoring primary device
ClosedPublic
Actions

Authored by kamil on Thu, Apr 3, 5:00 AM.

Details

Reviewers

bartek

Commits

rCOMM935209b41610: [lib] attempt restoring User Data after restoring primary device

Summary

ENG-10478

This is optional, just to start testing this.

Depends on D14532

Test Plan

Flip fullBackupSupport, delete app, install and restore - all thick threads are there

Diff Detail

Repository

rCOMM Comm

Branch

land

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

kamil created this revision.Thu, Apr 3, 5:00 AM

kamil held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptThu, Apr 3, 5:00 AM

kamil published this revision for review.Thu, Apr 3, 5:02 AM

kamil added inline comments.

native/account/restore.js
183 ↗	(On Diff #47638)	Looks like code duplication with D14532, but trying to implement one method makes it less readable
193 ↗	(On Diff #47638)	we should so it this way as this is the source of truth for now, but wondering about renaming this because this might be confusing

bartek accepted this revision.Thu, Apr 3, 5:06 AM

bartek added inline comments.

native/account/restore.js
193 ↗	(On Diff #47638)	Agree, but I don't have any ideas for a better name

This revision is now accepted and ready to land.Thu, Apr 3, 5:06 AM

Harbormaster completed remote builds in B33888: Diff 47638.Thu, Apr 3, 5:18 AM

rebase before landing

Harbormaster completed remote builds in B33923: Diff 47695.Mon, Apr 7, 4:42 AM

Closed by commit rCOMM935209b41610: [lib] attempt restoring User Data after restoring primary device (authored by kamil). · Explain WhyMon, Apr 7, 4:46 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMM935209b41610: [lib] attempt restoring User Data after restoring primary device.

Revision Contents
Changeset List

Path

Size

native/

account/

restore.js

52 lines

Diff 47695

View Options

native/account/restore.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

[lib] attempt restoring User Data after restoring primary deviceClosedPublicActions