Merge branch 'develop' into fix.e2efetchkeys-startup

app/lib/rocketchat/rocketchat.js

@@ -11,7 +11,6 @@ import { getBundleId, isIOS } from '../../utils/deviceInfo';
 import log from '../../utils/log';
 import SSLPinning from '../../utils/sslPinning';
 import database from '../database';
-import { sanitizeLikeString } from '../database/utils';
 import { Encryption } from '../encryption';
 import triggerBlockAction, { triggerCancel, triggerSubmitView } from '../methods/actions';
 import callJitsi, { callJitsiWithoutServer } from '../methods/callJitsi';
@@ -186,8 +185,13 @@ const RocketChat = {
 
 	async e2eFetchMyKeys() {
 		// RC 0.70.0
-		const sdk = this.shareSDK || this.sdk;
-		const result = await sdk.get('e2e.fetchMyKeys');
+		const currentSdk = this.shareSDK || this.sdk;
+		let result;
+		if (currentSdk) {
+			result = await currentSdk.get('e2e.fetchMyKeys');
+		} else if (sdk.current) {
+			result = await sdk.current.get('e2e.fetchMyKeys');
+		}
 		// snake_case -> camelCase
 		if (result.success) {
 			return {

app/lib/rocketchat/services/connect.ts

@@ -260,7 +260,13 @@ function stopListener(listener: any): boolean {
 
 async function login(credentials: ICredentials, isFromWebView = false): Promise<ILoggedUser | undefined> {
 	// RC 0.64.0
-	await sdk.current.login(credentials);
+	if (sdk.current) {
+		await sdk.current.login(credentials);
+	} else {
+		const { server } = store.getState().server;
+		sdk.initialize(server);
+		await sdk.current.login(credentials);
+	}
 	const result = sdk.current.currentLogin?.result;
 	if (result) {
 		const user: ILoggedUser = {