added "connecting" state to RemoteConnector

Author: Skycoder42

src/datasync/changecontroller.cpp

@@ -73,6 +73,7 @@ void ChangeController::setRemoteStatus(RemoteConnector::RemoteState state, const
 		emit updateSyncState(SyncController::Disconnected);
 		remoteReady = false;
 		break;
+	case RemoteConnector::RemoteConnecting:
 	case RemoteConnector::RemoteLoadingState:
 		emit updateSyncState(SyncController::Loading);
 		remoteReady = false;

src/datasync/remoteconnector.h

@@ -26,7 +26,8 @@ class Q_DATASYNC_EXPORT RemoteConnector : public QObject
 	//! Describes the current state of the connector
 	enum RemoteState {
 		RemoteDisconnected,//!< The remote server is "not available"
-		RemoteLoadingState,//!< The remote is available, and the remote state is currently beeing loaded
+		RemoteConnecting,//!< The controller is currently trying to connect to the remote (may result in disconnected or loading states)
+		RemoteLoadingState,//!< The remote is available (or trying to connect to it), and the remote state is currently beeing loaded
 		RemoteReady//!< The remote state was successfully loaded and the connector is ready for synchronization
 	};
 	Q_ENUM(RemoteState)

src/datasync/wsauthenticator.cpp

@@ -134,8 +134,22 @@ RemoteConnector *WsAuthenticator::connector()
 
 void WsAuthenticator::updateConnected(int connected)
 {
-	d->connected = (connected != RemoteConnector::RemoteDisconnected);
-	emit connectedChanged(connected);
+	auto cOld = d->connected;
+	switch (connected) {
+	case RemoteConnector::RemoteDisconnected:
+	case RemoteConnector::RemoteConnecting:
+		d->connected = false;
+		break;
+	case RemoteConnector::RemoteLoadingState:
+	case RemoteConnector::RemoteReady:
+		d->connected = true;
+		break;
+	default:
+		Q_UNREACHABLE();
+		break;
+	}
+	if(d->connected != cOld)
+		emit connectedChanged(connected);
 }
 
 WsAuthenticatorPrivate::WsAuthenticatorPrivate(WsRemoteConnector *connector) :

src/datasync/wsremoteconnector.cpp

@@ -91,11 +91,12 @@ void WsRemoteConnector::reconnect()
 		emit clearAuthenticationError();
 		state = Connecting;
 		settings->sync();
+		emit remoteStateChanged(RemoteConnecting);
 
 		auto remoteUrl = settings->value(keyRemoteUrl).toUrl();
 		if(!remoteUrl.isValid() || !settings->value(keyRemoteEnabled, true).toBool()) {
 			state = Disconnected;
-			remoteStateChanged(RemoteDisconnected);
+			emit remoteStateChanged(RemoteDisconnected);
 			return;
 		}
 
@@ -144,7 +145,7 @@ void WsRemoteConnector::reloadRemoteState()
 		reconnect();
 		break;
 	case Idle:
-		remoteStateChanged(RemoteLoadingState);
+		emit remoteStateChanged(RemoteLoadingState);
 		if(needResync)
 			emit performLocalReset(false);//direct connected, thus "inline"
 		state = Reloading;
@@ -346,6 +347,7 @@ void WsRemoteConnector::error()
 {
 	qCWarning(LOG) << "Socket error"
 				   << socket->errorString();
+	emit remoteStateChanged(RemoteDisconnected);
 	socket->close();
 }
 
@@ -356,8 +358,10 @@ void WsRemoteConnector::sslErrors(const QList<QSslError> &errors)
 					   << error.errorString();
 	}
 
-	if(settings->value(keyVerifyPeer, true).toBool())
+	if(settings->value(keyVerifyPeer, true).toBool()) {
+		emit remoteStateChanged(RemoteDisconnected);
 		socket->close();
+	}
 }
 
 void WsRemoteConnector::sendCommand(const QByteArray &command, const QJsonValue &data)

tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp

@@ -94,12 +94,13 @@ void WsRemoteConnectorTest::testServerConnecting()
 	auth->setUserIdentity("invalid");
 	auth->reconnect();
 
-	QVERIFY(conSpy.wait());
-	QVERIFY(!auth->isConnected());
-	for(auto i = 0; i < 10 && syncSpy.count() < 1; i++)
+	for(auto i = 0; i < 10 && syncSpy.count() < 3; i++)
 		syncSpy.wait(500);
-	QCOMPARE(syncSpy.count(), 1);
+	QVERIFY(!auth->isConnected());
+	QCOMPARE(syncSpy.count(), 3);
 	QCOMPARE(syncSpy[0][0], QVariant::fromValue(SyncController::Disconnected));
+	QCOMPARE(syncSpy[1][0], QVariant::fromValue(SyncController::Loading));
+	QCOMPARE(syncSpy[2][0], QVariant::fromValue(SyncController::Disconnected));
 	QCOMPARE(controller->syncState(), SyncController::Disconnected);
 
 	//now connect again, but reset id first
@@ -123,9 +124,8 @@ void WsRemoteConnectorTest::testServerConnecting()
 	syncSpy.clear();
 	auth->reconnect();
 
-	QVERIFY(conSpy.wait());
-	QVERIFY(!auth->isConnected());
-	QVERIFY(conSpy.wait());
+	QVERIFY(conSpy.wait());//disconnect
+	QVERIFY(conSpy.wait());//reconnect
 	QVERIFY(auth->isConnected());
 	for(auto i = 0; i < 10 && syncSpy.count() < 4; i++)
 		syncSpy.wait(500);