Merge pull request #1826 from dpalou/MOBILE-2915

Mobile 2915

Author: jleyva

src/addon/blog/components/entries/entries.ts

@@ -135,9 +135,7 @@ export class AddonBlogEntriesComponent implements OnInit {
             this.canLoadMore = result.totalentries > this.entries.length;
             this.pageLoaded++;
 
-            this.showMyIssuesToggle = !this.userId && (this.showMyIssuesToggle || this.entries.some((entry) => {
-                return entry.userid == this.currentUserId;
-            }));
+            this.showMyIssuesToggle = !this.userId;
 
             return Promise.all(promises);
         }).catch((message) => {

src/addon/messages/components/discussions/discussions.ts

@@ -92,8 +92,8 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
                     discussion.unread = false;
 
                     // Conversations changed, invalidate them and refresh unread counts.
-                    this.messagesProvider.invalidateConversations();
-                    this.messagesProvider.refreshUnreadConversationCounts();
+                    this.messagesProvider.invalidateConversations(this.siteId);
+                    this.messagesProvider.refreshUnreadConversationCounts(this.siteId);
                 }
             }
         }, this.siteId);
@@ -145,10 +145,10 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
      */
     refreshData(refresher?: any, refreshUnreadCounts: boolean = true): Promise<any> {
         const promises = [];
-        promises.push(this.messagesProvider.invalidateDiscussionsCache());
+        promises.push(this.messagesProvider.invalidateDiscussionsCache(this.siteId));
 
         if (refreshUnreadCounts) {
-            promises.push(this.messagesProvider.invalidateUnreadConversationCounts());
+            promises.push(this.messagesProvider.invalidateUnreadConversationCounts(this.siteId));
         }
 
         return this.utils.allPromises(promises).finally(() => {
@@ -171,7 +171,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
 
         const promises = [];
 
-        promises.push(this.messagesProvider.getDiscussions().then((discussions) => {
+        promises.push(this.messagesProvider.getDiscussions(this.siteId).then((discussions) => {
             // Convert to an array for sorting.
             const discussionsSorted = [];
             for (const userId in discussions) {
@@ -184,7 +184,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
             });
         }));
 
-        promises.push(this.messagesProvider.getUnreadConversationCounts());
+        promises.push(this.messagesProvider.getUnreadConversationCounts(this.siteId));
 
         return Promise.all(promises).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
@@ -216,7 +216,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         this.loaded = false;
         this.loadingMessage = this.search.loading;
 
-        return this.messagesProvider.searchMessages(query).then((searchResults) => {
+        return this.messagesProvider.searchMessages(query, undefined, undefined, undefined, this.siteId).then((searchResults) => {
             this.search.showResults = true;
             this.search.results = searchResults.messages;
         }).catch((error) => {

src/core/login/pages/init/init.ts

@@ -55,7 +55,8 @@ export class CoreLoginInitPage {
                                 .then((loggedIn) => {
 
                             if (loggedIn) {
-                                return this.navCtrl.setRoot(redirectData.page, redirectData.params, { animate: false });
+                                return this.loginHelper.goToSiteInitialPage(this.navCtrl, redirectData.page, redirectData.params,
+                                        { animate: false });
                             }
                         }).catch(() => {
                             // Site doesn't exist.

src/core/login/pages/reconnect/reconnect.ts

@@ -146,12 +146,8 @@ export class CoreLoginReconnectPage {
                     // Reset fields so the data is not in the view anymore.
                     this.credForm.controls['password'].reset();
 
-                    if (this.pageName) {
-                        // Page defined, go to that page instead of site initial page.
-                        return this.navCtrl.setRoot(this.pageName, this.pageParams);
-                    } else {
-                        return this.loginHelper.goToSiteInitialPage();
-                    }
+                    // Go to the site initial page.
+                    return this.loginHelper.goToSiteInitialPage(this.navCtrl, this.pageName, this.pageParams);
                 }).catch((error) => {
                     // Error, go back to login page.
                     this.domUtils.showErrorModalDefault(error, 'core.login.errorupdatesite', true);

src/core/login/providers/helper.ts

@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Platform, AlertController } from 'ionic-angular';
+import { Platform, AlertController, NavController, NavOptions } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreAppProvider } from '@providers/app';
 import { CoreConfigProvider } from '@providers/config';
@@ -416,14 +416,20 @@ export class CoreLoginHelperProvider {
     /**
      * Go to the initial page of a site depending on 'userhomepage' setting.
      *
+     * @param {NavController} [navCtrl] NavController to use. Defaults to app root NavController.
+     * @param {string} [page] Name of the page to load after loading the main page.
+     * @param {any} [params] Params to pass to the page.
+     * @param {NavOptions} [options] Navigation options.
      * @return {Promise<any>} Promise resolved when done.
      */
-    goToSiteInitialPage(): Promise<any> {
+    goToSiteInitialPage(navCtrl?: NavController, page?: string, params?: any, options?: NavOptions): Promise<any> {
+        navCtrl = navCtrl || this.appProvider.getRootNavController();
+
         // Due to DeepLinker, we need to remove the path from the URL before going to main menu.
         // IonTabs checks the URL to determine which path to load for deep linking, so we clear the URL.
         this.location.replaceState('');
 
-        return this.appProvider.getRootNavController().setRoot('CoreMainMenuPage');
+        return navCtrl.setRoot('CoreMainMenuPage', { redirectPage: page, redirectParams: params }, options);
     }
 
     /**