Merge branch 'iosInvalidSignatures' into 'master'

Ios invalid signatures

See merge request !112

CustomModels/channelmodel.cpp

@@ -149,6 +149,9 @@ bool ChannelModel::addChannel( const QSharedPointer<RocketChatChannel> &channel
         connect( channel.data(), &RocketChatChannel::channelDeleted, this, &ChannelModel::onDeleted, Qt::UniqueConnection );
         duplicateCheck.insert( channel->getRoomId() );
         int pos = channelList.findPosition( channel );
+        if(pos <0){
+            pos = 0;
+        }
         beginInsertRows( QModelIndex(), pos, pos );
         channelList.insertSort( channel );
         endInsertRows();

CustomModels/channelmodel.h

@@ -78,7 +78,7 @@ class ChannelModel : public QAbstractListModel
         void unreadMessagesChanged( void );
 
     public slots:
-        void addChannelSlot( const QSharedPointer<RocketChatChannel> & );
+        void addChannelSlot(const QSharedPointer<RocketChatChannel> &);
 
 };
 

engine.pro

@@ -255,6 +255,7 @@ android{
 
 
 ios{
+
     QT += gui-private
 
     SOURCES += websocket/linuxwebsocket/websocketlinux.cpp \

notifications/ios/applepushnotifications.cpp

@@ -32,7 +32,7 @@ ApplePushNotifications::ApplePushNotifications()
     connect( mNotificationInstance, &IosNotificationReceiver::switchChannelByName, this, &ApplePushNotifications::onSwitchRequest );
 }
 
-void ApplePushNotifications::receiveMessage( const QString &pServer, const QString &pRid, const QString &pName, const QString &pType )
+void ApplePushNotifications::receiveMessage(QString pServer, QString pRid,QString pName,QString pType )
 {
     emit messageReceived( pServer, pRid, pName, pType );
 }
@@ -60,7 +60,7 @@ void ApplePushNotifications::checkForPendingMessages()
     emit switchChannelByName( mRoomName );
 }
 
-void ApplePushNotifications::onSwitchRequest( const QString &pName )
+void ApplePushNotifications::onSwitchRequest( QString pName )
 {
     mRoomName = pName;
     emit switchChannelByName( pName );

notifications/ios/applepushnotifications.h

@@ -22,7 +22,7 @@
 
 #ifndef APPLEPUSHNOTIFICATIONS_H
 #define APPLEPUSHNOTIFICATIONS_H
-#include "notifications/notificationabstract.h"
+#include "../notificationabstract.h"
 #include "iosdevicetokenstorage.h"
 #include "iosnotificationreceiver.h"
 
@@ -31,11 +31,11 @@ class ApplePushNotifications: public NotificationAbstract
     public:
         virtual void registerWithService();
         ApplePushNotifications();
-        void receiveMessage( const QString &server, const QString &rid, const QString &name, const QString &type );
+        void receiveMessage( QString server, QString rid, QString name, QString type );
 
         void checkForPendingMessages();
 
-        void onSwitchRequest( const QString &pName );
+        void onSwitchRequest( QString pName );
     protected:
         void receiveToken();
 

notifications/notificationabstract.cpp

@@ -22,6 +22,11 @@
 
 #include "notificationabstract.h"
 
+NotificationAbstract::NotificationAbstract()
+{
+
+}
+
 QString NotificationAbstract::getToken() const
 {
     return mToken;

notifications/notificationabstract.h

@@ -29,7 +29,7 @@ class NotificationAbstract : public QObject
 {
         Q_OBJECT
     public:
-        NotificationAbstract() = default;
+        NotificationAbstract();
 
         virtual void registerWithService() = 0;
 

notifications/notifications.cpp

@@ -25,7 +25,7 @@
 #include "notifications/android/googlepushnotifications.h"
 #endif
 #ifdef Q_OS_IOS
-#include "notifications/ios/ApplePushNotifications.h"
+#include "notifications/ios/applepushnotifications.h"
 #endif
 #include "QDebug"