From c75f3774ad13cd241b0e3836262cead2562b5331 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 7 Jul 2021 13:13:02 +0200 Subject: [PATCH 1/4] MOBILE-3320 camera: Fix for Android 11 --- config.xml | 12 +++++++++++- src/core/features/emulator/services/camera.ts | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/config.xml b/config.xml index bc9004833..5edb28abf 100644 --- a/config.xml +++ b/config.xml @@ -224,6 +224,16 @@ + + + + + + + + + + @@ -248,7 +258,7 @@ 3.9.5 - + en diff --git a/src/core/features/emulator/services/camera.ts b/src/core/features/emulator/services/camera.ts index 1aa4114e2..319e09eba 100644 --- a/src/core/features/emulator/services/camera.ts +++ b/src/core/features/emulator/services/camera.ts @@ -17,6 +17,10 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; import { CoreEmulatorCaptureHelper } from './capture-helper'; +// @todo remove android.media.action.IMAGE_CAPTURE and android.intent.action.GET_CONTENT entries +// from config.xml once https://github.com/apache/cordova-plugin-camera/issues/673 is resolved. +// (this is written here because comments get stripped out from config.xml) + /** * Emulates the Cordova Camera plugin in browser. */ From 0e1c49f7891f72bc8840707ac85c2d8095847493 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 7 Jul 2021 14:30:25 +0200 Subject: [PATCH 2/4] MOBILE-3320 fileuploader: Fix large files --- src/core/features/fileuploader/services/fileuploader-helper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts index 33c58889f..b00769de3 100644 --- a/src/core/features/fileuploader/services/fileuploader-helper.ts +++ b/src/core/features/fileuploader/services/fileuploader-helper.ts @@ -68,7 +68,7 @@ export class CoreFileUploaderHelperProvider { const modal = await CoreDomUtils.showModalLoading(); - const result = await Chooser.getFile(mimetypes ? mimetypes.join(',') : undefined); + const result = await Chooser.getFileMetadata(mimetypes ? mimetypes.join(',') : undefined); modal.dismiss(); From 6c7a866411337cd7af425f3c42686e67edea274b Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 7 Jul 2021 14:30:37 +0200 Subject: [PATCH 3/4] MOBILE-3320 files: Add missing string --- scripts/langindex.json | 1 + src/core/lang.json | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/langindex.json b/scripts/langindex.json index 49cc3dddf..57ee82499 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1602,6 +1602,7 @@ "core.errorinvalidresponse": "local_moodlemobileapp", "core.errorloadingcontent": "local_moodlemobileapp", "core.errorofflinedisabled": "local_moodlemobileapp", + "core.erroropenfiledownloading": "local_moodlemobileapp", "core.erroropenfilenoapp": "local_moodlemobileapp", "core.erroropenfilenoextension": "local_moodlemobileapp", "core.erroropenpopup": "local_moodlemobileapp", diff --git a/src/core/lang.json b/src/core/lang.json index b4d4d57f0..05b6db48f 100644 --- a/src/core/lang.json +++ b/src/core/lang.json @@ -100,6 +100,7 @@ "errorinvalidresponse": "Invalid response received. Please contact your site administrator if the error persists.", "errorloadingcontent": "Error loading content.", "errorofflinedisabled": "Offline browsing is disabled on your site. You need to be connected to the internet to use the app.", + "erroropenfiledownloading": "Error opening file: you need to wait for the download to complete.", "erroropenfilenoapp": "Error opening file: no app found to open this type of file.", "erroropenfilenoextension": "Error opening file: the file doesn't have an extension.", "erroropenpopup": "This activity is trying to open a popup. This is not supported in the app.", From c894afb518806381376f49d09c61ceafa39ac3c3 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 7 Jul 2021 16:20:42 +0200 Subject: [PATCH 4/4] MOBILE-3320 items: Add missing details --- src/core/features/course/pages/preview/preview.html | 2 +- src/core/features/mainmenu/pages/more/more.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html index 0a11f01c2..7ab51f689 100644 --- a/src/core/features/course/pages/preview/preview.html +++ b/src/core/features/course/pages/preview/preview.html @@ -50,7 +50,7 @@ + [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true"> diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html index df537d5e3..3f3fcff68 100644 --- a/src/core/features/mainmenu/pages/more/more.html +++ b/src/core/features/mainmenu/pages/more/more.html @@ -10,7 +10,7 @@ - +

{{siteInfo.fullname}}