From 05c552c3439e0d73ff5fcf0f1c992a7d76089048 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 25 Jan 2019 11:51:20 +0100
Subject: [PATCH 1/3] MOBILE-2844 mac: Use inappbrowser for oauth in Mac

---
 src/core/login/providers/helper.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index 5c51f6aae..ff9d6c58d 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -647,8 +647,8 @@ export class CoreLoginHelperProvider {
 
         loginUrl += '&oauthsso=' + params.id;
 
-        if (this.appProvider.isLinux()) {
-            // In Linux desktop apps, always use embedded browser.
+        if (this.appProvider.isLinux() || this.appProvider.isMac()) {
+            // In Linux and Mac desktop apps, always use embedded browser.
             this.utils.openInApp(loginUrl);
         } else {
             // Always open it in browser because the user might have the session stored in there.

From edcc26f2c523ecd1d7d21dffad4003ebfc3806c9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 28 Jan 2019 09:55:32 +0100
Subject: [PATCH 2/3] MOBILE-2844 desktop: Display download button in SSO
 legacy site

---
 src/core/login/providers/helper.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index ff9d6c58d..77d06b08c 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -179,10 +179,10 @@ export class CoreLoginHelperProvider {
             } else {
                 this.goToSiteInitialPage();
             }
-        }).catch((errorMessage) => {
-            if (errorMessage) {
+        }).catch((error) => {
+            if (error) {
                 // An error occurred, display the error and logout the user.
-                this.domUtils.showErrorModal(errorMessage);
+                this.treatUserTokenError(siteData.siteUrl, error);
                 this.sitesProvider.logout();
             }
         }).finally(() => {

From bf786ba596c1d79ea90fd137371a295c071ad98b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 28 Jan 2019 10:26:30 +0100
Subject: [PATCH 3/3] MOBILE-2844 course: Display size instead of are you sure
 in prefetch

---
 src/providers/utils/dom.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 05f86a032..d026def15 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -140,13 +140,12 @@ export class CoreDomUtilsProvider {
             const readableSize = this.textUtils.bytesToSize(size.size, 2);
 
             return this.showConfirm(this.translate.instant('core.course.confirmpartialdownloadsize', { size: readableSize }));
-        } else if (size.size >= wifiThreshold || (this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) {
+        } else if (alwaysConfirm || size.size >= wifiThreshold ||
+                (this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) {
             message = message || 'core.course.confirmdownload';
             const readableSize = this.textUtils.bytesToSize(size.size, 2);
 
             return this.showConfirm(this.translate.instant(message, { size: readableSize }));
-        } else if (alwaysConfirm) {
-            return this.showConfirm(this.translate.instant('core.areyousure'));
         }
 
         return Promise.resolve();