From 0e5c448a82552b99ad0a7179314c4c6c65048749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 14 Sep 2020 14:06:50 +0200 Subject: [PATCH] MOBILE-3554 login: Add forceLoginLogo setting to avoid showing web logo --- src/config.json | 1 + src/core/login/pages/credentials/credentials.ts | 2 +- src/core/login/providers/helper.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config.json b/src/config.json index 5d4d3f040..581f210f1 100644 --- a/src/config.json +++ b/src/config.json @@ -97,6 +97,7 @@ "enableanalytics": false, "enableonboarding": true, "forceColorScheme": "", + "forceLoginLogo": false, "ioswebviewscheme": "moodleappfs", "appstores": { "android": "com.moodle.moodlemobile", diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts index 57541ce34..c40ad2703 100644 --- a/src/core/login/pages/credentials/credentials.ts +++ b/src/core/login/pages/credentials/credentials.ts @@ -70,7 +70,7 @@ export class CoreLoginCredentialsPage { this.siteUrl = navParams.get('siteUrl'); this.siteName = navParams.get('siteName') || null; - this.logoUrl = navParams.get('logoUrl') || null; + this.logoUrl = !CoreConfigConstants.forceLoginLogo && navParams.get('logoUrl') || null; this.siteConfig = navParams.get('siteConfig'); this.urlToOpen = navParams.get('urlToOpen'); diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts index 9e5ea3630..6a598d7c3 100644 --- a/src/core/login/providers/helper.ts +++ b/src/core/login/providers/helper.ts @@ -412,7 +412,7 @@ export class CoreLoginHelperProvider { * @return Logo URL. */ getLogoUrl(config: any): string { - return config ? (config.logourl || config.compactlogourl) : null; + return !CoreConfigConstants.forceLoginLogo && config ? (config.logourl || config.compactlogourl) : null; } /**