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

Merge pull request #3133 from dpalou/MOBILE-3780 

MOBILE-3780 attachments: Fix detect file size in Android
main
Pau Ferrer Ocaña 2022-02-22 09:39:45 +01:00 committed by GitHub
parent 497cb52f61 2d541a2ff8
commit 513e669a12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/components/attachments/attachments.scss 100644
View File

@ -0,0 +1,5 @@
:host {
core-loading {
--loading-inline-min-height: 60px;
}
}

10
src/core/components/attachments/attachments.ts
View File

@ -42,6 +42,7 @@ import { CoreUtils } from '@services/utils/utils';
@Component({
selector: 'core-attachments',
templateUrl: 'core-attachments.html',
styleUrls: ['attachments.scss'],
})
export class CoreAttachmentsComponent implements OnInit {
@ -59,16 +60,17 @@ export class CoreAttachmentsComponent implements OnInit {
maxSubmissionsReadable?: string;
unlimitedFiles?: boolean;
fileTypes?: CoreFileUploaderTypeList;
loaded = false;
/**
* Component being initialized.
* @inheritdoc
*/
ngOnInit(): void {
async ngOnInit(): Promise<void> {
this.files = this.files || [];
this.maxSize = this.maxSize !== null ? Number(this.maxSize) : NaN;
if (this.maxSize === 0) {
this.getMaxSizeOfArea();
await this.getMaxSizeOfArea();
} else if (this.maxSize > 0) {
this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
} else if (this.maxSize === -1) {
@ -90,6 +92,8 @@ export class CoreAttachmentsComponent implements OnInit {
if (this.acceptedTypes && this.acceptedTypes != '*') {
this.fileTypes = CoreFileUploader.prepareFiletypeList(this.acceptedTypes);
}
this.loaded = true;
}
/**

73
src/core/components/attachments/core-attachments.html
View File

@ -1,37 +1,40 @@
<ion-item class="ion-text-wrap">
<ion-label>
<span *ngIf="maxSubmissionsReadable">
{{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
</span>
<span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
<span [core-mark-required]="required" class="core-mark-required"></span>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="fileTypes && fileTypes.mimetypes && fileTypes.mimetypes.length">
<ion-label>
<p>{{ 'core.fileuploader.filesofthesetypes' | translate }}</p>
<ul class="list-with-style">
<li *ngFor="let typeInfo of fileTypes.info">
<strong *ngIf="typeInfo.name">{{typeInfo.name}} </strong>{{typeInfo.extlist}}
</li>
</ul>
</ion-label>
</ion-item>
<div *ngFor="let file of files; let index=index">
<!-- Files already attached to the submission, either in online or in offline. -->
<core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
(onDelete)="delete(index, true)" [canDownload]="!file.offline">
</core-file>
<core-loading [hideUntil]="loaded" [fullscreen]="false">
<ion-item class="ion-text-wrap">
<ion-label>
<span *ngIf="maxSubmissionsReadable">
{{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
</span>
<span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
<span [core-mark-required]="required" class="core-mark-required"></span>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="fileTypes && fileTypes.mimetypes && fileTypes.mimetypes.length">
<ion-label>
<p>{{ 'core.fileuploader.filesofthesetypes' | translate }}</p>
<ul class="list-with-style">
<li *ngFor="let typeInfo of fileTypes.info">
<strong *ngIf="typeInfo.name">{{typeInfo.name}} </strong>{{typeInfo.extlist}}
</li>
</ul>
</ion-label>
</ion-item>
<div *ngFor="let file of files; let index=index">
<!-- Files already attached to the submission, either in online or in offline. -->
<core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
(onDelete)="delete(index, true)" [canDownload]="!file.offline">
</core-file>
<!-- Files added to draft but not attached to submission yet. -->
<core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)" (onRename)="renamed(index, $event)">
</core-local-file>
</div>
<!-- Files added to draft but not attached to submission yet. -->
<core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)"
(onRename)="renamed(index, $event)">
</core-local-file>
</div>
<!-- Button to add more files. -->
<ion-button expand="block"
*ngIf="unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)"
class="ion-text-wrap ion-margin" (click)="add()">
<ion-icon name="fas-plus" slot="start" aria-hidden="true"></ion-icon>
{{ 'core.fileuploader.addfiletext' | translate }}
</ion-button>
<!-- Button to add more files. -->
<ion-button expand="block"
*ngIf="unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)"
class="ion-text-wrap ion-margin" (click)="add()">
<ion-icon name="fas-plus" slot="start" aria-hidden="true"></ion-icon>
{{ 'core.fileuploader.addfiletext' | translate }}
</ion-button>
</core-loading>

12
src/core/features/fileuploader/services/fileuploader-helper.ts
View File

@ -204,16 +204,12 @@ export class CoreFileUploaderHelperProvider {
// Check that size isn't too large.
if (maxSize !== undefined && maxSize != -1) {
try {
const fileEntry = await CoreFile.getExternalFile(path);
const fileEntry = await CoreFile.getExternalFile(path);
const fileData = await CoreFile.getFileObjectFromFileEntry(fileEntry);
const fileData = await CoreFile.getFileObjectFromFileEntry(fileEntry);
if (fileData.size > maxSize) {
throw this.createMaxBytesError(maxSize, fileEntry.name);
}
} catch (error) {
// Ignore failures.
if (fileData.size > maxSize) {
throw this.createMaxBytesError(maxSize, fileEntry.name);
}
}