summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp22
-rw-r--r--libkdepim/ksyncmanager.h2
2 files changed, 17 insertions, 7 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 47d00a4..d59f4a4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1065,33 +1065,35 @@ void KSyncManager::syncPi()
1065 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); 1065 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
1066 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); 1066 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
1067 commandSocket->readFile( syncFileName() ); 1067 commandSocket->readFile( syncFileName() );
1068} 1068}
1069 1069
1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
1071{ 1071{
1072 //enum { success, errorW, errorR, quiet }; 1072 //enum { success, errorW, errorR, quiet };
1073 1073
1074 1074
1075 1075
1076 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || 1076 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
1077 state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) { 1077 state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
1078 if ( state == KCommandSocket::errorPW ) 1078 if ( state == KCommandSocket::errorPW )
1079 mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); 1079 mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
1080 else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) 1080 else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
1081 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); 1081 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
1082 else if ( state == KCommandSocket::errorCA ) 1082 else if ( state == KCommandSocket::errorCA )
1083 mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); 1083 mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
1084 else if ( state == KCommandSocket::errorFI ) 1084 else if ( state == KCommandSocket::errorFI )
1085 mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); 1085 mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
1086 else if ( state == KCommandSocket::errorED )
1087 mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") );
1086 else if ( state == KCommandSocket::errorUN ) 1088 else if ( state == KCommandSocket::errorUN )
1087 mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); 1089 mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
1088 delete s; 1090 delete s;
1089 if ( state == KCommandSocket::errorR ) { 1091 if ( state == KCommandSocket::errorR ) {
1090 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); 1092 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
1091 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); 1093 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
1092 commandSocket->sendStop(); 1094 commandSocket->sendStop();
1093 } 1095 }
1094 mPisyncFinished = true; 1096 mPisyncFinished = true;
1095 return; 1097 return;
1096 1098
1097 } else if ( state == KCommandSocket::errorW ) { 1099 } else if ( state == KCommandSocket::errorW ) {
@@ -1174,25 +1176,25 @@ void KServerSocket::deleteSocket()
1174 QTimer::singleShot( 10, this , SLOT ( displayErrorMessage())); 1176 QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
1175} 1177}
1176void KServerSocket::readClient() 1178void KServerSocket::readClient()
1177{ 1179{
1178 if ( blockRC ) 1180 if ( blockRC )
1179 return; 1181 return;
1180 if ( mSocket == 0 ) { 1182 if ( mSocket == 0 ) {
1181 qDebug("ERROR::KSS::readClient(): mSocket == 0 "); 1183 qDebug("ERROR::KSS::readClient(): mSocket == 0 ");
1182 return; 1184 return;
1183 } 1185 }
1184 if ( mErrorMessage ) { 1186 if ( mErrorMessage ) {
1185 mErrorMessage = 999; 1187 mErrorMessage = 999;
1186 error_connect("ERROR_UN\r\n\r\n"); 1188 error_connect("ERROR_ED\r\n\r\n");
1187 return; 1189 return;
1188 } 1190 }
1189 mErrorMessage = 0; 1191 mErrorMessage = 0;
1190 //qDebug("KServerSocket::readClient()"); 1192 //qDebug("KServerSocket::readClient()");
1191 if ( mSocket->canReadLine() ) { 1193 if ( mSocket->canReadLine() ) {
1192 QString line = mSocket->readLine(); 1194 QString line = mSocket->readLine();
1193 //qDebug("KServerSocket readline: %s ", line.latin1()); 1195 //qDebug("KServerSocket readline: %s ", line.latin1());
1194 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); 1196 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
1195 if ( tokens[0] == "GET" ) { 1197 if ( tokens[0] == "GET" ) {
1196 if ( tokens[1] == mPassWord ) { 1198 if ( tokens[1] == mPassWord ) {
1197 //emit sendFile( mSocket ); 1199 //emit sendFile( mSocket );
1198 bool ok = false; 1200 bool ok = false;
@@ -1220,29 +1222,32 @@ void KServerSocket::readClient()
1220 error_connect("ERROR_PW\r\n\r\n"); 1222 error_connect("ERROR_PW\r\n\r\n");
1221 end_connect(); 1223 end_connect();
1222 } 1224 }
1223 } 1225 }
1224 if ( tokens[0] == "STOP" ) { 1226 if ( tokens[0] == "STOP" ) {
1225 //emit endConnect(); 1227 //emit endConnect();
1226 end_connect(); 1228 end_connect();
1227 } 1229 }
1228 } 1230 }
1229} 1231}
1230void KServerSocket::displayErrorMessage() 1232void KServerSocket::displayErrorMessage()
1231{ 1233{
1232 if ( mErrorMessage == 1 ) 1234 if ( mErrorMessage == 1 ) {
1233 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); 1235 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
1234 else if ( mErrorMessage == 2 ) 1236 mErrorMessage = 0;
1237 }
1238 else if ( mErrorMessage == 2 ) {
1235 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); 1239 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
1236 mErrorMessage = 0; 1240 mErrorMessage = 0;
1241 }
1237} 1242}
1238void KServerSocket::error_connect( QString errmess ) 1243void KServerSocket::error_connect( QString errmess )
1239{ 1244{
1240 QTextStream os( mSocket ); 1245 QTextStream os( mSocket );
1241 os.setEncoding( QTextStream::Latin1 ); 1246 os.setEncoding( QTextStream::Latin1 );
1242 os << errmess ; 1247 os << errmess ;
1243 mSocket->close(); 1248 mSocket->close();
1244 if ( mSocket->state() == QSocket::Idle ) { 1249 if ( mSocket->state() == QSocket::Idle ) {
1245 QTimer::singleShot( 0, this , SLOT ( discardClient())); 1250 QTimer::singleShot( 0, this , SLOT ( discardClient()));
1246 } 1251 }
1247} 1252}
1248void KServerSocket::end_connect() 1253void KServerSocket::end_connect()
@@ -1256,25 +1261,25 @@ void KServerSocket::send_file()
1256 if ( mSyncActionDialog ) 1261 if ( mSyncActionDialog )
1257 delete mSyncActionDialog; 1262 delete mSyncActionDialog;
1258 mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); 1263 mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
1259 mSyncActionDialog->setCaption(i18n("Received sync request")); 1264 mSyncActionDialog->setCaption(i18n("Received sync request"));
1260 QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); 1265 QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
1261 label->setAlignment ( Qt::AlignHCenter ); 1266 label->setAlignment ( Qt::AlignHCenter );
1262 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); 1267 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
1263 lay->addWidget( label); 1268 lay->addWidget( label);
1264 lay->setMargin(7); 1269 lay->setMargin(7);
1265 lay->setSpacing(7); 1270 lay->setSpacing(7);
1266 if ( KSyncManager::mRequestedSyncEvent.isValid() ) { 1271 if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
1267 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); 1272 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
1268 secs = 333; 1273 //secs = 333;
1269 if ( secs < 0 ) 1274 if ( secs < 0 )
1270 secs = secs * (-1); 1275 secs = secs * (-1);
1271 if ( secs > 30 ) 1276 if ( secs > 30 )
1272 //if ( true ) 1277 //if ( true )
1273 { 1278 {
1274 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); 1279 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
1275 QLabel* label = new QLabel( warning, mSyncActionDialog ); 1280 QLabel* label = new QLabel( warning, mSyncActionDialog );
1276 label->setAlignment ( Qt::AlignHCenter ); 1281 label->setAlignment ( Qt::AlignHCenter );
1277 lay->addWidget( label); 1282 lay->addWidget( label);
1278 if ( secs > 180 ) 1283 if ( secs > 180 )
1279 { 1284 {
1280 if ( secs > 300 ) { 1285 if ( secs > 300 ) {
@@ -1512,24 +1517,29 @@ void KCommandSocket::readFileFromSocket()
1512 return ; 1517 return ;
1513 } 1518 }
1514 if ( line.left( 8 ) == "ERROR_CA" ) { 1519 if ( line.left( 8 ) == "ERROR_CA" ) {
1515 mRetVal = errorCA; 1520 mRetVal = errorCA;
1516 deleteSocket(); 1521 deleteSocket();
1517 return ; 1522 return ;
1518 } 1523 }
1519 if ( line.left( 8 ) == "ERROR_FI" ) { 1524 if ( line.left( 8 ) == "ERROR_FI" ) {
1520 mRetVal = errorFI; 1525 mRetVal = errorFI;
1521 deleteSocket(); 1526 deleteSocket();
1522 return ; 1527 return ;
1523 } 1528 }
1529 if ( line.left( 8 ) == "ERROR_ED" ) {
1530 mRetVal = errorED;
1531 deleteSocket();
1532 return ;
1533 }
1524 mRetVal = errorUN; 1534 mRetVal = errorUN;
1525 deleteSocket(); 1535 deleteSocket();
1526 return ; 1536 return ;
1527 } 1537 }
1528 } 1538 }
1529 mFileString += line; 1539 mFileString += line;
1530 //qDebug("readline: %s ", line.latin1()); 1540 //qDebug("readline: %s ", line.latin1());
1531 } 1541 }
1532 if ( mTime.elapsed () < 3000 ) { 1542 if ( mTime.elapsed () < 3000 ) {
1533 // wait for more 1543 // wait for more
1534 //qDebug("waitformore "); 1544 //qDebug("waitformore ");
1535 QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); 1545 QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index bd3ecdc..30ec1e6 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -69,25 +69,25 @@ class KServerSocket : public QServerSocket
69 QDialog* mSyncActionDialog; 69 QDialog* mSyncActionDialog;
70 QSocket* mSocket; 70 QSocket* mSocket;
71 QString mPassWord; 71 QString mPassWord;
72 QString mFileName; 72 QString mFileName;
73 QTime piTime; 73 QTime piTime;
74 QString piFileString; 74 QString piFileString;
75}; 75};
76 76
77class KCommandSocket : public QObject 77class KCommandSocket : public QObject
78{ 78{
79 Q_OBJECT 79 Q_OBJECT
80 public: 80 public:
81 enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet }; 81 enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet };
82 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); 82 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 );
83 void readFile( QString ); 83 void readFile( QString );
84 void writeFile( QString ); 84 void writeFile( QString );
85 void sendStop(); 85 void sendStop();
86 86
87 private slots : 87 private slots :
88 void sendFileRequest(); 88 void sendFileRequest();
89 89
90 signals: 90 signals:
91 void commandFinished( KCommandSocket*, int ); 91 void commandFinished( KCommandSocket*, int );
92 private slots: 92 private slots:
93 void startReadFileFromSocket(); 93 void startReadFileFromSocket();