Merge pull request #2068 from dpalou/MOBILE-3068

Mobile 3068

src/addon/messages/pages/discussion/discussion.scss

@@ -5,9 +5,6 @@ $item-message-note-font-size: 75% !default;
 $item-message-mine-bg: $gray-light !default;
 
 ion-app.app-root page-addon-messages-discussion {
-    .toolbar-title {
-        padding: 0;
-    }
 
     ion-content {
         background-color: $gray-lighter !important;
@@ -192,6 +189,8 @@ ion-app.app-root page-addon-messages-discussion {
     }
 
     .toolbar-title {
+        padding: 0;
+
         img {
             @include margin-horizontal(null, 6px);
         }
@@ -208,6 +207,10 @@ ion-app.app-root page-addon-messages-discussion {
         ion-icon {
             @include margin-horizontal(6px, null);
         }
+
+        &.toolbar-title-ios {
+            justify-content: center;
+        }
     }
 }
 

src/addon/messages/pages/group-conversations/group-conversations.scss

@@ -40,6 +40,6 @@ ion-app.app-root .addon-message-discussion {
 
 ion-app.app-root .addon-message-discussion {
     h2 {
-        margin-top: 6px;
+        margin-top: 10px;
     }
 }

src/app/app.scss

@@ -674,8 +674,8 @@ ion-app.app-root {
     border-radius: 50%;
   }
 
-  .toolbar-ios {
-    height: 52px;
+  .header .toolbar-ios {
+    height: $toolbar-ios-height;
   }
 
   // Footer with auto height.

src/core/login/login.module.ts

@@ -14,6 +14,7 @@
 
 import { NgModule } from '@angular/core';
 import { CoreLoginHelperProvider } from './providers/helper';
+import { CoreLoginSitesPageModule } from './pages/sites/sites.module';
 
 // List of providers.
 export const CORE_LOGIN_PROVIDERS = [
@@ -24,6 +25,7 @@ export const CORE_LOGIN_PROVIDERS = [
     declarations: [
     ],
     imports: [
+        CoreLoginSitesPageModule
     ],
     providers: CORE_LOGIN_PROVIDERS
 })

src/core/login/pages/sites/sites.module.ts

@@ -27,5 +27,8 @@ import { CoreDirectivesModule } from '@directives/directives.module';
         IonicPageModule.forChild(CoreLoginSitesPage),
         TranslateModule.forChild()
     ],
+    entryComponents: [
+        CoreLoginSitesPage
+    ]
 })
 export class CoreLoginSitesPageModule {}

src/core/pushnotifications/providers/pushnotifications.ts

@@ -342,11 +342,17 @@ export class CorePushNotificationsProvider {
         const win = <any> window; // This feature is only present in our fork of the plugin.
 
         if (CoreConfigConstants.enableanalytics && win.PushNotification && win.PushNotification.logEvent) {
-            return new Promise((resolve, reject): void => {
-                win.PushNotification.logEvent(resolve, (error) => {
-                    this.logger.error('Error logging firebase event', name, error);
-                    resolve();
-                }, name, data, !!filter);
+
+            // Check if the analytics is enabled by the user.
+            return this.configProvider.get(CoreConstants.SETTINGS_ANALYTICS_ENABLED, true).then((enabled) => {
+                if (enabled) {
+                    return new Promise((resolve, reject): void => {
+                        win.PushNotification.logEvent(resolve, (error) => {
+                            this.logger.error('Error logging firebase event', name, error);
+                            resolve();
+                        }, name, data, !!filter);
+                    });
+                }
             });
         }
 

src/providers/sites.ts

@@ -492,6 +492,9 @@ export class CoreSitesProvider {
                 }
 
                 return data;
+            }, (error) => {
+                // Local mobile check returned an error. This only happens if the plugin is installed and it returns an error.
+                return rejectWithCriticalError(error);
             }).then((data) => {
                 siteUrl = temporarySite.getURL();