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

Merge pull request #3095 from dpalou/MOBILE-3833 

MOBILE-3833 core: Fix infinite requests if file download failed
main
Pau Ferrer Ocaña 2022-02-04 11:20:28 +01:00 committed by GitHub
parent c70019baab 947534a6b7
commit 46f82b58be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/directives/external-content.ts
View File

@ -25,7 +25,7 @@ import {
} from '@angular/core'; } from '@angular/core';
import { CoreApp } from '@services/app'; import { CoreApp } from '@services/app';
import { CoreFile } from '@services/file'; import { CoreFile } from '@services/file';
import { CoreFilepool } from '@services/filepool'; import { CoreFilepool, CoreFilepoolFileActions, CoreFilepoolFileEventData } from '@services/filepool';
import { CoreSites } from '@services/sites'; import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom'; import { CoreDomUtils } from '@services/utils/dom';
import { CoreUrlUtils } from '@services/utils/url'; import { CoreUrlUtils } from '@services/utils/url';
@ -395,7 +395,12 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
// Listen for download changes in the file. // Listen for download changes in the file.
const eventName = await CoreFilepool.getFileEventNameByUrl(site.getId(), url); const eventName = await CoreFilepool.getFileEventNameByUrl(site.getId(), url);
this.fileEventObserver = CoreEvents.on(eventName, async () => { this.fileEventObserver = CoreEvents.on(eventName, async (data: CoreFilepoolFileEventData) => {
if (data.action === CoreFilepoolFileActions.DOWNLOAD && !data.success) {
// Error downloading the file. Don't try again.
return;
}
const newState = await CoreFilepool.getFileStateByUrl(site.getId(), url); const newState = await CoreFilepool.getFileStateByUrl(site.getId(), url);
if (newState === state) { if (newState === state) {
return; return;

6
src/core/services/filepool.ts
View File

@ -1251,7 +1251,7 @@ export class CoreFilepoolProvider {
} }
/** /**
* Get the name of the event used to notify download events (CoreEventsProvider). * Get the name of the event used to notify download events.
* *
* @param siteId The site ID. * @param siteId The site ID.
* @param fileId The file ID. * @param fileId The file ID.
@ -1262,7 +1262,7 @@ export class CoreFilepoolProvider {
} }
/** /**
* Get the name of the event used to notify download events (CoreEventsProvider). * Get the name of the event used to notify download events.
* *
* @param siteId The site ID. * @param siteId The site ID.
* @param fileUrl The absolute URL to the file. * @param fileUrl The absolute URL to the file.
@ -3008,7 +3008,7 @@ export class CoreFilepoolProvider {
} }
/** /**
* Trigger mmCoreEventPackageStatusChanged with the right data. * Trigger package status changed event with the right data.
* *
* @param siteId Site ID. * @param siteId Site ID.
* @param status New package status. * @param status New package status.