Fix

RocketChat · Jul 12, 2021 · 76a8bf3 · 76a8bf3
1 parent a2a6201
commit 76a8bf3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/utils/openLink.js b/app/utils/openLink.js
@@ -39,16 +39,16 @@ const openLink = async(url, theme = 'light') => {
 	try {
 		const browser = await UserPreferences.getStringAsync(DEFAULT_BROWSER_KEY);
 
-		if (browser) {
-			const schemeUrl = appSchemeURL(url, browser.replace(':', ''));
-			await Linking.openURL(schemeUrl);
-		} else {
+		if (browser === 'inApp') {
 			await WebBrowser.openBrowserAsync(url, {
 				toolbarColor: themes[theme].headerBackground,
 				controlsColor: themes[theme].headerTintColor,
 				collapseToolbar: true,
 				showTitle: true
 			});
+		} else {
+			const schemeUrl = appSchemeURL(url, browser.replace(':', ''));
+			await Linking.openURL(schemeUrl);
 		}
 	} catch {
 		try {

diff --git a/app/views/DefaultBrowserView.js b/app/views/DefaultBrowserView.js
@@ -62,7 +62,7 @@ class DefaultBrowserView extends React.Component {
 	async componentDidMount() {
 		this.mounted = true;
 		const browser = await UserPreferences.getStringAsync(DEFAULT_BROWSER_KEY);
-		this.setState({ browser: browser || 'systemDefault:' });
+		this.setState({ browser });
 	}
 
 	init = () => {
@@ -83,12 +83,16 @@ class DefaultBrowserView extends React.Component {
 
 	isSelected = (value) => {
 		const { browser } = this.state;
+		if (!browser && value === 'systemDefault:') {
+			return true;
+		}
 		return browser === value;
 	}
 
-	changeDefaultBrowser = async(browser) => {
-		logEvent(events.DB_CHANGE_DEFAULT_BROWSER, { browser });
+	changeDefaultBrowser = async(newBrowser) => {
+		logEvent(events.DB_CHANGE_DEFAULT_BROWSER, { browser: newBrowser });
 		try {
+			const browser = newBrowser !== 'systemDefault:' ? newBrowser : null;
 			await UserPreferences.setStringAsync(DEFAULT_BROWSER_KEY, browser);
 			this.setState({ browser });
 		} catch {