[FIX] Share Extension issues

app/actions/actionsTypes.js

@@ -14,6 +14,11 @@ export const LOGIN = createRequestTypes('LOGIN', [
 	'SET_SERVICES',
 	'SET_PREFERENCE'
 ]);
+export const SHARE = createRequestTypes('SHARE', [
+	'SELECT_SERVER',
+	'SET_USER',
+	'SET_SERVER_INFO'
+]);
 export const USER = createRequestTypes('USER', ['SET']);
 export const ROOMS = createRequestTypes('ROOMS', [
 	...defaultTypes,

app/actions/share.js

@@ -0,0 +1,15 @@
+import { SHARE } from './actionsTypes';
+
+export function shareSelectServer(server) {
+	return {
+		type: SHARE.SELECT_SERVER,
+		server
+	};
+}
+
+export function shareSetUser(user) {
+	return {
+		type: SHARE.SET_USER,
+		user
+	};
+}

app/containers/HeaderButton.js

@@ -5,6 +5,7 @@ import HeaderButtons, { HeaderButton, Item } from 'react-navigation-header-butto
 import { CustomIcon } from '../lib/Icons';
 import { isIOS } from '../utils/deviceInfo';
 import { COLOR_PRIMARY, COLOR_WHITE } from '../constants/colors';
+import I18n from '../i18n';
 
 const color = isIOS ? COLOR_PRIMARY : COLOR_WHITE;
 export const headerIconSize = 23;
@@ -35,7 +36,7 @@ export const CloseModalButton = React.memo(({ navigation, testID }) => (
 export const CloseShareExtensionButton = React.memo(({ onPress, testID }) => (
 	<CustomHeaderButtons left>
 		{isIOS
-			? <Item title='cancel' onPress={onPress} testID={testID} />
+			? <Item title={I18n.t('Cancel')} onPress={onPress} testID={testID} />
 			: <Item title='close' iconName='cross' onPress={onPress} testID={testID} />
 		}
 	</CustomHeaderButtons>

app/containers/MessageBox/index.js

@@ -489,7 +489,9 @@ class MessageBox extends Component {
 	}
 
 	sendMediaMessage = async(file) => {
-		const { rid, tmid } = this.props;
+		const {
+			rid, tmid, baseUrl: server, user
+		} = this.props;
 		this.setState({ file: { isVisible: false } });
 		const fileInfo = {
 			name: file.name,
@@ -500,7 +502,7 @@ class MessageBox extends Component {
 			path: file.path
 		};
 		try {
-			await RocketChat.sendFileMessage(rid, fileInfo, tmid);
+			await RocketChat.sendFileMessage(rid, fileInfo, tmid, server, user);
 		} catch (e) {
 			log('err_send_media_message', e);
 		}
@@ -602,14 +604,16 @@ class MessageBox extends Component {
 	}
 
 	finishAudioMessage = async(fileInfo) => {
-		const { rid, tmid } = this.props;
+		const {
+			rid, tmid, baseUrl: server, user
+		} = this.props;
 
 		this.setState({
 			recording: false
 		});
 		if (fileInfo) {
 			try {
-				await RocketChat.sendFileMessage(rid, fileInfo, tmid);
+				await RocketChat.sendFileMessage(rid, fileInfo, tmid, server, user);
 			} catch (e) {
 				if (e && e.error === 'error-file-too-large') {
 					return Alert.alert(I18n.t(e.error));

app/containers/SearchBox.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { View, StyleSheet, TextInput } from 'react-native';
+import {
+	View, StyleSheet, TextInput, Text
+} from 'react-native';
 import PropTypes from 'prop-types';
+import Touchable from 'react-native-platform-touchable';
 
 import I18n from '../i18n';
 import { isIOS } from '../utils/deviceInfo';
@@ -9,7 +12,10 @@ import sharedStyles from '../views/Styles';
 
 const styles = StyleSheet.create({
 	container: {
-		backgroundColor: isIOS ? '#F7F8FA' : '#54585E'
+		backgroundColor: isIOS ? '#F7F8FA' : '#54585E',
+		flexDirection: 'row',
+		alignItems: 'center',
+		flex: 1
 	},
 	searchBox: {
 		alignItems: 'center',
@@ -21,7 +27,8 @@ const styles = StyleSheet.create({
 		height: 36,
 		margin: 16,
 		marginVertical: 10,
-		paddingHorizontal: 10
+		paddingHorizontal: 10,
+		flex: 1
 	},
 	input: {
 		color: '#8E8E93',
@@ -31,10 +38,26 @@ const styles = StyleSheet.create({
 		paddingTop: 0,
 		paddingBottom: 0,
 		...sharedStyles.textRegular
+	},
+	cancel: {
+		marginRight: 10
+	},
+	cancelText: {
+		...sharedStyles.textRegular,
+		...sharedStyles.textColorHeaderBack,
+		fontSize: 17
 	}
 });
 
-const SearchBox = ({ onChangeText, onSubmitEditing, testID }) => (
+const CancelButton = onCancelPress => (
+	<Touchable onPress={onCancelPress} style={styles.cancel}>
+		<Text style={styles.cancelText}>{I18n.t('Cancel')}</Text>
+	</Touchable>
+);
+
+const SearchBox = ({
+	onChangeText, onSubmitEditing, testID, hasCancel, onCancelPress, ...props
+}) => (
 	<View style={styles.container}>
 		<View style={styles.searchBox}>
 			<CustomIcon name='magnifier' size={14} color='#8E8E93' />
@@ -50,14 +73,18 @@ const SearchBox = ({ onChangeText, onSubmitEditing, testID }) => (
 				underlineColorAndroid='transparent'
 				onChangeText={onChangeText}
 				onSubmitEditing={onSubmitEditing}
+				{...props}
 			/>
 		</View>
+		{ hasCancel ? CancelButton(onCancelPress) : null }
 	</View>
 );
 
 SearchBox.propTypes = {
 	onChangeText: PropTypes.func.isRequired,
 	onSubmitEditing: PropTypes.func,
+	hasCancel: PropTypes.bool,
+	onCancelPress: PropTypes.func,
 	testID: PropTypes.string
 };
 

app/i18n/locales/en.js

@@ -311,13 +311,13 @@ export default {
 	Search_global_users: 'Search for global users',
 	Search_global_users_description: 'If you turn-on, you can search for any user from others companies or servers.',
 	Select_Avatar: 'Select Avatar',
-	Select_Channels: 'Select Channels',
 	Select_Server: 'Select Server',
 	Select_Users: 'Select Users',
 	Send: 'Send',
 	Send_audio_message: 'Send audio message',
 	Send_crash_report: 'Send crash report',
 	Send_message: 'Send message',
+	Send_to: 'Send to...',
 	Sent_an_attachment: 'Sent an attachment',
 	Server: 'Server',
 	Servers: 'Servers',

app/i18n/locales/pt-BR.js

@@ -302,12 +302,12 @@ export default {
 	Search_global_users: 'Busca por usuários globais',
 	Search_global_users_description: 'Caso ativado, busca por usuários de outras empresas ou servidores.',
 	Select_Avatar: 'Selecionar Avatar',
-	Select_Channels: 'Selecionar Canais',
 	Select_Server: 'Selecionar Servidor',
 	Select_Users: 'Selecionar Usuários',
 	Send: 'Enviar',
 	Send_audio_message: 'Enviar mensagem de áudio',
 	Send_message: 'Enviar mensagem',
+	Send_to: 'Enviar para...',
 	Sent_an_attachment: 'Enviou um anexo',
 	Server: 'Servidor',
 	Set_username_subtitle: 'O usuário é utilizado para permitir que você seja mencionado em mensagens',
@@ -383,5 +383,6 @@ export default {
 	you_were_mentioned: 'você foi mencionado',
 	you: 'você',
 	You: 'Você',
+	You_need_to_access_at_least_one_RocketChat_server_to_share_something: 'Você precisa acessar ao menos um servidor Rocket.Chat para compartilhar.',
 	You_will_not_be_able_to_recover_this_message: 'Você não será capaz de recuperar essa mensagem!'
 };

app/lib/ShareNavigation.js

@@ -0,0 +1,21 @@
+import { NavigationActions } from 'react-navigation';
+
+let _shareNavigator;
+
+function setTopLevelNavigator(navigatorRef) {
+	_shareNavigator = navigatorRef;
+}
+
+function navigate(routeName, params) {
+	_shareNavigator.dispatch(
+		NavigationActions.navigate({
+			routeName,
+			params
+		})
+	);
+}
+
+export default {
+	navigate,
+	setTopLevelNavigator
+};

app/lib/methods/getSettings.js

@@ -40,6 +40,15 @@ export default async function() {
 					if (setting._id === 'Site_Name') {
 						updateServer.call(this, { name: setting.valueAsString });
 					}
+					if (setting._id === 'UI_Use_Real_Name') {
+						updateServer.call(this, { useRealName: setting.valueAsBoolean });
+					}
+					if (setting._id === 'FileUpload_MediaTypeWhiteList') {
+						updateServer.call(this, { FileUpload_MediaTypeWhiteList: setting.valueAsString });
+					}
+					if (setting._id === 'FileUpload_MaxFileSize') {
+						updateServer.call(this, { FileUpload_MaxFileSize: setting.valueAsNumber });
+					}
 				})
 			)
 		);

app/lib/methods/sendFileMessage.js

@@ -1,4 +1,3 @@
-import reduxStore from '../createStore';
 import database from '../realm';
 import log from '../../utils/log';
 
@@ -23,11 +22,12 @@ export function cancelUpload(path) {
 	}
 }
 
-export function sendFileMessage(rid, fileInfo, tmid) {
+export function sendFileMessage(rid, fileInfo, tmid, server, user) {
 	return new Promise((resolve, reject) => {
 		try {
-			const { FileUpload_MaxFileSize, Site_Url } = reduxStore.getState().settings;
-			const { id, token } = reduxStore.getState().login.user;
+			const { serversDB } = database.databases;
+			const { FileUpload_MaxFileSize, id: Site_Url } = serversDB.objectForPrimaryKey('servers', server);
+			const { id, token } = user;
 
 			// -1 maxFileSize means there is no limit
 			if (FileUpload_MaxFileSize > -1 && fileInfo.size > FileUpload_MaxFileSize) {

app/lib/methods/sendMessage.js

@@ -1,12 +1,12 @@
 import messagesStatus from '../../constants/messagesStatus';
 import buildMessage from './helpers/buildMessage';
 import database from '../realm';
-import reduxStore from '../createStore';
 import log from '../../utils/log';
 import random from '../../utils/random';
 
-export const getMessage = (rid, msg = '', tmid) => {
+export const getMessage = (rid, msg = '', tmid, user) => {
 	const _id = random(17);
+	const { id, username } = user;
 	const message = {
 		_id,
 		rid,
@@ -16,8 +16,8 @@ export const getMessage = (rid, msg = '', tmid) => {
 		_updatedAt: new Date(),
 		status: messagesStatus.TEMP,
 		u: {
-			_id: reduxStore.getState().login.user.id || '1',
-			username: reduxStore.getState().login.user.username
+			_id: id || '1',
+			username
 		}
 	};
 	try {
@@ -43,9 +43,9 @@ export async function sendMessageCall(message) {
 	return data;
 }
 
-export default async function(rid, msg, tmid) {
+export default async function(rid, msg, tmid, user) {
 	try {
-		const message = getMessage(rid, msg, tmid);
+		const message = getMessage(rid, msg, tmid, user);
 		const [room] = database.objects('subscriptions').filtered('rid == $0', rid);
 
 		if (room) {

app/lib/realm.js

@@ -26,6 +26,9 @@ const serversSchema = {
 		id: 'string',
 		name: { type: 'string', optional: true },
 		iconURL: { type: 'string', optional: true },
+		useRealName: { type: 'bool', optional: true },
+		FileUpload_MediaTypeWhiteList: { type: 'string', optional: true },
+		FileUpload_MaxFileSize: { type: 'int', optional: true },
 		roomsUpdatedAt: { type: 'date', optional: true },
 		version: 'string?'
 	}
@@ -414,7 +417,7 @@ class DB {
 				userSchema,
 				serversSchema
 			],
-			schemaVersion: 9,
+			schemaVersion: 10,
 			migration: (oldRealm, newRealm) => {
 				if (oldRealm.schemaVersion >= 1 && newRealm.schemaVersion <= 9) {
 					const newServers = newRealm.objects('servers');

app/lib/rocketchat.js

@@ -14,6 +14,9 @@ import {
 	setUser, setLoginServices, loginRequest, loginFailure, logout
 } from '../actions/login';
 import { disconnect, connectSuccess, connectRequest } from '../actions/connect';
+import {
+	shareSelectServer, shareSetUser
+} from '../actions/share';
 
 import subscribeRooms from './methods/subscriptions/rooms';
 import subscribeRoom from './methods/subscriptions/room';
@@ -217,6 +220,35 @@ const RocketChat = {
 		});
 	},
 
+	async shareExtensionInit(server) {
+		database.setActiveDB(server);
+
+		if (this.sdk) {
+			this.sdk.disconnect();
+			this.sdk = null;
+		}
+
+		// Use useSsl: false only if server url starts with http://
+		const useSsl = !/http:\/\//.test(server);
+
+		this.sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl });
+
+		// set Server
+		const { serversDB } = database.databases;
+		reduxStore.dispatch(shareSelectServer(server));
+
+		// set User info
+		const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ server }`);
+		const user = userId && serversDB.objectForPrimaryKey('user', userId);
+		reduxStore.dispatch(shareSetUser({
+			id: user.id,
+			token: user.token,
+			username: user.username
+		}));
+
+		await RocketChat.login({ resume: user.token });
+	},
+
 	register(credentials) {
 		// RC 0.50.0
 		return this.sdk.post('users.register', credentials, false);

app/presentation/DirectoryItem/index.js

@@ -35,7 +35,7 @@ const DirectoryItem = ({
 					<RoomTypeIcon type={type} />
 					<Text style={styles.directoryItemName} numberOfLines={1}>{title}</Text>
 				</View>
-				<Text style={styles.directoryItemUsername} numberOfLines={1}>{description}</Text>
+				{ description ? <Text style={styles.directoryItemUsername} numberOfLines={1}>{description}</Text> : null }
 			</View>
 			<DirectoryItemLabel text={rightLabel} />
 		</View>

app/presentation/ServerItem/styles.js

@@ -16,8 +16,8 @@ export default StyleSheet.create({
 		alignItems: 'center'
 	},
 	serverIcon: {
-		width: 38,
-		height: 38,
+		width: 44,
+		height: 44,
 		marginHorizontal: 15,
 		borderRadius: 4
 	},

app/reducers/index.js

@@ -11,6 +11,7 @@ import app from './app';
 import sortPreferences from './sortPreferences';
 import notification from './notification';
 import markdown from './markdown';
+import share from './share';
 
 export default combineReducers({
 	settings,
@@ -24,5 +25,6 @@ export default combineReducers({
 	rooms,
 	sortPreferences,
 	notification,
-	markdown
+	markdown,
+	share
 });