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

Merge pull request #3329 from dpalou/MOBILE-4097 

MOBILE-4097 core: Don't convert to address URL if it's already a URL
main
Pau Ferrer Ocaña 2022-06-22 09:39:34 +02:00 committed by GitHub
parent 1044561ff7 fcf82349cf
commit 0df9f3651b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/services/tests/utils/text.test.ts
View File

@ -76,6 +76,16 @@ describe('CoreTextUtilsProvider', () => {
expect(CoreApp.isAndroid).toHaveBeenCalled(); expect(CoreApp.isAndroid).toHaveBeenCalled();
}); });
it('doesn\'t build address if it\'s already a URL', () => {
const address = 'https://moodle.org';
const url = textUtils.buildAddressURL(address);
expect(url).toEqual(address);
expect(DomSanitizer.bypassSecurityTrustUrl).toHaveBeenCalled();
});
it('matches glob patterns', () => { it('matches glob patterns', () => {
expect(textUtils.matchesGlob('/foo/bar', '/foo/bar')).toBe(true); expect(textUtils.matchesGlob('/foo/bar', '/foo/bar')).toBe(true);
expect(textUtils.matchesGlob('/foo/bar', '/foo/bar/')).toBe(false); expect(textUtils.matchesGlob('/foo/bar', '/foo/bar/')).toBe(false);

7
src/core/services/utils/text.ts
View File

@ -25,6 +25,7 @@ import { CoreViewerTextComponent } from '@features/viewer/components/text/text';
import { CoreFileHelper } from '@services/file-helper'; import { CoreFileHelper } from '@services/file-helper';
import { CoreDomUtils } from './dom'; import { CoreDomUtils } from './dom';
import { CoreText } from '@singletons/text'; import { CoreText } from '@singletons/text';
import { CoreUrl } from '@singletons/url';
/** /**
* Different type of errors the app can treat. * Different type of errors the app can treat.
@ -155,6 +156,12 @@ export class CoreTextUtilsProvider {
* @return URL to view the address. * @return URL to view the address.
*/ */
buildAddressURL(address: string): SafeUrl { buildAddressURL(address: string): SafeUrl {
const parsedUrl = CoreUrl.parse(address);
if (parsedUrl?.protocol) {
// It's already a URL, don't convert it.
return DomSanitizer.bypassSecurityTrustUrl(address);
}
return DomSanitizer.bypassSecurityTrustUrl((CoreApp.isAndroid() ? 'geo:0,0?q=' : 'http://maps.google.com?q=') + return DomSanitizer.bypassSecurityTrustUrl((CoreApp.isAndroid() ? 'geo:0,0?q=' : 'http://maps.google.com?q=') +
encodeURIComponent(address)); encodeURIComponent(address));
} }