From c5d18dffdce1f504e37c9d3da612daa16d8174a0 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 11 Jun 2021 08:56:11 +0200 Subject: [PATCH] MOBILE-3320 course: Fix some prefetchs never ending --- .../mod/assign/services/handlers/prefetch.ts | 13 ++++------ .../mod/chat/services/handlers/prefetch.ts | 8 +++---- .../mod/choice/services/handlers/prefetch.ts | 8 +++---- .../mod/data/services/handlers/prefetch.ts | 8 +++---- .../feedback/services/handlers/prefetch.ts | 8 +++---- .../mod/forum/services/handlers/prefetch.ts | 10 ++------ .../glossary/services/handlers/prefetch.ts | 4 +--- .../h5pactivity/services/handlers/prefetch.ts | 6 ++--- .../mod/lesson/services/handlers/prefetch.ts | 24 ++++++++----------- .../mod/quiz/services/handlers/prefetch.ts | 10 ++++---- .../mod/scorm/services/handlers/prefetch.ts | 14 ++++------- .../mod/survey/services/handlers/prefetch.ts | 2 +- .../mod/wiki/services/handlers/prefetch.ts | 9 +++++-- .../workshop/services/handlers/prefetch.ts | 5 +--- .../classes/activity-prefetch-handler.ts | 10 ++++---- .../classes/resource-prefetch-handler.ts | 8 +------ .../services/module-prefetch-delegate.ts | 4 ++-- .../handlers/module-prefetch-handler.ts | 7 ++---- 18 files changed, 61 insertions(+), 97 deletions(-) diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts index ab3d2ff95..f924bb67b 100644 --- a/src/addons/mod/assign/services/handlers/prefetch.ts +++ b/src/addons/mod/assign/services/handlers/prefetch.ts @@ -211,13 +211,9 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref } /** - * Prefetch a module. - * - * @param module Module. - * @param courseId Course ID the module belongs to. - * @return Promise resolved when done. + * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchAssign.bind(this, module, courseId)); } @@ -226,12 +222,11 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref * * @param module Module. * @param courseId Course ID the module belongs to. + * @param siteId Site ID. * @return Promise resolved when done. */ - protected async prefetchAssign(module: CoreCourseAnyModuleData, courseId?: number): Promise { + protected async prefetchAssign(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { const userId = CoreSites.getCurrentSiteUserId(); - courseId = courseId || module.course || CoreSites.getCurrentSiteHomeId(); - const siteId = CoreSites.getCurrentSiteId(); const options: CoreSitesCommonWSOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, diff --git a/src/addons/mod/chat/services/handlers/prefetch.ts b/src/addons/mod/chat/services/handlers/prefetch.ts index d321a03a3..335d3a1b5 100644 --- a/src/addons/mod/chat/services/handlers/prefetch.ts +++ b/src/addons/mod/chat/services/handlers/prefetch.ts @@ -17,7 +17,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/ import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreUser } from '@features/user/services/user'; import { CoreGroups } from '@services/groups'; -import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; +import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { makeSingleton } from '@singletons'; import { AddonModChat, AddonModChatProvider, AddonModChatSession } from '../chat'; @@ -64,7 +64,7 @@ export class AddonModChatPrefetchHandlerService extends CoreCourseActivityPrefet /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchChat.bind(this, module, courseId)); } @@ -73,10 +73,10 @@ export class AddonModChatPrefetchHandlerService extends CoreCourseActivityPrefet * * @param module The module object returned by WS. * @param courseId Course ID the module belongs to. + * @param siteId Site ID. * @return Promise resolved when done. */ - protected async prefetchChat(module: CoreCourseAnyModuleData, courseId: number): Promise { - const siteId = CoreSites.getCurrentSiteId(); + protected async prefetchChat(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { const options = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, siteId, diff --git a/src/addons/mod/choice/services/handlers/prefetch.ts b/src/addons/mod/choice/services/handlers/prefetch.ts index 31721344d..0aa454612 100644 --- a/src/addons/mod/choice/services/handlers/prefetch.ts +++ b/src/addons/mod/choice/services/handlers/prefetch.ts @@ -17,7 +17,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/ import { CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreUser } from '@features/user/services/user'; import { CoreFilepool } from '@services/filepool'; -import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; +import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { CoreWSFile } from '@services/ws'; import { makeSingleton } from '@singletons'; @@ -38,7 +38,7 @@ export class AddonModChoicePrefetchHandlerService extends CoreCourseActivityPref /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise { return this.prefetchPackage(module, courseId, this.prefetchChoice.bind(this, module, courseId, !!single)); } @@ -55,10 +55,8 @@ export class AddonModChoicePrefetchHandlerService extends CoreCourseActivityPref module: CoreCourseAnyModuleData, courseId: number, single: boolean, - siteId?: string, + siteId: string, ): Promise { - siteId = siteId || CoreSites.getCurrentSiteId(); - const commonOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, siteId, diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts index f10453d61..92844d596 100644 --- a/src/addons/mod/data/services/handlers/prefetch.ts +++ b/src/addons/mod/data/services/handlers/prefetch.ts @@ -212,7 +212,7 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchDatabase.bind(this, module, courseId)); } @@ -221,12 +221,10 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet * * @param module Module. * @param courseId Course ID the module belongs to. + * @param siteId Site ID. * @return Promise resolved when done. */ - protected async prefetchDatabase(module: CoreCourseAnyModuleData, courseId?: number): Promise { - const siteId = CoreSites.getCurrentSiteId(); - courseId = courseId || module.course || CoreSites.getCurrentSiteHomeId(); - + protected async prefetchDatabase(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { const options = { cmId: module.id, readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, diff --git a/src/addons/mod/feedback/services/handlers/prefetch.ts b/src/addons/mod/feedback/services/handlers/prefetch.ts index b2ac5d3e9..97faa96ac 100644 --- a/src/addons/mod/feedback/services/handlers/prefetch.ts +++ b/src/addons/mod/feedback/services/handlers/prefetch.ts @@ -17,7 +17,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/ import { CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreFilepool } from '@services/filepool'; import { CoreGroups } from '@services/groups'; -import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; +import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreTimeUtils } from '@services/utils/time'; import { CoreUtils } from '@services/utils/utils'; import { CoreWSFile } from '@services/ws'; @@ -122,7 +122,7 @@ export class AddonModFeedbackPrefetchHandlerService extends CoreCourseActivityPr /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchFeedback.bind(this, module, courseId)); } @@ -131,10 +131,10 @@ export class AddonModFeedbackPrefetchHandlerService extends CoreCourseActivityPr * * @param module Module. * @param courseId Course ID the module belongs to. + * @param siteId Site ID. * @return Promise resolved when done. */ - protected async prefetchFeedback(module: CoreCourseAnyModuleData, courseId: number): Promise { - const siteId = CoreSites.getCurrentSiteId(); + protected async prefetchFeedback(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { const commonOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, siteId, diff --git a/src/addons/mod/forum/services/handlers/prefetch.ts b/src/addons/mod/forum/services/handlers/prefetch.ts index 3e09810e0..722fd004b 100644 --- a/src/addons/mod/forum/services/handlers/prefetch.ts +++ b/src/addons/mod/forum/services/handlers/prefetch.ts @@ -171,15 +171,9 @@ export class AddonModForumPrefetchHandlerService extends CoreCourseActivityPrefe } /** - * Prefetch a module. - * - * @param module Module. - * @param courseId Course ID the module belongs to. - * @param single True if we're downloading a single module, false if we're downloading a whole section. - * @param dirPath Path of the directory where to store all the content files. - * @return Promise resolved when done. + * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise { return this.prefetchPackage(module, courseId, this.prefetchForum.bind(this, module, courseId, single)); } diff --git a/src/addons/mod/glossary/services/handlers/prefetch.ts b/src/addons/mod/glossary/services/handlers/prefetch.ts index 0c722bdce..3c29641d3 100644 --- a/src/addons/mod/glossary/services/handlers/prefetch.ts +++ b/src/addons/mod/glossary/services/handlers/prefetch.ts @@ -97,7 +97,7 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchGlossary.bind(this, module, courseId)); } @@ -110,8 +110,6 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr * @return Promise resolved when done. */ protected async prefetchGlossary(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { - siteId = siteId || CoreSites.getCurrentSiteId(); - const options = { cmId: module.id, readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, diff --git a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts index 3d8375652..df1f199ef 100644 --- a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts +++ b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts @@ -76,7 +76,7 @@ export class AddonModH5PActivityPrefetchHandlerService extends CoreCourseActivit /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchActivity.bind(this, module, courseId)); } @@ -91,10 +91,8 @@ export class AddonModH5PActivityPrefetchHandlerService extends CoreCourseActivit protected async prefetchActivity( module: CoreCourseAnyModuleData, courseId: number, - siteId?: string, + siteId: string, ): Promise { - siteId = siteId || CoreSites.getCurrentSiteId(); - const h5pActivity = await AddonModH5PActivity.getH5PActivity(courseId, module.id, { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, siteId, diff --git a/src/addons/mod/lesson/services/handlers/prefetch.ts b/src/addons/mod/lesson/services/handlers/prefetch.ts index f99e844d8..8369dee99 100644 --- a/src/addons/mod/lesson/services/handlers/prefetch.ts +++ b/src/addons/mod/lesson/services/handlers/prefetch.ts @@ -231,17 +231,10 @@ export class AddonModLessonPrefetchHandlerService extends CoreCourseActivityPref } /** - * Prefetch a module. - * - * @param module Module. - * @param courseId Course ID the module belongs to. - * @param single True if we're downloading a single module, false if we're downloading a whole section. - * @param dirPath Path of the directory where to store all the content files. - * @return Promise resolved when done. + * @inheritdoc */ - // eslint-disable-next-line @typescript-eslint/no-unused-vars - prefetch(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean, dirPath?: string): Promise { - return this.prefetchPackage(module, courseId, this.prefetchLesson.bind(this, module, courseId, single)); + prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise { + return this.prefetchPackage(module, courseId, this.prefetchLesson.bind(this, module, courseId, !!single)); } /** @@ -250,12 +243,15 @@ export class AddonModLessonPrefetchHandlerService extends CoreCourseActivityPref * @param module Module. * @param courseId Course ID the module belongs to. * @param single True if we're downloading a single module, false if we're downloading a whole section. + * @param siteId Site ID. * @return Promise resolved when done. */ - protected async prefetchLesson(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean): Promise { - const siteId = CoreSites.getCurrentSiteId(); - courseId = courseId || module.course || CoreSites.getCurrentSiteHomeId(); - + protected async prefetchLesson( + module: CoreCourseAnyModuleData, + courseId: number, + single: boolean, + siteId: string, + ): Promise { const commonOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, siteId, diff --git a/src/addons/mod/quiz/services/handlers/prefetch.ts b/src/addons/mod/quiz/services/handlers/prefetch.ts index f5ca3f793..982b5920e 100644 --- a/src/addons/mod/quiz/services/handlers/prefetch.ts +++ b/src/addons/mod/quiz/services/handlers/prefetch.ts @@ -269,7 +269,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet */ async prefetch( module: SyncedModule, - courseId?: number, + courseId: number, single?: boolean, dirPath?: string, canStart: boolean = true, @@ -282,9 +282,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet return; } - const siteId = CoreSites.getCurrentSiteId(); - - return this.prefetchPackage(module, courseId, this.prefetchQuiz.bind(this, module, courseId, single, siteId, canStart)); + return this.prefetchPackage(module, courseId, this.prefetchQuiz.bind(this, module, courseId, !!single, canStart)); } /** @@ -293,16 +291,16 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet * @param module Module. * @param courseId Course ID the module belongs to. * @param single True if we're downloading a single module, false if we're downloading a whole section. - * @param siteId Site ID. * @param canStart If true, start a new attempt if needed. + * @param siteId Site ID. * @return Promise resolved when done. */ protected async prefetchQuiz( module: CoreCourseAnyModuleData, courseId: number, single: boolean, - siteId: string, canStart: boolean, + siteId: string, ): Promise { const commonOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, diff --git a/src/addons/mod/scorm/services/handlers/prefetch.ts b/src/addons/mod/scorm/services/handlers/prefetch.ts index f92274403..907622300 100644 --- a/src/addons/mod/scorm/services/handlers/prefetch.ts +++ b/src/addons/mod/scorm/services/handlers/prefetch.ts @@ -47,12 +47,10 @@ export class AddonModScormPrefetchHandlerService extends CoreCourseActivityPrefe dirPath?: string, onProgress?: AddonModScormProgressCallback, ): Promise { - const siteId = CoreSites.getCurrentSiteId(); - return this.prefetchPackage( module, courseId, - this.downloadOrPrefetchScorm.bind(this, module, courseId, true, siteId, false, onProgress), + this.downloadOrPrefetchScorm.bind(this, module, courseId, true, false, onProgress), ); } @@ -62,18 +60,18 @@ export class AddonModScormPrefetchHandlerService extends CoreCourseActivityPrefe * @param module Module. * @param courseId Course ID the module belongs to. * @param single True if we're downloading a single module, false if we're downloading a whole section. - * @param siteId Site ID. * @param prefetch True to prefetch, false to download right away. * @param onProgress Function to call on progress. + * @param siteId Site ID. * @return Promise resolved with the "extra" data to store: the hash of the file. */ protected async downloadOrPrefetchScorm( module: CoreCourseAnyModuleData, courseId: number, single: boolean, - siteId: string, prefetch: boolean, - onProgress?: AddonModScormProgressCallback, + onProgress: AddonModScormProgressCallback | undefined, + siteId: string, ): Promise { const scorm = await this.getScorm(module, courseId, siteId); @@ -370,12 +368,10 @@ export class AddonModScormPrefetchHandlerService extends CoreCourseActivityPrefe dirPath?: string, onProgress?: AddonModScormProgressCallback, ): Promise { - const siteId = CoreSites.getCurrentSiteId(); - return this.prefetchPackage( module, courseId, - this.downloadOrPrefetchScorm.bind(this, module, courseId, single, siteId, true, onProgress), + this.downloadOrPrefetchScorm.bind(this, module, courseId, single, true, onProgress), ); } diff --git a/src/addons/mod/survey/services/handlers/prefetch.ts b/src/addons/mod/survey/services/handlers/prefetch.ts index 6f75862d2..fca2d7852 100644 --- a/src/addons/mod/survey/services/handlers/prefetch.ts +++ b/src/addons/mod/survey/services/handlers/prefetch.ts @@ -67,7 +67,7 @@ export class AddonModSurveyPrefetchHandlerService extends CoreCourseActivityPref /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchSurvey.bind(this, module, courseId)); } diff --git a/src/addons/mod/wiki/services/handlers/prefetch.ts b/src/addons/mod/wiki/services/handlers/prefetch.ts index a8d9d0160..d6b3b4179 100644 --- a/src/addons/mod/wiki/services/handlers/prefetch.ts +++ b/src/addons/mod/wiki/services/handlers/prefetch.ts @@ -130,7 +130,7 @@ export class AddonModWikiPrefetchHandlerService extends CoreCourseActivityPrefet /** * @inheritdoc */ - async prefetch(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean): Promise { + async prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise { // Get the download time of the package before starting the download (otherwise we'd always get current time). const siteId = CoreSites.getCurrentSiteId(); @@ -138,7 +138,12 @@ export class AddonModWikiPrefetchHandlerService extends CoreCourseActivityPrefet const downloadTime = data?.downloadTime || 0; - return this.prefetchPackage(module, courseId, this.prefetchWiki.bind(this, module, courseId, single, downloadTime, siteId)); + return this.prefetchPackage( + module, + courseId, + this.prefetchWiki.bind(this, module, courseId, !!single, downloadTime), + siteId, + ); } /** diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts index 0c62e0832..088002c86 100644 --- a/src/addons/mod/workshop/services/handlers/prefetch.ts +++ b/src/addons/mod/workshop/services/handlers/prefetch.ts @@ -210,7 +210,7 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number): Promise { + prefetch(module: CoreCourseAnyModuleData, courseId: number): Promise { return this.prefetchPackage(module, courseId, this.prefetchWorkshop.bind(this, module, courseId)); } @@ -258,9 +258,6 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr * @return Promise resolved when done. */ protected async prefetchWorkshop(module: CoreCourseAnyModuleData, courseId: number, siteId: string): Promise { - - siteId = siteId || CoreSites.getCurrentSiteId(); - const userIds: number[] = []; const commonOptions = { readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, diff --git a/src/core/features/course/classes/activity-prefetch-handler.ts b/src/core/features/course/classes/activity-prefetch-handler.ts index 4b58dc5eb..1b8617b01 100644 --- a/src/core/features/course/classes/activity-prefetch-handler.ts +++ b/src/core/features/course/classes/activity-prefetch-handler.ts @@ -78,8 +78,8 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe */ async prefetchPackage( module: CoreCourseAnyModuleData, - courseId: number | undefined, - downloadFunction: () => Promise, + courseId: number, + downloadFunction: (siteId: string) => Promise, siteId?: string, ): Promise { siteId = siteId || CoreSites.getCurrentSiteId(); @@ -111,8 +111,8 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe protected async changeStatusAndPrefetch( module: CoreCourseAnyModuleData, courseId: number | undefined, - downloadFunction: () => Promise, - siteId?: string, + downloadFunction: (siteId: string) => Promise, + siteId: string, ): Promise { try { await this.setDownloading(module.id, siteId); @@ -125,7 +125,7 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe ]); // Call the download function. - let extra = await downloadFunction(); + let extra = await downloadFunction(siteId); // Only accept string types. if (typeof extra != 'string') { diff --git a/src/core/features/course/classes/resource-prefetch-handler.ts b/src/core/features/course/classes/resource-prefetch-handler.ts index 67880f2ae..a11108d27 100644 --- a/src/core/features/course/classes/resource-prefetch-handler.ts +++ b/src/core/features/course/classes/resource-prefetch-handler.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreError } from '@classes/errors/error'; import { CoreNetworkError } from '@classes/errors/network-error'; import { CoreFilterHelper } from '@features/filter/services/filter-helper'; import { CoreApp } from '@services/app'; @@ -191,12 +190,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe * @param dirPath Path of the directory where to store all the content files. * @return Promise resolved when done. */ - prefetch(module: CoreCourseWSModule, courseId?: number, single?: boolean, dirPath?: string): Promise { - courseId = courseId || module.course; - if (!courseId) { - throw new CoreError('Course ID not supplied.'); - } - + prefetch(module: CoreCourseWSModule, courseId: number, single?: boolean, dirPath?: string): Promise { return this.downloadOrPrefetch(module, courseId, true, dirPath); } diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts index bf2e33a06..04d7fbc4c 100644 --- a/src/core/features/course/services/module-prefetch-delegate.ts +++ b/src/core/features/course/services/module-prefetch-delegate.ts @@ -182,7 +182,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate; + prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean, dirPath?: string): Promise; /** * Download the module. diff --git a/src/core/features/siteplugins/classes/handlers/module-prefetch-handler.ts b/src/core/features/siteplugins/classes/handlers/module-prefetch-handler.ts index 5353cb0b3..24e58be5a 100644 --- a/src/core/features/siteplugins/classes/handlers/module-prefetch-handler.ts +++ b/src/core/features/siteplugins/classes/handlers/module-prefetch-handler.ts @@ -222,14 +222,11 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref /** * @inheritdoc */ - prefetch(module: CoreCourseAnyModuleData, courseId?: number, single?: boolean, dirPath?: string): Promise { - const siteId = CoreSites.getCurrentSiteId(); - + prefetch(module: CoreCourseAnyModuleData, courseId: number, single?: boolean, dirPath?: string): Promise { return this.prefetchPackage( module, courseId, - this.downloadPrefetchPlugin.bind(this, module, courseId, true, dirPath, siteId), - siteId, + this.downloadPrefetchPlugin.bind(this, module, courseId, true, dirPath), ); }