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

MOBILE-3164 core: Fix file ID calculation with tokenpluginfile

main
Dani Palou 2019-12-04 10:10:38 +01:00
parent dac9ba4de9
commit c4b21f0fb0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/providers/filepool.ts
View File

@ -1411,16 +1411,19 @@ export class CoreFilepoolProvider {
* @return The file ID. * @return The file ID.
*/ */
protected getFileIdByUrl(fileUrl: string): string { protected getFileIdByUrl(fileUrl: string): string {
let url = this.removeRevisionFromUrl(fileUrl), let url = fileUrl,
filename; filename;
// Decode URL.
url = this.textUtils.decodeHTML(this.textUtils.decodeURIComponent(url));
// If site supports it, since 3.8 we use tokenpluginfile instead of pluginfile. // If site supports it, since 3.8 we use tokenpluginfile instead of pluginfile.
// For compatibility with files already downloaded, we need to use pluginfile to calculate the file ID. // For compatibility with files already downloaded, we need to use pluginfile to calculate the file ID.
url = url.replace(/\/tokenpluginfile\.php\/[^\/]+\//, '/webservice/pluginfile.php/'); url = url.replace(/\/tokenpluginfile\.php\/[^\/]+\//, '/webservice/pluginfile.php/');
// Remove the revision number from the URL so updates on the file aren't detected as a different file.
url = this.removeRevisionFromUrl(url);
// Decode URL.
url = this.textUtils.decodeHTML(this.textUtils.decodeURIComponent(url));
if (url.indexOf('/webservice/pluginfile') !== -1) { if (url.indexOf('/webservice/pluginfile') !== -1) {
// Remove attributes that do not matter. // Remove attributes that do not matter.
this.urlAttributes.forEach((regex) => { this.urlAttributes.forEach((regex) => {