diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts index 08b69cf66..2c932a59a 100644 --- a/src/addon/mod/quiz/providers/prefetch-handler.ts +++ b/src/addon/mod/quiz/providers/prefetch-handler.ts @@ -154,6 +154,11 @@ export class AddonModQuizPrefetchHandler extends CoreCourseModulePrefetchHandler * @return {boolean|Promise} Whether the module can be downloaded. The promise should never be rejected. */ isDownloadable(module: any, courseId: number): boolean | Promise { + if (this.sitesProvider.getCurrentSite().isOfflineDisabled()) { + // Don't allow downloading the quiz if offline is disabled to prevent wasting a lot of data when opening it. + return false; + } + const siteId = this.sitesProvider.getCurrentSiteId(); return this.quizProvider.getQuiz(courseId, module.id, false, siteId).then((quiz) => { diff --git a/src/addon/mod/quiz/providers/quiz.ts b/src/addon/mod/quiz/providers/quiz.ts index 859510c25..95161dc5e 100644 --- a/src/addon/mod/quiz/providers/quiz.ts +++ b/src/addon/mod/quiz/providers/quiz.ts @@ -1492,7 +1492,8 @@ export class AddonModQuizProvider { * @return {boolean} Whether offline is enabled. */ isQuizOffline(quiz: any): boolean { - return !!quiz.allowofflineattempts; + // Don't allow downloading the quiz if offline is disabled to prevent wasting a lot of data when opening it. + return !!quiz.allowofflineattempts && !this.sitesProvider.getCurrentSite().isOfflineDisabled(); } /** diff --git a/src/addon/remotethemes/remotethemes.module.ts b/src/addon/remotethemes/remotethemes.module.ts index 3f9d8e8b0..8b7b179ba 100644 --- a/src/addon/remotethemes/remotethemes.module.ts +++ b/src/addon/remotethemes/remotethemes.module.ts @@ -16,6 +16,7 @@ import { NgModule } from '@angular/core'; import { AddonRemoteThemesProvider } from './providers/remotethemes'; import { CoreEventsProvider } from '@providers/events'; import { CoreInitDelegate } from '@providers/init'; +import { CoreLoggerProvider } from '@providers/logger'; import { CoreSitesProvider } from '@providers/sites'; @NgModule({ @@ -29,7 +30,9 @@ import { CoreSitesProvider } from '@providers/sites'; }) export class AddonRemoteThemesModule { constructor(initDelegate: CoreInitDelegate, remoteThemesProvider: AddonRemoteThemesProvider, eventsProvider: CoreEventsProvider, - sitesProvider: CoreSitesProvider) { + sitesProvider: CoreSitesProvider, loggerProvider: CoreLoggerProvider) { + + const logger = loggerProvider.getInstance('AddonRemoteThemesModule'); // Preload the current site styles. initDelegate.registerProcess({ @@ -53,7 +56,9 @@ export class AddonRemoteThemesModule { eventsProvider.on(CoreEventsProvider.SITE_ADDED, (data) => { addingSite = data.siteId; - remoteThemesProvider.addSite(data.siteId).finally(() => { + remoteThemesProvider.addSite(data.siteId).catch((error) => { + logger.error('Error adding site', error); + }).then(() => { if (addingSite == data.siteId) { addingSite = false; } @@ -68,7 +73,9 @@ export class AddonRemoteThemesModule { // Update styles when current site is updated. eventsProvider.on(CoreEventsProvider.SITE_UPDATED, (data) => { if (data.siteId === sitesProvider.getCurrentSiteId()) { - remoteThemesProvider.load(data.siteId); + remoteThemesProvider.load(data.siteId).catch((error) => { + logger.error('Error loading site after site update', error); + }); } }); diff --git a/src/classes/site.ts b/src/classes/site.ts index 90124a1e8..549e4dcb9 100644 --- a/src/classes/site.ts +++ b/src/classes/site.ts @@ -203,6 +203,7 @@ export class CoreSite { protected db: SQLiteDB; protected cleanUnicode = false; protected lastAutoLogin = 0; + protected offlineDisabled = false; /** * Create a site. @@ -234,6 +235,7 @@ export class CoreSite { this.wsProvider = injector.get(CoreWSProvider); this.logger = logger.getInstance('CoreWSProvider'); + this.calculateOfflineDisabled(); if (this.id) { this.initDB(); @@ -376,6 +378,7 @@ export class CoreSite { setConfig(config: any): void { config.tool_mobile_disabledfeatures = this.textUtils.treatDisabledFeatures(config.tool_mobile_disabledfeatures); this.config = config; + this.calculateOfflineDisabled(); } /** @@ -530,6 +533,10 @@ export class CoreSite { const initialToken = this.token; data = data || {}; + if (!this.appProvider.isOnline() && this.offlineDisabled) { + return Promise.reject(this.wsProvider.createFakeWSError('core.errorofflinedisabled', true)); + } + // Check if the method is available, use a prefixed version if possible. // We ignore this check when we do not have the site info, as the list of functions is not loaded yet. if (this.getInfo() && !this.wsAvailable(method, false)) { @@ -560,6 +567,13 @@ export class CoreSite { wsPreSets.cleanUnicode = false; } + if (this.offlineDisabled) { + // Offline is disabled, don't use cache. + preSets.getFromCache = false; + preSets.saveToCache = false; + preSets.emergencyCache = false; + } + // Enable text filtering by default. data.moodlewssettingfilter = preSets.filter === false ? false : true; data.moodlewssettingfileurl = preSets.rewriteurls === false ? false : true; @@ -1351,6 +1365,22 @@ export class CoreSite { return !!disabledFeatures.match(regEx); } + /** + * Calculate if offline is disabled in the site. + */ + calculateOfflineDisabled(): void { + this.offlineDisabled = this.isFeatureDisabled('NoDelegate_CoreOffline'); + } + + /** + * Get whether offline is disabled in the site. + * + * @return {boolean} Whether it's disabled. + */ + isOfflineDisabled(): boolean { + return this.offlineDisabled; + } + /** * Check if the site version is greater than one or several versions. * This function accepts a string or an array of strings. If array, the last version must be the highest. diff --git a/src/core/course/pages/section/section.html b/src/core/course/pages/section/section.html index 16a95b37b..496249479 100644 --- a/src/core/course/pages/section/section.html +++ b/src/core/course/pages/section/section.html @@ -13,7 +13,7 @@ - + diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts index 27f983028..d5fcd1ad9 100644 --- a/src/core/course/pages/section/section.ts +++ b/src/core/course/pages/section/section.ts @@ -52,6 +52,7 @@ export class CoreCourseSectionPage implements OnDestroy { prefetchCourseIcon: 'spinner', title: 'core.course.downloadcourse' }; + downloadCourseEnabled: boolean; moduleId: number; displayEnableDownload: boolean; displayRefresher: boolean; @@ -75,6 +76,7 @@ export class CoreCourseSectionPage implements OnDestroy { // Get the title to display. We dont't have sections yet. this.title = courseFormatDelegate.getCourseTitle(this.course); this.displayEnableDownload = courseFormatDelegate.displayEnableDownload(this.course); + this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite(); this.completionObserver = eventsProvider.on(CoreEventsProvider.COMPLETION_MODULE_VIEWED, (data) => { if (data && data.courseId == this.course.id) { @@ -82,12 +84,14 @@ export class CoreCourseSectionPage implements OnDestroy { } }); - // Listen for changes in course status. - this.courseStatusObserver = eventsProvider.on(CoreEventsProvider.COURSE_STATUS_CHANGED, (data) => { - if (data.courseId == this.course.id) { - this.updateCourseStatus(data.status); - } - }, sitesProvider.getCurrentSiteId()); + if (this.downloadCourseEnabled) { + // Listen for changes in course status. + this.courseStatusObserver = eventsProvider.on(CoreEventsProvider.COURSE_STATUS_CHANGED, (data) => { + if (data.courseId == this.course.id) { + this.updateCourseStatus(data.status); + } + }, sitesProvider.getCurrentSiteId()); + } } /** @@ -103,6 +107,11 @@ export class CoreCourseSectionPage implements OnDestroy { this.loadData().finally(() => { this.dataLoaded = true; + if (!this.downloadCourseEnabled) { + // Cannot download the whole course, stop. + return; + } + // Determine the course prefetch status. this.determineCoursePrefetchIcon().then(() => { if (this.prefetchCourseData.prefetchCourseIcon == 'spinner') { diff --git a/src/core/courses/components/course-progress/course-progress.html b/src/core/courses/components/course-progress/course-progress.html index 2560cc0a8..73002477a 100644 --- a/src/core/courses/components/course-progress/course-progress.html +++ b/src/core/courses/components/course-progress/course-progress.html @@ -2,7 +2,7 @@

-