Skip to content

[IMPROVE] Make system default the default browser #3265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 4 commits into from
Jul 12, 2021
Merged

[IMPROVE] Make system default the default browser #3265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
305eb50
[FIX] use systemdefault: as the default browser, not inApp
reinaldonetof Jul 9, 2021
a2a6201
Merge branch 'develop' into fix.default-option-to-open-link
diegolmello Jul 9, 2021
76a8bf3
Fix
diegolmello Jul 12, 2021
6012d43
Merge branch 'develop' into fix.default-option-to-open-link
diegolmello Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/utils/openLink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions app/views/DefaultBrowserView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class DefaultBrowserView extends React.Component {

isSelected = (value) => {
const { browser } = this.state;
if (!browser && value === 'inApp') {
if (!browser && value === 'systemDefault:') {
return true;
}
return browser === value;
Expand All @@ -92,7 +92,7 @@ class DefaultBrowserView extends React.Component {
changeDefaultBrowser = async(newBrowser) => {
logEvent(events.DB_CHANGE_DEFAULT_BROWSER, { browser: newBrowser });
try {
const browser = newBrowser !== 'inApp' ? newBrowser : null;
const browser = newBrowser !== 'systemDefault:' ? newBrowser : null;
await UserPreferences.setStringAsync(DEFAULT_BROWSER_KEY, browser);
this.setState({ browser });
} catch {
Expand Down