MOBILE-4047 settings: Use accounts list on sync

src/core/features/settings/pages/synchronization/synchronization.html

@@ -17,7 +17,7 @@
 </ion-header>
 <ion-content class="limited-width">
     <core-loading [hideUntil]="sitesLoaded">
-        <ion-list>
+        <ion-list class="core-sitelist">
             <ion-item-divider>
                 <ion-label>
                     <h2>{{ 'core.settings.syncsettings' | translate }}</h2>
@@ -30,24 +30,75 @@
             </ion-item>
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.settings.sites' | translate }}</h2>
+                    <h2>{{ 'core.accounts' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
-            <ion-item *ngFor="let site of sites" [class.item-current]="site.id == currentSiteId" class="ion-text-wrap">
+
-                <ion-label>
+            <ion-card *ngIf="accountsList.currentSite">
-                    <p class="item-heading">
+                <ion-item-divider sticky="true" class="core-sitelist-sitename">
-                        <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
+                    <ion-label>
-                    </p>
+                        <h2>
-                    <p>{{ site.fullName }}</p>
+                            <core-format-text [text]="accountsList.currentSite.siteName" clean="true"
-                    <p>{{ site.siteUrlWithoutProtocol }}</p>
+                                [siteId]="accountsList.currentSite.id"></core-format-text>
-                </ion-label>
+                        </h2>
-                <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
+                        <p><a [href]="accountsList.currentSite.siteUrl" core-link autoLogin="yes">{{
-                    <ion-button fill="clear" (click)="synchronize(site.id)" [title]="site.siteName"
+                                accountsList.currentSite.siteUrlWithoutProtocol }}</a>
-                        [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                        </p>
-                        <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-label>
-                    </ion-button>
+                </ion-item-divider>
-                </core-button-with-spinner>
+
-            </ion-item>
+                <ion-item class="item-current">
+                    <ion-avatar slot="start">
+                        <img [src]="accountsList.currentSite.avatar" core-external-content [siteId]="accountsList.currentSite.id"
+                            alt="{{ 'core.pictureof' | translate:{$a: accountsList.currentSite.fullName} }}"
+                            onError="this.src='assets/img/user-avatar.png'">
+                    </ion-avatar>
+                    <ion-label>
+                        <p class="item-heading">{{accountsList.currentSite.fullName}}</p>
+                    </ion-label>
+                    <core-button-with-spinner [loading]="isSynchronizing(accountsList.currentSite.id)" slot="end">
+                        <ion-button fill="clear" (click)="synchronize(accountsList.currentSite.id)"
+                            [attr.aria-label]="'core.settings.synchronizenow' | translate" [disabled]="accountsList.currentSite.loggedOut">
+                            <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </core-button-with-spinner>
+                </ion-item>
+
+                <ng-container *ngTemplateOutlet="siteList; context: {sites: accountsList.sameSite}"></ng-container>
+            </ion-card>
+
+            <ion-card *ngFor="let sites of accountsList.otherSites">
+                <ion-item-divider sticky="true" *ngIf="sites[0]" class="core-sitelist-sitename">
+                    <ion-label>
+                        <h2>
+                            <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
+                        </h2>
+                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrlWithoutProtocol }}</a></p>
+                    </ion-label>
+                </ion-item-divider>
+
+                <ng-container *ngTemplateOutlet="siteList; context: {sites: sites}"></ng-container>
+            </ion-card>
+
         </ion-list>
     </core-loading>
 </ion-content>
+
+<!-- Template to render a list of sites. -->
+<ng-template #siteList let-sites="sites">
+    <ion-item *ngFor="let site of sites">
+        <ion-avatar slot="start">
+            <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}"
+                onError="this.src='assets/img/user-avatar.png'">
+        </ion-avatar>
+        <ion-label>
+            <p class="item-heading">{{site.fullName}}</p>
+        </ion-label>
+        <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
+            <ion-button fill="clear" (click)="synchronize(site.id)" [attr.aria-label]="'core.settings.synchronizenow' | translate"
+                [disabled]="site.loggedOut">
+                <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </core-button-with-spinner>
+    </ion-item>
+</ng-template>

src/core/features/settings/pages/synchronization/synchronization.ts

@@ -16,11 +16,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreSites, CoreSiteBasicInfo } from '@services/sites';
+import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreConfig } from '@services/config';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { Translate } from '@singletons';
+import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/login-helper';
 
 /**
  * Page that displays the synchronization settings.
@@ -28,43 +29,67 @@ import { Translate } from '@singletons';
 @Component({
     selector: 'page-core-app-settings-synchronization',
     templateUrl: 'synchronization.html',
+    styleUrls: ['../../../login/sitelist.scss'],
 })
 export class CoreSettingsSynchronizationPage implements OnInit, OnDestroy {
 
-    sites: CoreSiteBasicInfo[] = [];
+    accountsList: CoreAccountsList = {
+        sameSite: [],
+        otherSites: [],
+        count: 0,
+    };
+
     sitesLoaded = false;
-    currentSiteId = '';
     syncOnlyOnWifi = false;
     protected isDestroyed = false;
     protected sitesObserver: CoreEventObserver;
 
     constructor() {
 
-        this.currentSiteId = CoreSites.getCurrentSiteId();
-
         this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, async (data) => {
-            const site = await CoreSites.getSite(data.siteId);
+            const siteId = data.siteId;
 
-            const siteEntry = this.sites.find((siteEntry) => siteEntry.id == site.id);
+            let siteEntry = siteId === this.accountsList.currentSite?.id
-            if (siteEntry) {
+                ? this.accountsList.currentSite
-                const siteInfo = site.getInfo();
+                : undefined;
 
-                siteEntry.siteName = site.getSiteName();
+            if (!siteEntry) {
+                siteEntry = this.accountsList.sameSite.find((siteEntry) => siteEntry.id === siteId);
+            }
 
-                if (siteInfo) {
+            if (!siteEntry) {
-                    siteEntry.siteUrl = siteInfo.siteurl;
+                this.accountsList.otherSites.some((sites) => {
-                    siteEntry.fullName = siteInfo.fullname;
+                    siteEntry = sites.find((siteEntry) => siteEntry.id === siteId);
-                }
+
+                    return siteEntry;
+                });
+            }
+
+            if (!siteEntry) {
+                return;
+            }
+
+            const site = await CoreSites.getSite(siteId);
+
+            const siteInfo = site.getInfo();
+
+            siteEntry.siteName = site.getSiteName();
+
+            if (siteInfo) {
+                siteEntry.siteUrl = siteInfo.siteurl;
+                siteEntry.fullName = siteInfo.fullname;
             }
         });
     }
 
     /**
-     * View loaded.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
+        const currentSiteId = CoreSites.getCurrentSiteId();
+
         try {
-            this.sites = await CoreSites.getSortedSites();
+            this.accountsList = await CoreLoginHelper.getAccountsList(currentSiteId);
         } catch {
             // Ignore errors.
         }

src/core/services/sites.ts

@@ -1185,6 +1185,7 @@ export class CoreSitesProvider {
                     siteName: CoreConstants.CONFIG.sitename == '' ? siteInfo?.sitename: CoreConstants.CONFIG.sitename,
                     avatar: siteInfo?.userpictureurl,
                     siteHomeId: siteInfo?.siteid || 1,
+                    loggedOut: !!site.loggedOut,
                 };
                 formattedSites.push(basicInfo);
             }
@@ -1923,6 +1924,7 @@ export type CoreSiteBasicInfo = {
     avatar?: string; // User's avatar.
     badge?: number; // Badge to display in the site.
     siteHomeId?: number; // Site home ID.
+    loggedOut: boolean; // If Site is logged out.
 };
 
 /**