Merge 4.16.1 into single-server

.circleci/config.yml

@@ -290,6 +290,24 @@ commands:
           command: bundle exec fastlane android beta official:<< parameters.official >>
           working_directory: android
 
+  # EXPERIMENTAL ONLY
+  # No plans to do it for Official
+  upload-to-google-play-production:
+    description: "Upload to Google Play production"
+    steps:
+      - checkout
+      - attach_workspace:
+          at: android
+      - run:
+          name: Store the google service account key
+          command: echo "$FASTLANE_GOOGLE_SERVICE_ACCOUNT" | base64 --decode > service_account.json
+          working_directory: android
+      - run: *update-fastlane-android
+      - run:
+          name: Fastlane Play Store Upload
+          command: bundle exec fastlane android production
+          working_directory: android
+
   upload-to-testflight:
     description: "Upload to TestFlight"
     parameters:
@@ -382,6 +400,13 @@ jobs:
       - upload-to-google-play-beta:
           official: false
 
+  android-google-play-production-experimental:
+    <<: *defaults
+    docker:
+      - image: circleci/android:api-28-node
+    steps:
+      - upload-to-google-play-production
+
   android-google-play-beta-official:
     <<: *defaults
     docker:
@@ -466,6 +491,13 @@ workflows:
       - android-google-play-beta-experimental:
           requires:
             - android-hold-google-play-beta-experimental
+      - android-hold-google-play-production-experimental:
+          type: approval
+          requires:
+            - android-build-experimental
+      - android-google-play-production-experimental:
+          requires:
+            - android-hold-google-play-production-experimental
 
       # Android Official
       - android-hold-build-official:

android/app/build.gradle

@@ -144,7 +144,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.16.0"
+        versionName "4.16.1"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

android/fastlane/Fastfile

@@ -32,4 +32,13 @@ platform :android do
       )
     end
   end
+
+  desc "Upload App to Play Store Production"
+  lane :production do |options|
+    upload_to_play_store(
+      package_name: 'chat.rocket.reactnative',
+      track: 'production',
+      aab: 'android/app/build/outputs/bundle/experimentalPlayRelease/app-experimental-play-release.aab'
+    )
+  end
 end

app/containers/RoomHeader/RoomHeader.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import {
 	View, Text, StyleSheet, TouchableOpacity
@@ -149,11 +149,13 @@ const Header = React.memo(({
 		);
 	}
 
+	const handleOnPress = useCallback(() => onPress(), []);
+
 	return (
 		<TouchableOpacity
 			testID='room-header'
 			accessibilityLabel={title}
-			onPress={onPress}
+			onPress={handleOnPress}
 			style={styles.container}
 			disabled={tmid}
 			hitSlop={HIT_SLOP}

app/i18n/index.js

@@ -79,13 +79,16 @@ export const setLanguage = (l) => {
 		return;
 	}
 	// server uses lowercase pattern (pt-br), but we're forced to use standard pattern (pt-BR)
-	const locale = LANGUAGES.find(ll => ll.value.toLowerCase() === l.toLowerCase())?.value;
+	let locale = LANGUAGES.find(ll => ll.value.toLowerCase() === l.toLowerCase())?.value;
+	if (!locale) {
+		locale = 'en';
+	}
 	// don't go forward if it's the same language and default language (en) was setup already
 	if (i18n.locale === locale && i18n.translations?.en) {
 		return;
 	}
 	i18n.locale = locale;
-	i18n.translations = { ...i18n.translations, [locale]: translations[locale]() };
+	i18n.translations = { ...i18n.translations, [locale]: translations[locale]?.() };
 	I18nManager.forceRTL(isRTL(locale));
 	I18nManager.swapLeftAndRightInRTL(isRTL(locale));
 	i18n.isRTL = I18nManager.isRTL;

app/sagas/init.js

@@ -37,7 +37,7 @@ const restore = function* restore() {
 				UserPreferences.removeItem(RocketChat.CURRENT_SERVER)
 			]);
 			yield put(serverRequest(appConfig.server));
-			// yield put(appStart({ root: ROOT_OUTSIDE }));
+			yield put(appStart({ root: ROOT_OUTSIDE }));
 		} else {
 			const serversDB = database.servers;
 			const serverCollections = serversDB.get('servers');

app/views/AuthenticationWebView.js

@@ -88,8 +88,8 @@ class AuthenticationWebView extends React.PureComponent {
 		this.dismiss();
 	}
 
-	// eslint-disable-next-line react/sort-comp
-	debouncedLogin = debounce(params => this.login(params), 3000, true);
+	// Force 3s delay so the server has time to evaluate the token
+	debouncedLogin = debounce(params => this.login(params), 3000);
 
 	tryLogin = debounce(async() => {
 		const { Accounts_Iframe_api_url, Accounts_Iframe_api_method } = this.props;

app/views/RoomActionsView/index.js

@@ -219,16 +219,6 @@ class RoomActionsView extends React.Component {
 		return canToggleEncryption;
 	}
 
-	canToggleEncryption = async() => {
-		const { room } = this.state;
-		const { toggleRoomE2EEncryptionPermission } = this.props;
-		const { rid } = room;
-		const permissions = await RocketChat.hasPermission([toggleRoomE2EEncryptionPermission], rid);
-
-		const canToggleEncryption = permissions[0];
-		this.setState({ canToggleEncryption });
-	}
-
 	canViewMembers = async() => {
 		const { room } = this.state;
 		const { viewBroadcastMemberListPermission } = this.props;

ios/RocketChatRN.xcodeproj/project.pbxproj

@@ -1687,7 +1687,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.16.0;
+				MARKETING_VERSION = 4.16.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;
@@ -1724,7 +1724,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.16.0;
+				MARKETING_VERSION = 4.16.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";

ios/RocketChatRN/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.16.0</string>
+	<string>4.16.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/ShareRocketChatRN/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.16.0</string>
+	<string>4.16.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocket-chat-reactnative",
-  "version": "4.16.0",
+  "version": "4.16.1",
   "private": true,
   "scripts": {
     "start": "react-native start",