-rw-r--r-- | libkdepim/ksyncmanager.cpp | 24 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 08a263c..5214fe7 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1061,25 +1061,28 @@ void KSyncManager::syncPi() | |||
1061 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1061 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1062 | mPisyncFinished = true; | 1062 | mPisyncFinished = true; |
1063 | return; | 1063 | return; |
1064 | } | 1064 | } |
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 | ||
1070 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1070 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1071 | { | 1071 | { |
1072 | //enum { success, errorW, errorR, quiet }; | 1072 | //enum { success, errorW, errorR, quiet }; |
1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ) { |
1074 | if ( state == KCommandSocket::errorPW ) | ||
1075 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | ||
1076 | else | ||
1074 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1077 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1075 | delete s; | 1078 | delete s; |
1076 | if ( state == KCommandSocket::errorR ) { | 1079 | if ( state == KCommandSocket::errorR ) { |
1077 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1080 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1078 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1081 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1079 | commandSocket->sendStop(); | 1082 | commandSocket->sendStop(); |
1080 | } | 1083 | } |
1081 | mPisyncFinished = true; | 1084 | mPisyncFinished = true; |
1082 | return; | 1085 | return; |
1083 | 1086 | ||
1084 | } else if ( state == KCommandSocket::errorW ) { | 1087 | } else if ( state == KCommandSocket::errorW ) { |
1085 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1088 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
@@ -1192,24 +1195,33 @@ void KServerSocket::readClient() | |||
1192 | } | 1195 | } |
1193 | else { | 1196 | else { |
1194 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1197 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); |
1195 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1198 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1196 | } | 1199 | } |
1197 | } | 1200 | } |
1198 | if ( tokens[0] == "STOP" ) { | 1201 | if ( tokens[0] == "STOP" ) { |
1199 | //emit endConnect(); | 1202 | //emit endConnect(); |
1200 | end_connect(); | 1203 | end_connect(); |
1201 | } | 1204 | } |
1202 | } | 1205 | } |
1203 | } | 1206 | } |
1207 | void KServerSocket::error_connect() | ||
1208 | { | ||
1209 | QTextStream os( mSocket ); | ||
1210 | os.setEncoding( QTextStream::Latin1 ); | ||
1211 | os << "ERROR_PW\r\n\r\n"; | ||
1212 | mSocket->close(); | ||
1213 | if ( mSocket->state() == QSocket::Idle ) | ||
1214 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
1215 | } | ||
1204 | void KServerSocket::end_connect() | 1216 | void KServerSocket::end_connect() |
1205 | { | 1217 | { |
1206 | delete mSyncActionDialog; | 1218 | delete mSyncActionDialog; |
1207 | mSyncActionDialog = 0; | 1219 | mSyncActionDialog = 0; |
1208 | } | 1220 | } |
1209 | void KServerSocket::send_file() | 1221 | void KServerSocket::send_file() |
1210 | { | 1222 | { |
1211 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1223 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1212 | if ( mSyncActionDialog ) | 1224 | if ( mSyncActionDialog ) |
1213 | delete mSyncActionDialog; | 1225 | delete mSyncActionDialog; |
1214 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1226 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1215 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1227 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
@@ -1342,24 +1354,25 @@ void KServerSocket::readBackFileFromSocket() | |||
1342 | emit file_received( true ); | 1354 | emit file_received( true ); |
1343 | delete mSyncActionDialog; | 1355 | delete mSyncActionDialog; |
1344 | mSyncActionDialog = 0; | 1356 | mSyncActionDialog = 0; |
1345 | blockRC = false; | 1357 | blockRC = false; |
1346 | 1358 | ||
1347 | } | 1359 | } |
1348 | 1360 | ||
1349 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1361 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1350 | { | 1362 | { |
1351 | mPassWord = password; | 1363 | mPassWord = password; |
1352 | mSocket = 0; | 1364 | mSocket = 0; |
1353 | mFirst = false; | 1365 | mFirst = false; |
1366 | mFirstLine = true; | ||
1354 | mPort = port; | 1367 | mPort = port; |
1355 | mHost = host; | 1368 | mHost = host; |
1356 | tlw = cap; | 1369 | tlw = cap; |
1357 | mRetVal = quiet; | 1370 | mRetVal = quiet; |
1358 | mTimerSocket = new QTimer ( this ); | 1371 | mTimerSocket = new QTimer ( this ); |
1359 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1372 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); |
1360 | } | 1373 | } |
1361 | void KCommandSocket::sendFileRequest() | 1374 | void KCommandSocket::sendFileRequest() |
1362 | { | 1375 | { |
1363 | if ( tlw ) | 1376 | if ( tlw ) |
1364 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1377 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1365 | mTimerSocket->start( 300000 ); | 1378 | mTimerSocket->start( 300000 ); |
@@ -1439,33 +1452,42 @@ void KCommandSocket::sendStop() | |||
1439 | if ( mSocket->state() == QSocket::Idle ) | 1452 | if ( mSocket->state() == QSocket::Idle ) |
1440 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1453 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1441 | } | 1454 | } |
1442 | 1455 | ||
1443 | void KCommandSocket::startReadFileFromSocket() | 1456 | void KCommandSocket::startReadFileFromSocket() |
1444 | { | 1457 | { |
1445 | if ( ! mFirst ) | 1458 | if ( ! mFirst ) |
1446 | return; | 1459 | return; |
1447 | mFirst = false; | 1460 | mFirst = false; |
1448 | mTimerSocket->stop(); | 1461 | mTimerSocket->stop(); |
1449 | mFileString = ""; | 1462 | mFileString = ""; |
1450 | mTime.start(); | 1463 | mTime.start(); |
1464 | mFirstLine = true; | ||
1451 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1465 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1452 | 1466 | ||
1453 | } | 1467 | } |
1454 | void KCommandSocket::readFileFromSocket() | 1468 | void KCommandSocket::readFileFromSocket() |
1455 | { | 1469 | { |
1456 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1470 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1457 | while ( mSocket->canReadLine () ) { | 1471 | while ( mSocket->canReadLine () ) { |
1458 | mTime.restart(); | 1472 | mTime.restart(); |
1459 | QString line = mSocket->readLine (); | 1473 | QString line = mSocket->readLine (); |
1474 | if ( mFirstLine ) { | ||
1475 | mFirstLine = false; | ||
1476 | if ( line.left( 8 ) == "ERROR_PW" ) { | ||
1477 | mRetVal = errorPW; | ||
1478 | deleteSocket(); | ||
1479 | return ; | ||
1480 | } | ||
1481 | } | ||
1460 | mFileString += line; | 1482 | mFileString += line; |
1461 | //qDebug("readline: %s ", line.latin1()); | 1483 | //qDebug("readline: %s ", line.latin1()); |
1462 | } | 1484 | } |
1463 | if ( mTime.elapsed () < 3000 ) { | 1485 | if ( mTime.elapsed () < 3000 ) { |
1464 | // wait for more | 1486 | // wait for more |
1465 | //qDebug("waitformore "); | 1487 | //qDebug("waitformore "); |
1466 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1488 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1467 | return; | 1489 | return; |
1468 | } | 1490 | } |
1469 | QString fileName = mFileName; | 1491 | QString fileName = mFileName; |
1470 | QFile file ( fileName ); | 1492 | QFile file ( fileName ); |
1471 | if (!file.open( IO_WriteOnly ) ) { | 1493 | if (!file.open( IO_WriteOnly ) ) { |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 09bd1c1..810a515 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -53,37 +53,38 @@ class KServerSocket : public QServerSocket | |||
53 | void request_file(); | 53 | void request_file(); |
54 | void saveFile(); | 54 | void saveFile(); |
55 | void endConnect(); | 55 | void endConnect(); |
56 | private slots: | 56 | private slots: |
57 | void discardClient(); | 57 | void discardClient(); |
58 | void readClient(); | 58 | void readClient(); |
59 | void readBackFileFromSocket(); | 59 | void readBackFileFromSocket(); |
60 | private : | 60 | private : |
61 | bool blockRC; | 61 | bool blockRC; |
62 | void send_file(); | 62 | void send_file(); |
63 | void get_file(); | 63 | void get_file(); |
64 | void end_connect(); | 64 | void end_connect(); |
65 | void error_connect(); | ||
65 | QDialog* mSyncActionDialog; | 66 | QDialog* mSyncActionDialog; |
66 | QSocket* mSocket; | 67 | QSocket* mSocket; |
67 | QString mPassWord; | 68 | QString mPassWord; |
68 | QString mFileName; | 69 | QString mFileName; |
69 | QTime piTime; | 70 | QTime piTime; |
70 | QString piFileString; | 71 | QString piFileString; |
71 | }; | 72 | }; |
72 | 73 | ||
73 | class KCommandSocket : public QObject | 74 | class KCommandSocket : public QObject |
74 | { | 75 | { |
75 | Q_OBJECT | 76 | Q_OBJECT |
76 | public: | 77 | public: |
77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; | 78 | enum state { successR, errorR, successW, errorW, errorTO, errorPW,quiet }; |
78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 79 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
79 | void readFile( QString ); | 80 | void readFile( QString ); |
80 | void writeFile( QString ); | 81 | void writeFile( QString ); |
81 | void sendStop(); | 82 | void sendStop(); |
82 | 83 | ||
83 | private slots : | 84 | private slots : |
84 | void sendFileRequest(); | 85 | void sendFileRequest(); |
85 | 86 | ||
86 | signals: | 87 | signals: |
87 | void commandFinished( KCommandSocket*, int ); | 88 | void commandFinished( KCommandSocket*, int ); |
88 | private slots: | 89 | private slots: |
89 | void startReadFileFromSocket(); | 90 | void startReadFileFromSocket(); |
@@ -93,24 +94,25 @@ class KCommandSocket : public QObject | |||
93 | private : | 94 | private : |
94 | QWidget* tlw; | 95 | QWidget* tlw; |
95 | QSocket* mSocket; | 96 | QSocket* mSocket; |
96 | QString mPassWord; | 97 | QString mPassWord; |
97 | Q_UINT16 mPort; | 98 | Q_UINT16 mPort; |
98 | QString mHost; | 99 | QString mHost; |
99 | QString mFileName; | 100 | QString mFileName; |
100 | QTimer* mTimerSocket; | 101 | QTimer* mTimerSocket; |
101 | int mRetVal; | 102 | int mRetVal; |
102 | QTime mTime; | 103 | QTime mTime; |
103 | QString mFileString; | 104 | QString mFileString; |
104 | bool mFirst; | 105 | bool mFirst; |
106 | bool mFirstLine; | ||
105 | }; | 107 | }; |
106 | 108 | ||
107 | 109 | ||
108 | class KSyncManager : public QObject | 110 | class KSyncManager : public QObject |
109 | { | 111 | { |
110 | Q_OBJECT | 112 | Q_OBJECT |
111 | 113 | ||
112 | public: | 114 | public: |
113 | enum TargetApp { | 115 | enum TargetApp { |
114 | KOPI = 0, | 116 | KOPI = 0, |
115 | KAPI = 1, | 117 | KAPI = 1, |
116 | PWMPI = 2 }; | 118 | PWMPI = 2 }; |