Chore: Update react-native-mmkv-storage to 0.6.12

__tests__/Storyshots.test.js

@@ -20,6 +20,26 @@ jest.mock('react-native-file-viewer', () => ({
 jest.mock('../app/lib/database', () => jest.fn(() => null));
 global.Date.now = jest.fn(() => new Date('2019-10-10').getTime());
 
+jest.mock('react-native-mmkv-storage', () => {
+	return {
+		Loader: jest.fn().mockImplementation(() => {
+			return {
+				setProcessingMode: jest.fn().mockImplementation(() => {
+					return {
+						withEncryption: jest.fn().mockImplementation(() => {
+							return {
+								initialize: jest.fn()
+							};
+						})
+					};
+				})
+			};
+		}),
+		create: jest.fn(),
+		MODES: { MULTI_PROCESS: '' }
+	};
+});
+
 const converter = new Stories2SnapsConverter();
 
 initStoryshots({

android/app/src/main/java/chat/rocket/reactnative/MainApplication.java

@@ -12,7 +12,6 @@
 import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
-
 import org.unimodules.adapters.react.ModuleRegistryAdapter;
 import org.unimodules.adapters.react.ReactModuleRegistryProvider;
 
@@ -54,7 +53,7 @@ protected String getJSMainModuleName() {
 
     @Override
     protected JSIModulePackage getJSIModulePackage() {
-      return new ReanimatedJSIModulePackage(); // <- add
+      return new ReanimatedJSIModulePackage();
     }
 
     @Override

android/app/src/play/java/chat/rocket/reactnative/Ejson.java

@@ -53,16 +53,8 @@ public Ejson() {
         String alias = Utils.toHex("com.MMKV.default");
 
         // Retrieve container password
-        secureKeystore.getSecureKey(alias, new RNCallback() {
-            @Override
-            public void invoke(Object... args) {
-                String error = (String) args[0];
-                if (error == null) {
-                    String password = (String) args[1];
-                    mmkv = MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE, password);
-                }
-            }
-        });
+        String password = secureKeystore.getSecureKey(alias);
+        mmkv = MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE, password);
     }
 
     public String getAvatarUri() {

app/containers/Passcode/PasscodeEnter.tsx

@@ -10,7 +10,7 @@ import { TYPE } from './constants';
 import { ATTEMPTS_KEY, LOCKED_OUT_TIMER_KEY, MAX_ATTEMPTS, PASSCODE_KEY } from '../../constants/localAuthentication';
 import { biometryAuth, resetAttempts } from '../../utils/localAuthentication';
 import { getDiff, getLockedUntil } from './utils';
-import UserPreferences from '../../lib/userPreferences';
+import { useUserPreferences } from '../../lib/userPreferences';
 import I18n from '../../i18n';
 
 interface IPasscodePasscodeEnter {
@@ -23,16 +23,11 @@ const PasscodeEnter = ({ theme, hasBiometry, finishProcess }: IPasscodePasscodeE
 	const ref = useRef(null);
 	let attempts: any = 0;
 	let lockedUntil: any = false;
-	const [passcode, setPasscode] = useState(null);
+	const [passcode] = useUserPreferences(PASSCODE_KEY);
 	const [status, setStatus] = useState(null);
 	const { getItem: getAttempts, setItem: setAttempts } = useAsyncStorage(ATTEMPTS_KEY);
 	const { setItem: setLockedUntil } = useAsyncStorage(LOCKED_OUT_TIMER_KEY);
 
-	const fetchPasscode = async () => {
-		const p: any = await UserPreferences.getStringAsync(PASSCODE_KEY);
-		setPasscode(p);
-	};
-
 	const biometry = async () => {
 		if (hasBiometry && status === TYPE.ENTER) {
 			const result = await biometryAuth();
@@ -56,7 +51,6 @@ const PasscodeEnter = ({ theme, hasBiometry, finishProcess }: IPasscodePasscodeE
 		} else {
 			setStatus(TYPE.ENTER);
 		}
-		await fetchPasscode();
 		biometry();
 	};
 

app/index.tsx

@@ -6,8 +6,7 @@ import { KeyCommandsEmitter } from 'react-native-keycommands';
 import RNScreens from 'react-native-screens';
 import { SafeAreaProvider, initialWindowMetrics } from 'react-native-safe-area-context';
 
-import { defaultTheme, newThemeState, subscribeTheme, unsubscribeTheme } from './utils/theme';
-import UserPreferences from './lib/userPreferences';
+import { getTheme, initialTheme, newThemeState, subscribeTheme, unsubscribeTheme } from './utils/theme';
 import EventEmitter from './utils/events';
 import { appInit, appInitLocalSettings, setMasterDetail as setMasterDetailAction } from './actions/app';
 import { deepLinkingOpen } from './actions/deepLinking';
@@ -17,9 +16,9 @@ import store from './lib/createStore';
 import { toggleAnalyticsEventsReport, toggleCrashErrorsReport } from './utils/log';
 import { ThemeContext } from './theme';
 import { DimensionsContext } from './dimensions';
-import RocketChat, { THEME_PREFERENCES_KEY } from './lib/rocketchat';
+import RocketChat from './lib/rocketchat';
 import { MIN_WIDTH_MASTER_DETAIL_LAYOUT } from './constants/tablet';
-import { isTablet, supportSystemTheme } from './utils/deviceInfo';
+import { isTablet } from './utils/deviceInfo';
 import { KEY_COMMAND } from './commands';
 import AppContainer from './AppContainer';
 import TwoFactor from './containers/TwoFactor';
@@ -33,6 +32,7 @@ import { isFDroidBuild } from './constants/environment';
 import { IThemePreference } from './definitions/ITheme';
 import { ICommand } from './definitions/ICommand';
 import { initStore } from './lib/auxStore';
+import { themes } from './constants/colors';
 
 RNScreens.enableScreens();
 initStore(store);
@@ -88,12 +88,10 @@ export default class Root extends React.Component<{}, IState> {
 			this.initCrashReport();
 		}
 		const { width, height, scale, fontScale } = Dimensions.get('window');
+		const theme = initialTheme();
 		this.state = {
-			theme: defaultTheme(),
-			themePreferences: {
-				currentTheme: supportSystemTheme() ? 'automatic' : 'light',
-				darkLevel: 'black'
-			},
+			theme: getTheme(theme),
+			themePreferences: theme,
 			width,
 			height,
 			scale,
@@ -128,7 +126,6 @@ export default class Root extends React.Component<{}, IState> {
 	}
 
 	init = async () => {
-		UserPreferences.getMapAsync(THEME_PREFERENCES_KEY).then((theme: any) => this.setTheme(theme));
 		store.dispatch(appInitLocalSettings());
 
 		// Open app from push notification
@@ -209,7 +206,9 @@ export default class Root extends React.Component<{}, IState> {
 	render() {
 		const { themePreferences, theme, width, height, scale, fontScale } = this.state;
 		return (
-			<SafeAreaProvider initialMetrics={initialWindowMetrics}>
+			<SafeAreaProvider
+				initialMetrics={initialWindowMetrics}
+				style={{ backgroundColor: themes[this.state.theme].backgroundColor }}>
 				<AppearanceProvider>
 					<Provider store={store}>
 						<ThemeContext.Provider

app/lib/encryption/encryption.ts

@@ -118,8 +118,8 @@ class Encryption {
 	// Persist keys on UserPreferences
 	persistKeys = async (server: string, publicKey: string, privateKey: string) => {
 		this.privateKey = await SimpleCrypto.RSA.importKey(EJSON.parse(privateKey));
-		await UserPreferences.setStringAsync(`${server}-${E2E_PUBLIC_KEY}`, EJSON.stringify(publicKey));
-		await UserPreferences.setStringAsync(`${server}-${E2E_PRIVATE_KEY}`, privateKey);
+		UserPreferences.setString(`${server}-${E2E_PUBLIC_KEY}`, EJSON.stringify(publicKey));
+		UserPreferences.setString(`${server}-${E2E_PRIVATE_KEY}`, privateKey);
 	};
 
 	// Could not obtain public-private keypair from server.
@@ -182,9 +182,9 @@ class Encryption {
 	};
 
 	// Create a random password to local created keys
-	createRandomPassword = async (server: string) => {
+	createRandomPassword = (server: string) => {
 		const password = randomPassword();
-		await UserPreferences.setStringAsync(`${server}-${E2E_RANDOM_PASSWORD_KEY}`, password);
+		UserPreferences.setString(`${server}-${E2E_RANDOM_PASSWORD_KEY}`, password);
 		return password;
 	};
 
@@ -194,7 +194,7 @@ class Encryption {
 
 		// Encode the private key
 		const encodedPrivateKey = await this.encodePrivateKey(EJSON.stringify(privateKey), password, this.userId as string);
-		const publicKey = await UserPreferences.getStringAsync(`${server}-${E2E_PUBLIC_KEY}`);
+		const publicKey = UserPreferences.getString(`${server}-${E2E_PUBLIC_KEY}`);
 
 		// Send the new keys to the server
 		await RocketChat.e2eSetUserPublicAndPrivateKeys(EJSON.stringify(publicKey), encodedPrivateKey);

app/lib/methods/logout.ts

@@ -14,23 +14,23 @@ import UserPreferences from '../userPreferences';
 import { ICertificate, IRocketChat } from '../../definitions';
 import sdk from '../rocketchat/services/sdk';
 
-async function removeServerKeys({ server, userId }: { server: string; userId?: string | null }) {
-	await UserPreferences.removeItem(`${RocketChat.TOKEN_KEY}-${server}`);
+function removeServerKeys({ server, userId }: { server: string; userId?: string | null }) {
+	UserPreferences.removeItem(`${RocketChat.TOKEN_KEY}-${server}`);
 	if (userId) {
-		await UserPreferences.removeItem(`${RocketChat.TOKEN_KEY}-${userId}`);
+		UserPreferences.removeItem(`${RocketChat.TOKEN_KEY}-${userId}`);
 	}
-	await UserPreferences.removeItem(`${BASIC_AUTH_KEY}-${server}`);
-	await UserPreferences.removeItem(`${server}-${E2E_PUBLIC_KEY}`);
-	await UserPreferences.removeItem(`${server}-${E2E_PRIVATE_KEY}`);
-	await UserPreferences.removeItem(`${server}-${E2E_RANDOM_PASSWORD_KEY}`);
+	UserPreferences.removeItem(`${BASIC_AUTH_KEY}-${server}`);
+	UserPreferences.removeItem(`${server}-${E2E_PUBLIC_KEY}`);
+	UserPreferences.removeItem(`${server}-${E2E_PRIVATE_KEY}`);
+	UserPreferences.removeItem(`${server}-${E2E_RANDOM_PASSWORD_KEY}`);
 }
 
 async function removeSharedCredentials({ server }: { server: string }) {
 	// clear certificate for server - SSL Pinning
 	try {
-		const certificate = (await UserPreferences.getMapAsync(extractHostname(server))) as ICertificate | null;
+		const certificate = UserPreferences.getMap(extractHostname(server)) as ICertificate | null;
 		if (certificate?.path) {
-			await UserPreferences.removeItem(extractHostname(server));
+			UserPreferences.removeItem(extractHostname(server));
 			await FileSystem.deleteAsync(certificate.path);
 		}
 	} catch (e) {
@@ -42,7 +42,7 @@ async function removeServerData({ server }: { server: string }) {
 	try {
 		const batch: Model[] = [];
 		const serversDB = database.servers;
-		const userId = await UserPreferences.getStringAsync(`${RocketChat.TOKEN_KEY}-${server}`);
+		const userId = UserPreferences.getString(`${RocketChat.TOKEN_KEY}-${server}`);
 
 		const usersCollection = serversDB.get('users');
 		if (userId) {
@@ -55,14 +55,14 @@ async function removeServerData({ server }: { server: string }) {
 
 		await serversDB.write(() => serversDB.batch(...batch));
 		await removeSharedCredentials({ server });
-		await removeServerKeys({ server, userId });
+		removeServerKeys({ server, userId });
 	} catch (e) {
 		log(e);
 	}
 }
 
-async function removeCurrentServer() {
-	await UserPreferences.removeItem(RocketChat.CURRENT_SERVER);
+function removeCurrentServer() {
+	UserPreferences.removeItem(RocketChat.CURRENT_SERVER);
 }
 
 async function removeServerDatabase({ server }: { server: string }) {
@@ -76,9 +76,9 @@ async function removeServerDatabase({ server }: { server: string }) {
 
 export async function removeServer({ server }: { server: string }): Promise<void> {
 	try {
-		const userId = await UserPreferences.getStringAsync(`${RocketChat.TOKEN_KEY}-${server}`);
+		const userId = UserPreferences.getString(`${RocketChat.TOKEN_KEY}-${server}`);
 		if (userId) {
-			const resume = await UserPreferences.getStringAsync(`${RocketChat.TOKEN_KEY}-${userId}`);
+			const resume = UserPreferences.getString(`${RocketChat.TOKEN_KEY}-${userId}`);
 
 			const sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl: useSsl(server) });
 			await sdk.login({ resume });

app/lib/rocketchat/rocketchat.js

@@ -116,8 +116,8 @@ const RocketChat = {
 		database.setShareDB(server);
 
 		try {
-			const certificate = await UserPreferences.getStringAsync(`${RocketChat.CERTIFICATE_KEY}-${server}`);
-			await SSLPinning.setCertificate(certificate, server);
+			const certificate = UserPreferences.getString(`${RocketChat.CERTIFICATE_KEY}-${server}`);
+			SSLPinning.setCertificate(certificate, server);
 		} catch {
 			// Do nothing
 		}
@@ -156,7 +156,7 @@ const RocketChat = {
 			reduxStore.dispatch(shareSetSettings(this.parseSettings(parsed)));
 
 			// set User info
-			const userId = await UserPreferences.getStringAsync(`${RocketChat.TOKEN_KEY}-${server}`);
+			const userId = UserPreferences.getString(`${RocketChat.TOKEN_KEY}-${server}`);
 			const userCollections = serversDB.get('users');
 			let user = null;
 			if (userId) {
@@ -457,14 +457,13 @@ const RocketChat = {
 		}
 		return JSON.parse(allowAnalyticsEvents);
 	},
-	async getSortPreferences() {
-		const prefs = await UserPreferences.getMapAsync(SORT_PREFS_KEY);
-		return prefs;
+	getSortPreferences() {
+		return UserPreferences.getMap(SORT_PREFS_KEY);
 	},
-	async saveSortPreference(param) {
-		let prefs = await RocketChat.getSortPreferences();
+	saveSortPreference(param) {
+		let prefs = RocketChat.getSortPreferences();
 		prefs = { ...prefs, ...param };
-		return UserPreferences.setMapAsync(SORT_PREFS_KEY, prefs);
+		return UserPreferences.setMap(SORT_PREFS_KEY, prefs);
 	},
 	getLoginServices,
 	determineAuthType,

app/lib/userPreferences.ts

@@ -1,57 +1,56 @@
-import MMKVStorage from 'react-native-mmkv-storage';
+import MMKVStorage, { create } from 'react-native-mmkv-storage';
 
 const MMKV = new MMKVStorage.Loader()
 	// MODES.MULTI_PROCESS = ACCESSIBLE BY APP GROUP (iOS)
 	.setProcessingMode(MMKVStorage.MODES.MULTI_PROCESS)
 	.withEncryption()
 	.initialize();
 
+export const useUserPreferences = create(MMKV);
+
 class UserPreferences {
 	private mmkv: MMKVStorage.API;
 	constructor() {
 		this.mmkv = MMKV;
 	}
 
-	async getStringAsync(key: string) {
+	getString(key: string): string | null {
 		try {
-			const value = await this.mmkv.getStringAsync(key);
-			return value;
+			return this.mmkv.getString(key) || null;
 		} catch {
 			return null;
 		}
 	}
 
-	setStringAsync(key: string, value: string) {
-		return this.mmkv.setStringAsync(key, value);
+	setString(key: string, value: string): boolean | undefined {
+		return this.mmkv.setString(key, value);
 	}
 
-	async getBoolAsync(key: string) {
+	getBool(key: string): boolean | null {
 		try {
-			const value = await this.mmkv.getBoolAsync(key);
-			return value;
+			return this.mmkv.getBool(key) || null;
 		} catch {
 			return null;
 		}
 	}
 
-	setBoolAsync(key: string, value: boolean) {
-		return this.mmkv.setBoolAsync(key, value);
+	setBool(key: string, value: boolean): boolean | undefined {
+		return this.mmkv.setBool(key, value);
 	}
 
-	async getMapAsync(key: string) {
+	getMap(key: string): object | null {
 		try {
-			const value = await this.mmkv.getMapAsync(key);
-			return value;
+			return this.mmkv.getMap(key) || null;
 		} catch {
 			return null;
 		}
 	}
 
-	setMapAsync(key: string, value: object) {
-		return this.mmkv.setMapAsync(key, value);
+	setMap(key: string, value: object): boolean | undefined {
+		return this.mmkv.setMap(key, value);
 	}
 
-	removeItem(key: string) {
+	removeItem(key: string): boolean | undefined {
 		return this.mmkv.removeItem(key);
 	}
 }

app/sagas/deepLinking.js

@@ -158,8 +158,8 @@ const handleOpen = function* handleOpen({ params }) {
 	}
 
 	const [server, user] = yield all([
-		UserPreferences.getStringAsync(RocketChat.CURRENT_SERVER),
-		UserPreferences.getStringAsync(`${RocketChat.TOKEN_KEY}-${host}`)
+		UserPreferences.getString(RocketChat.CURRENT_SERVER),
+		UserPreferences.getString(`${RocketChat.TOKEN_KEY}-${host}`)
 	]);
 
 	// TODO: needs better test