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

Merge pull request #1734 from dpalou/MOBILE-2844 

Mobile 2844
main
Juan Leyva 2019-01-28 11:32:46 +01:00 committed by GitHub
parent cb7e12e355 bf786ba596
commit f94719dac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/login/providers/helper.ts
View File

@ -179,10 +179,10 @@ export class CoreLoginHelperProvider {
} else { } else {
this.goToSiteInitialPage(); this.goToSiteInitialPage();
} }
}).catch((errorMessage) => { }).catch((error) => {
if (errorMessage) { if (error) {
// An error occurred, display the error and logout the user. // An error occurred, display the error and logout the user.
this.domUtils.showErrorModal(errorMessage); this.treatUserTokenError(siteData.siteUrl, error);
this.sitesProvider.logout(); this.sitesProvider.logout();
} }
}).finally(() => { }).finally(() => {
@ -647,8 +647,8 @@ export class CoreLoginHelperProvider {
loginUrl += '&oauthsso=' + params.id; loginUrl += '&oauthsso=' + params.id;
if (this.appProvider.isLinux()) { if (this.appProvider.isLinux() || this.appProvider.isMac()) {
// In Linux desktop apps, always use embedded browser. // In Linux and Mac desktop apps, always use embedded browser.
this.utils.openInApp(loginUrl); this.utils.openInApp(loginUrl);
} else { } else {
// Always open it in browser because the user might have the session stored in there. // Always open it in browser because the user might have the session stored in there.

5
src/providers/utils/dom.ts
View File

@ -140,13 +140,12 @@ export class CoreDomUtilsProvider {
const readableSize = this.textUtils.bytesToSize(size.size, 2); const readableSize = this.textUtils.bytesToSize(size.size, 2);
return this.showConfirm(this.translate.instant('core.course.confirmpartialdownloadsize', { size: readableSize })); return this.showConfirm(this.translate.instant('core.course.confirmpartialdownloadsize', { size: readableSize }));
} else if (size.size >= wifiThreshold || (this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) { } else if (alwaysConfirm || size.size >= wifiThreshold ||
(this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) {
message = message || 'core.course.confirmdownload'; message = message || 'core.course.confirmdownload';
const readableSize = this.textUtils.bytesToSize(size.size, 2); const readableSize = this.textUtils.bytesToSize(size.size, 2);
return this.showConfirm(this.translate.instant(message, { size: readableSize })); return this.showConfirm(this.translate.instant(message, { size: readableSize }));
} else if (alwaysConfirm) {
return this.showConfirm(this.translate.instant('core.areyousure'));
} }
return Promise.resolve(); return Promise.resolve();