EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4143 from dpalou/MOBILE-4602 

Mobile 4602
main
Pau Ferrer Ocaña 2024-08-13 09:41:31 +02:00 committed by GitHub
parent 5a8911e8ae 52d37c3940
commit 79ba03144c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/initializers/prepare-inapp-browser.ts
View File

@ -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';
@ -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;
@ -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 {

2
src/core/services/utils/utils.ts
View File

@ -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()) {