Skip to content

Commit

Permalink
Merge pull request #4143 from dpalou/MOBILE-4602
Browse files Browse the repository at this point in the history
Mobile 4602
  • Loading branch information
crazyserver authored Aug 13, 2024
2 parents 5a8911e + 52d37c3 commit 79ba031
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
10 changes: 2 additions & 8 deletions src/core/initializers/prepare-inapp-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { CoreSiteError } from '@classes/errors/siteerror';
import { CoreLoginHelper } from '@features/login/services/login-helper';
import { CoreUserAuthenticatedSupportConfig } from '@features/user/classes/support/authenticated-support-config';
import { CoreUserNullSupportConfig } from '@features/user/classes/support/null-support-config';
import { CorePlatform } from '@services/platform';
import { CoreSites } from '@services/sites';
import { CoreCustomURLSchemes } from '@services/urlschemes';
import { CoreDomUtils } from '@services/utils/dom';
Expand Down Expand Up @@ -62,11 +61,6 @@ export default function(): void {
return;
}

if (!CorePlatform.isAndroid()) {
return;
}

// Check if the URL has a custom URL scheme. In Android they need to be opened manually.
if (!isExternalApp) {
lastInAppUrl = protocol ? `${protocol}://${url}` : url;

Expand All @@ -76,8 +70,8 @@ export default function(): void {
// Open in browser should launch the right app if found and do nothing if not found.
CoreUtils.openInBrowser(url, { showBrowserWarning: false });

// At this point the InAppBrowser is showing a "Webpage not available" error message.
// Try to navigate to last loaded URL so this error message isn't found.
// At this point, URL schemes will stop working in IAB, and in Android the IAB is showing a "Webpage not available" error.
// Re-loading the page inside the existing IAB doesn't fix it, we need to re-load the whole IAB.
if (lastInAppUrl) {
CoreUtils.openInApp(lastInAppUrl);
} else {
Expand Down
2 changes: 0 additions & 2 deletions src/core/services/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,6 @@ export class CoreUtilsProvider {

this.setInAppBrowserToolbarColors(options);

this.iabInstance?.close(); // Close window if there is one already open, only allow one.

this.iabInstance = InAppBrowser.create(url, '_blank', options);

if (CorePlatform.isMobile()) {
Expand Down

0 comments on commit 79ba031

Please sign in to comment.