Merge 4.13.1 into master

android/app/build.gradle

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

app/lib/methods/helpers/mergeSubscriptionsRooms.js

@@ -15,9 +15,6 @@ export const merge = (subscription, room) => {
 	if (room) {
 		if (room._updatedAt) {
 			subscription.lastMessage = normalizeMessage(room.lastMessage);
-			const updatedAt = room?._updatedAt ? new Date(room._updatedAt) : null;
-			const lastMessageTs = subscription?.lastMessage?.ts ? new Date(subscription.lastMessage.ts) : null;
-			subscription.roomUpdatedAt = Math.max(updatedAt, lastMessageTs);
 			subscription.description = room.description;
 			subscription.topic = room.topic;
 			subscription.announcement = room.announcement;
@@ -28,6 +25,9 @@ export const merge = (subscription, room) => {
 			subscription.usernames = room.usernames;
 			subscription.uids = room.uids;
 		}
+		// https://github.com/RocketChat/Rocket.Chat/blob/develop/app/ui-sidenav/client/roomList.js#L180
+		const lastRoomUpdate = room.lm || subscription.ts || subscription._updatedAt;
+		subscription.roomUpdatedAt = subscription.lr ? Math.max(new Date(subscription.lr), new Date(lastRoomUpdate)) : lastRoomUpdate;
 		subscription.ro = room.ro;
 		subscription.broadcast = room.broadcast;
 		subscription.encrypted = room.encrypted;

app/sagas/deepLinking.js

@@ -15,7 +15,6 @@ import {
 } from '../actions/app';
 import { localAuthenticate } from '../utils/localAuthentication';
 import { goRoom } from '../utils/goRoom';
-import callJitsi from '../lib/methods/callJitsi';
 
 const roomTypes = {
 	channel: 'c', direct: 'd', group: 'p', channels: 'l'
@@ -54,7 +53,7 @@ const navigate = function* navigate({ params }) {
 				yield goRoom({ item, isMasterDetail });
 
 				if (params.isCall) {
-					callJitsi(item.rid);
+					RocketChat.callJitsi(item.rid);
 				}
 			}
 		} else {

app/utils/fileUpload/index.ios.js

@@ -1,46 +1,50 @@
-class FileUpload {
-	_xhr = new XMLHttpRequest();
+class Upload {
+	constructor() {
+		this.xhr = new XMLHttpRequest();
+		this.formData = new FormData();
+	}
+
+	then = (callback) => {
+		this.xhr.onload = () => callback({ respInfo: this.xhr });
+		this.xhr.send(this.formData);
+	}
+
+	catch = (callback) => {
+		this.xhr.onerror = callback;
+	}
 
-	_formData = new FormData();
+	uploadProgress = (callback) => {
+		this.xhr.upload.onprogress = ({ total, loaded }) => callback(loaded, total);
+	}
+
+	cancel = () => {
+		this.xhr.abort();
+		return Promise.resolve();
+	}
+}
 
+class FileUpload {
 	fetch = (method, url, headers, data) => {
-		this._xhr.open(method, url);
+		const upload = new Upload();
+		upload.xhr.open(method, url);
 
 		Object.keys(headers).forEach((key) => {
-			this._xhr.setRequestHeader(key, headers[key]);
+			upload.xhr.setRequestHeader(key, headers[key]);
 		});
 
 		data.forEach((item) => {
 			if (item.uri) {
-				this._formData.append(item.name, {
+				upload.formData.append(item.name, {
 					uri: item.uri,
 					type: item.type,
 					name: item.filename
 				});
 			} else {
-				this._formData.append(item.name, item.data);
+				upload.formData.append(item.name, item.data);
 			}
 		});
 
-		return this;
-	}
-
-	then = (callback) => {
-		this._xhr.onload = () => callback({ respInfo: this._xhr });
-		this._xhr.send(this._formData);
-	}
-
-	catch = (callback) => {
-		this._xhr.onerror = callback;
-	}
-
-	uploadProgress = (callback) => {
-		this._xhr.upload.onprogress = ({ total, loaded }) => callback(loaded, total);
-	}
-
-	cancel = () => {
-		this._xhr.abort();
-		return Promise.resolve();
+		return upload;
 	}
 }
 

app/views/AttachmentView.js

@@ -119,7 +119,8 @@ class AttachmentView extends React.Component {
 		this.setState({ loading: true });
 		try {
 			const extension = image_url ? `.${ mime.extension(image_type) || 'jpg' }` : `.${ mime.extension(video_type) || 'mp4' }`;
-			const path = `${ RNFetchBlob.fs.dirs.DocumentDir + SHA256(url) + extension }`;
+			const documentDir = `${ RNFetchBlob.fs.dirs.DocumentDir }/`;
+			const path = `${ documentDir + SHA256(url) + extension }`;
 			const file = await RNFetchBlob.config({ path }).fetch('GET', mediaAttachment).then(res => res.path());
 			await CameraRoll.save(file, { album: 'Rocket.Chat' });
 			EventEmitter.emit(LISTENER, { message: I18n.t('saved_to_gallery') });

ios/Podfile

@@ -10,11 +10,14 @@ def all_pods
   use_flipper!
 end
 
-target 'RocketChatRN' do
+abstract_target 'defaults' do
   # force use our own JitsiMeetSDK
   pod 'JitsiMeetSDK', :git => 'https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git'
 
   all_pods
+
+  target 'RocketChatRN' # Experimental app
+  target 'Rocket.Chat' # Official app
 end
 
 target 'ShareRocketChatRN' do