From 70e3bd98431a328bd4a51a84c21be02df094bdf5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 31 May 2021 15:38:36 +0200
Subject: [PATCH 1/3] MOBILE-3320 privatefiles: Display chevron in subfolders

---
 src/addons/privatefiles/pages/index/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index dcac42b7e..7b932984f 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -33,7 +33,7 @@
         <!-- List of files. -->
         <ion-list *ngIf="files && files.length > 0">
             <ng-container *ngFor="let file of files">
-                <ion-item button *ngIf="file.isdir" class="item-file" (click)="openFolder(file)">
+                <ion-item button *ngIf="file.isdir" class="item-file" (click)="openFolder(file)" detail="true">
                     <ion-thumbnail slot="start">
                         <img [src]="file.imgPath" alt="" role="presentation">
                     </ion-thumbnail>

From 7f9a0e9ae73f63210b7764ff08940e0f949c34da Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 31 May 2021 15:50:45 +0200
Subject: [PATCH 2/3] MOBILE-3320 upload: Fix icon of shared files

---
 src/core/features/fileuploader/services/handlers/album.ts  | 2 +-
 src/core/features/fileuploader/services/handlers/audio.ts  | 2 +-
 src/core/features/fileuploader/services/handlers/camera.ts | 2 +-
 src/core/features/fileuploader/services/handlers/file.ts   | 2 +-
 src/core/features/fileuploader/services/handlers/video.ts  | 2 +-
 src/core/features/sharedfiles/services/handlers/upload.ts  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/features/fileuploader/services/handlers/album.ts b/src/core/features/fileuploader/services/handlers/album.ts
index 474e9b8b5..39add8537 100644
--- a/src/core/features/fileuploader/services/handlers/album.ts
+++ b/src/core/features/fileuploader/services/handlers/album.ts
@@ -58,7 +58,7 @@ export class CoreFileUploaderAlbumHandlerService implements CoreFileUploaderHand
         return {
             title: 'core.fileuploader.photoalbums',
             class: 'core-fileuploader-album-handler',
-            icon: 'images',
+            icon: 'images', // Cannot use font-awesome in action sheet.
             action: async (
                 maxSize?: number,
                 upload?: boolean,
diff --git a/src/core/features/fileuploader/services/handlers/audio.ts b/src/core/features/fileuploader/services/handlers/audio.ts
index 3c612bd2c..d151f8469 100644
--- a/src/core/features/fileuploader/services/handlers/audio.ts
+++ b/src/core/features/fileuploader/services/handlers/audio.ts
@@ -73,7 +73,7 @@ export class CoreFileUploaderAudioHandlerService implements CoreFileUploaderHand
         return {
             title: 'core.fileuploader.audio',
             class: 'core-fileuploader-audio-handler',
-            icon: 'mic',
+            icon: 'mic', // Cannot use font-awesome in action sheet.
             action: async (
                 maxSize?: number,
                 upload?: boolean,
diff --git a/src/core/features/fileuploader/services/handlers/camera.ts b/src/core/features/fileuploader/services/handlers/camera.ts
index db3bde46f..3590934fc 100644
--- a/src/core/features/fileuploader/services/handlers/camera.ts
+++ b/src/core/features/fileuploader/services/handlers/camera.ts
@@ -58,7 +58,7 @@ export class CoreFileUploaderCameraHandlerService implements CoreFileUploaderHan
         return {
             title: 'core.fileuploader.camera',
             class: 'core-fileuploader-camera-handler',
-            icon: 'camera',
+            icon: 'camera', // Cannot use font-awesome in action sheet.
             action: async (
                 maxSize?: number,
                 upload?: boolean,
diff --git a/src/core/features/fileuploader/services/handlers/file.ts b/src/core/features/fileuploader/services/handlers/file.ts
index 5ce1ab8ad..f0aff4c39 100644
--- a/src/core/features/fileuploader/services/handlers/file.ts
+++ b/src/core/features/fileuploader/services/handlers/file.ts
@@ -58,7 +58,7 @@ export class CoreFileUploaderFileHandlerService implements CoreFileUploaderHandl
         const handler: CoreFileUploaderHandlerData = {
             title: 'core.fileuploader.file',
             class: 'core-fileuploader-file-handler',
-            icon: 'folder',
+            icon: 'folder', // Cannot use font-awesome in action sheet.
         };
 
         if (CoreApp.isMobile()) {
diff --git a/src/core/features/fileuploader/services/handlers/video.ts b/src/core/features/fileuploader/services/handlers/video.ts
index 4a350ea0d..037e1a0ec 100644
--- a/src/core/features/fileuploader/services/handlers/video.ts
+++ b/src/core/features/fileuploader/services/handlers/video.ts
@@ -73,7 +73,7 @@ export class CoreFileUploaderVideoHandlerService implements CoreFileUploaderHand
         return {
             title: 'core.fileuploader.video',
             class: 'core-fileuploader-video-handler',
-            icon: 'videocam',
+            icon: 'videocam', // Cannot use font-awesome in action sheet.
             action: async (
                 maxSize?: number,
                 upload?: boolean,
diff --git a/src/core/features/sharedfiles/services/handlers/upload.ts b/src/core/features/sharedfiles/services/handlers/upload.ts
index 437a9abfb..697ef8a2d 100644
--- a/src/core/features/sharedfiles/services/handlers/upload.ts
+++ b/src/core/features/sharedfiles/services/handlers/upload.ts
@@ -59,7 +59,7 @@ export class CoreSharedFilesUploadHandlerService implements CoreFileUploaderHand
         return {
             title: 'core.sharedfiles.sharedfiles',
             class: 'core-sharedfiles-fileuploader-handler',
-            icon: 'fas-folder',
+            icon: 'folder', // Cannot use font-awesome in action sheet.
             action: (
                 maxSize?: number,
                 upload?: boolean,

From 61b4b6e8f7add6866173e061eb9021c829b0f7d3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Jun 2021 09:08:48 +0200
Subject: [PATCH 3/3] MOBILE-3320 course: Fix no error displayed when open
 module offline

---
 .../course/classes/main-activity-component.ts        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index dedcd65d7..a601ad17a 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -127,10 +127,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
                 this.showCompletion ? CoreCourse.invalidateModule(this.module.id) : undefined,
             ]));
 
-            if (this.showCompletion) {
-                this.module = await CoreCourse.getModule(this.module.id, this.courseId);
-            }
-
             await this.loadContent(true, sync, showErrors);
         } finally {
             this.refreshIcon = CoreConstants.ICON_REFRESH;
@@ -205,6 +201,14 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
         }
 
         try {
+            if (refresh && this.showCompletion) {
+                try {
+                    this.module = await CoreCourse.getModule(this.module.id, this.courseId);
+                } catch {
+                    // Ignore errors.
+                }
+            }
+
             await this.fetchContent(refresh, sync, showErrors);
         } catch (error) {
             if (!refresh) {