[FIX] Share Extension issues

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/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,9 @@ import sharedStyles from '../views/Styles';
 
 const styles = StyleSheet.create({
 	container: {
-		backgroundColor: isIOS ? '#F7F8FA' : '#54585E'
+		backgroundColor: isIOS ? '#F7F8FA' : '#54585E',
+		flexDirection: 'row',
+		alignItems: 'center'
 	},
 	searchBox: {
 		alignItems: 'center',
@@ -21,7 +26,8 @@ const styles = StyleSheet.create({
 		height: 36,
 		margin: 16,
 		marginVertical: 10,
-		paddingHorizontal: 10
+		paddingHorizontal: 10,
+		flex: 1
 	},
 	input: {
 		color: '#8E8E93',
@@ -31,10 +37,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 +72,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/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/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');
@@ -424,6 +427,16 @@ class DB {
 						newServers[i].roomsUpdatedAt = null;
 					}
 				}
+				if (oldRealm.schemaVersion === 9 && newRealm.schemaVersion === 10) {
+					const newServers = newRealm.objects('servers');
+
+					// eslint-disable-next-line no-plusplus
+					for (let i = 0; i < newServers.length; i++) {
+						newServers[i].useRealName = null;
+						newServers[i].FileUpload_MediaTypeWhiteList = null;
+						newServers[i].FileUpload_MaxFileSize = null;
+					}
+				}
 			}
 		}),
 		inMemoryDB: new Realm({

app/lib/rocketchat.js

@@ -10,10 +10,12 @@ import database from './realm';
 import log from '../utils/log';
 import { isIOS, getBundleId } from '../utils/deviceInfo';
 
+import { addSettings } from '../actions';
 import {
 	setUser, setLoginServices, loginRequest, loginFailure, logout
 } from '../actions/login';
 import { disconnect, connectSuccess, connectRequest } from '../actions/connect';
+import { selectServerSuccess } from '../actions/server';
 
 import subscribeRooms from './methods/subscriptions/rooms';
 import subscribeRoom from './methods/subscriptions/room';
@@ -217,6 +219,38 @@ const RocketChat = {
 		});
 	},
 
+	async shareExtensionInit(currentServer) {
+		database.setActiveDB(currentServer);
+
+		if (this.sdk) {
+			this.sdk.disconnect();
+			this.sdk = null;
+		}
+
+		// Use useSsl: false only if server url starts with http://
+		const useSsl = !/http:\/\//.test(currentServer);
+
+		this.sdk = new RocketchatClient({ host: currentServer, protocol: 'ddp', useSsl });
+
+		// set Server
+		const { serversDB } = database.databases;
+		const server = serversDB.objectForPrimaryKey('servers', currentServer);
+		reduxStore.dispatch(selectServerSuccess(currentServer, server.version));
+
+		// set File configs
+		reduxStore.dispatch(addSettings({
+			Site_Url: server.id,
+			useRealName: server.useRealName,
+			FileUpload_MediaTypeWhiteList: server.FileUpload_MediaTypeWhiteList,
+			FileUpload_MaxFileSize: server.FileUpload_MaxFileSize
+		}));
+
+		// set User info
+		const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ currentServer }`);
+		const user = userId && serversDB.objectForPrimaryKey('user', userId);
+		reduxStore.dispatch(setUser(user));
+	},
+
 	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/share.js

@@ -2,31 +2,34 @@ import React from 'react';
 import { View } from 'react-native';
 import { createAppContainer, createStackNavigator, createSwitchNavigator } from 'react-navigation';
 import { Provider } from 'react-redux';
+import RNUserDefaults from 'rn-user-defaults';
 
 import Navigation from './lib/Navigation';
 import store from './lib/createStore';
-import { appInit } from './actions';
-import ShareListView from './views/ShareListView';
-import ShareView from './views/ShareView';
-import SelectServerView from './views/SelectServerView';
-import AuthLoadingView from './views/AuthLoadingView';
-import WithoutServersView from './views/WithoutServersView';
 import sharedStyles from './views/Styles';
-import { isNotch } from './utils/deviceInfo';
+import { isNotch, isIOS } from './utils/deviceInfo';
 import { defaultHeader, onNavigationStateChange } from './utils/navigation';
-
+import RocketChat from './lib/rocketchat';
 
 const InsideNavigator = createStackNavigator({
-	ShareListView,
-	ShareView,
-	SelectServerView
+	ShareListView: {
+		getScreen: () => require('./views/ShareListView').default
+	},
+	ShareView: {
+		getScreen: () => require('./views/ShareView').default
+	},
+	SelectServerView: {
+		getScreen: () => require('./views/SelectServerView').default
+	}
 }, {
 	initialRouteName: 'ShareListView',
 	defaultNavigationOptions: defaultHeader
 });
 
 const OutsideNavigator = createStackNavigator({
-	WithoutServersView
+	WithoutServersView: {
+		getScreen: () => require('./views/WithoutServersView').default
+	}
 }, {
 	initialRouteName: 'WithoutServersView',
 	defaultNavigationOptions: defaultHeader
@@ -35,7 +38,9 @@ const OutsideNavigator = createStackNavigator({
 const AppContainer = createAppContainer(createSwitchNavigator({
 	OutsideStack: OutsideNavigator,
 	InsideStack: InsideNavigator,
-	AuthLoading: AuthLoadingView
+	AuthLoading: {
+		getScreen: () => require('./views/AuthLoadingView').default
+	}
 },
 {
 	initialRouteName: 'AuthLoading'
@@ -44,10 +49,24 @@ const AppContainer = createAppContainer(createSwitchNavigator({
 class Root extends React.Component {
 	constructor(props) {
 		super(props);
-		store.dispatch(appInit());
 		this.state = {
 			isLandscape: false
 		};
+		this.init();
+	}
+
+	init = async() => {
+		if (isIOS) {
+			await RNUserDefaults.setName('group.ios.chat.rocket');
+		}
+		const currentServer = await RNUserDefaults.get('currentServer');
+
+		if (currentServer) {
+			await RocketChat.shareExtensionInit(currentServer);
+			await Navigation.navigate('InsideStack');
+		} else {
+			await Navigation.navigate('OutsideStack');
+		}
 	}
 
 	handleLayout = (event) => {

app/views/SelectServerView.js

@@ -9,14 +9,11 @@ import { SafeAreaView } from 'react-navigation';
 import I18n from '../i18n';
 import database from '../lib/realm';
 import StatusBar from '../containers/StatusBar';
-import { selectServerRequest as selectServerRequestAction } from '../actions/server';
-
-import {
-	COLOR_BACKGROUND_CONTAINER
-} from '../constants/colors';
+import { COLOR_BACKGROUND_CONTAINER } from '../constants/colors';
 import Navigation from '../lib/Navigation';
 import ServerItem, { ROW_HEIGHT } from '../presentation/ServerItem';
 import sharedStyles from './Styles';
+import RocketChat from '../lib/rocketchat';
 
 const getItemLayout = (data, index) => ({ length: ROW_HEIGHT, offset: ROW_HEIGHT * index, index });
 const keyExtractor = item => item.id;
@@ -38,17 +35,14 @@ const styles = StyleSheet.create({
 
 @connect(state => ({
 	server: state.server.server
-}), dispatch => ({
-	selectServerRequest: server => dispatch(selectServerRequestAction(server))
 }))
 export default class SelectServerView extends React.Component {
 	static navigationOptions = () => ({
 		title: I18n.t('Select_Server')
 	})
 
 	static propTypes = {
-		server: PropTypes.string,
-		selectServerRequest: PropTypes.func
+		server: PropTypes.string
 	}
 
 	constructor(props) {
@@ -61,13 +55,13 @@ export default class SelectServerView extends React.Component {
 		};
 	}
 
-	select = (server) => {
+	select = async(server) => {
 		const {
-			server: currentServer, selectServerRequest
+			server: currentServer
 		} = this.props;
 
 		if (currentServer !== server) {
-			selectServerRequest(server);
+			await RocketChat.shareExtensionInit(server);
 		}
 		Navigation.navigate('ShareListView');
 	}

app/views/ShareListView/SearchBar.js

@@ -0,0 +1,48 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Keyboard, LayoutAnimation } from 'react-native';
+
+import SearchBox from '../../containers/SearchBox';
+import { isIOS } from '../../utils/deviceInfo';
+
+const SearchBar = React.memo(({ onChangeSearchText }) => {
+	const [text, setText] = useState('');
+	const [hasCancel, setHasCancel] = useState(false);
+
+	const onChangeText = (searchText) => {
+		onChangeSearchText(searchText);
+		setText(searchText);
+	};
+
+	const onCancelPress = () => {
+		Keyboard.dismiss();
+		onChangeText('');
+		setHasCancel(false);
+	};
+
+	const onFocus = () => {
+		setHasCancel(true);
+		LayoutAnimation.easeInEaseOut();
+	};
+
+	if (isIOS) {
+		return (
+			<SearchBox
+				value={text}
+				hasCancel={hasCancel}
+				onFocus={onFocus}
+				onCancelPress={onCancelPress}
+				onChangeText={onChangeText}
+				testID='rooms-list-view-search'
+				key='rooms-list-view-search'
+			/>
+		);
+	}
+	return null;
+});
+
+SearchBar.propTypes = {
+	onChangeSearchText: PropTypes.func
+};
+
+export default SearchBar;