Merge pull request #2535 from crazyserver/MOBILE-3554

MOBILE-3554 login: Add forceLoginLogo setting to avoid showing web logo

src/config.json

@@ -98,6 +98,7 @@
     "enableanalytics": false,
     "enableonboarding": true,
     "forceColorScheme": "",
+    "forceLoginLogo": false,
     "ioswebviewscheme": "moodleappfs",
     "appstores": {
         "android": "com.moodle.moodlemobile",

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');
 

src/core/login/providers/helper.ts

@@ -411,7 +411,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;
     }
 
     /**