From c4f60e902d79e8c7f8032bcf62ed8991a1206a18 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 20 Jul 2018 09:01:37 +0200 Subject: [PATCH] MOBILE-2478 desktop: Don't display free space in desktop --- .../settings/pages/space-usage/space-usage.html | 2 +- .../settings/pages/space-usage/space-usage.ts | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html index bf32f7e80..fea627b9a 100644 --- a/src/core/settings/pages/space-usage/space-usage.html +++ b/src/core/settings/pages/space-usage/space-usage.html @@ -20,7 +20,7 @@

{{ 'core.settings.total' | translate }}

{{ totalUsage | coreBytesToSize }}

- +

{{ 'core.settings.estimatedfreespace' | translate }}

{{ freeSpace | coreBytesToSize }}

diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts index c24ba88b6..0f10c8545 100644 --- a/src/core/settings/pages/space-usage/space-usage.ts +++ b/src/core/settings/pages/space-usage/space-usage.ts @@ -15,6 +15,7 @@ import { Component, } from '@angular/core'; import { IonicPage } from 'ionic-angular'; import { TranslateService } from '@ngx-translate/core'; +import { CoreAppProvider } from '@providers/app'; import { CoreFileProvider } from '@providers/file'; import { CoreFilepoolProvider } from '@providers/filepool'; import { CoreSitesProvider } from '@providers/sites'; @@ -36,11 +37,13 @@ export class CoreSettingsSpaceUsagePage { currentSiteId = ''; totalUsage = 0; freeSpace = 0; + showFreeSpace = true; constructor(private fileProvider: CoreFileProvider, private filePoolProvider: CoreFilepoolProvider, private sitesProvider: CoreSitesProvider, private textUtils: CoreTextUtilsProvider, - private translate: TranslateService, private domUtils: CoreDomUtilsProvider) { + private translate: TranslateService, private domUtils: CoreDomUtilsProvider, appProvider: CoreAppProvider) { this.currentSiteId = this.sitesProvider.getCurrentSiteId(); + this.showFreeSpace = !appProvider.isDesktop(); } /** @@ -112,10 +115,15 @@ export class CoreSettingsSpaceUsagePage { * @return {Promise} Resolved when done. */ protected fetchData(): Promise { - return Promise.all([ + const promises = [ this.calculateSizeUsage().then(() => this.calculateTotalUsage()), - this.calculateFreeSpace(), - ]); + ]; + + if (this.showFreeSpace) { + promises.push(this.calculateFreeSpace()); + } + + return Promise.all(promises); } /**