Merge branch 'master' into filesRepo

notifications/notificationabstract.h

@@ -44,9 +44,9 @@ class NotificationAbstract : public QObject
         QString mToken;
 
     signals:
-        void tokenReceived( const QString &pToken );
-        void messageReceived( const QString &pServer, const QString &pRid, const QString &pName, const QString &pType );
-        void switchChannelByName( const QString &pChannel );
+        void tokenReceived( QString pToken );
+        void messageReceived( QString pServer, QString pRid, QString pName, QString pType );
+        void switchChannelByName( QString &pChannel );
 
 };
 

rocketchat.cpp

@@ -291,6 +291,9 @@ void RocketChat::clearWebViewCookies()
 #if defined(Q_OS_ANDROID)
     AndroidCookies::clearAllCookies();
 #endif
+#if defined(Q_OS_IOS)
+    emit clearAllCookies();
+#endif
 }
 
 bool RocketChat::newServerByDomain( const QString &domain, bool pUnsecure = false )

rocketchat.h

@@ -259,6 +259,7 @@ class RocketChat : public QObject
         void openGallery();
         void checkForpendingNotificationIOS();
         void registerForPushIOS();
+        void clearAllCookies();
 };
 
 #endif // ROCKETCHAT_H