Skip to content

MOBILE-3473 upload: Fix big files not uploaded #2446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2020
Merged

MOBILE-3473 upload: Fix big files not uploaded #2446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions src/core/fileuploader/providers/file-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,10 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {
* @return Data.
*/
getData(): CoreFileUploaderHandlerData {
const isIOS = this.platform.is('ios');

const handler: CoreFileUploaderHandlerData = {
title: isIOS ? 'core.fileuploader.more' : 'core.fileuploader.file',
title: 'core.fileuploader.file',
class: 'core-fileuploader-file-handler',
icon: isIOS ? 'more' : 'folder',
icon: 'folder',
};

if (this.appProvider.isMobile()) {
Expand Down Expand Up @@ -98,7 +96,6 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {

input.addEventListener('change', (evt: Event) => {
const file = input.files[0];
let fileName;

input.value = ''; // Unset input.
if (!file) {
Expand All @@ -113,17 +110,8 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {
return;
}

fileName = file.name;
if (isIOS) {
// Check the name of the file and add a timestamp if needed (take picture).
const matches = fileName.match(/image\.(jpe?g|png)/);
if (matches) {
fileName = 'image_' + this.timeUtils.readableTimestamp() + '.' + matches[1];
}
}

// Upload the picked file.
this.uploaderHelper.uploadFileObject(file, maxSize, upload, allowOffline, fileName).then((result) => {
this.uploaderHelper.uploadFileObject(file, maxSize, upload, allowOffline, file.name).then((result) => {
this.uploaderHelper.fileUploaded(result);
}).catch((error) => {
this.domUtils.showErrorModalDefault(error,
Expand Down
8 changes: 4 additions & 4 deletions src/core/fileuploader/providers/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,12 @@ export class CoreFileUploaderHelperProvider {
*/
async chooseAndUploadFile(maxSize: number, upload?: boolean, allowOffline?: boolean, mimetypes?: string[]): Promise<any> {

const modal = this.domUtils.showModalLoading();

const result = await this.fileChooser.getFile(mimetypes ? mimetypes.join(',') : undefined);

modal.dismiss();

if (!result) {
// User canceled.
throw this.domUtils.createCanceledError();
Expand All @@ -87,10 +91,6 @@ export class CoreFileUploaderHelperProvider {
const options = this.fileUploaderProvider.getFileUploadOptions(result.uri, result.name, result.mediaType, true);

if (upload) {
const size = await this.fileProvider.getExternalFileSize(result.uri);

await this.confirmUploadFile(size, false, allowOffline);

return this.uploadFile(result.uri, maxSize, true, options);
} else {
return this.copyToTmpFolder(result.uri, false, maxSize, undefined, options);
Expand Down