socket fix

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
@@ -1061,41 +1061,43 @@ void KSyncManager::syncPi()
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         mPisyncFinished = true;
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
     commandSocket->readFile(  syncFileName() );
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     //enum { success, errorW, errorR, quiet };
 
 
 
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
-         state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) {
+         state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
         if ( state == KCommandSocket::errorPW )
             mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
             mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorCA )
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
         else if ( state == KCommandSocket::errorFI )
             mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
+        else if ( state == KCommandSocket::errorED )
+            mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") );
         else if ( state == KCommandSocket::errorUN )
             mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
         delete s;
         if ( state == KCommandSocket::errorR ) {
             KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             commandSocket->sendStop();
         }
         mPisyncFinished = true;
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
         mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
         mPisyncFinished = true;
 
     } else  if ( state == KCommandSocket::successR ) {
@@ -1170,33 +1172,33 @@ void KServerSocket::deleteSocket()
         delete mSocket;
         mSocket = 0;
     }
     if ( mErrorMessage )
         QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
 }
 void KServerSocket::readClient()
 {
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KSS::readClient(): mSocket == 0  ");
         return;
     }
     if ( mErrorMessage ) {
         mErrorMessage = 999;
-        error_connect("ERROR_UN\r\n\r\n");
+        error_connect("ERROR_ED\r\n\r\n");
         return;
     }
     mErrorMessage = 0;
     //qDebug("KServerSocket::readClient()");
     if ( mSocket->canReadLine() ) {
         QString line = mSocket->readLine();
         //qDebug("KServerSocket readline: %s ", line.latin1());
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
         if ( tokens[0] == "GET" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit sendFile( mSocket );
                 bool ok = false;
                 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
                 if ( ok ) {
                     KSyncManager::mRequestedSyncEvent = dt; 
                 }
@@ -1216,69 +1218,72 @@ void KServerSocket::readClient()
                 get_file();
             }
             else {
                 mErrorMessage = 2;
                 error_connect("ERROR_PW\r\n\r\n");
                 end_connect();
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::displayErrorMessage()
 {
-    if ( mErrorMessage == 1 )
+    if ( mErrorMessage == 1 ) {
         KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
-    else if ( mErrorMessage == 2 )
+        mErrorMessage = 0;
+    }
+    else if ( mErrorMessage == 2 ) {
         KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
-    mErrorMessage = 0;
+        mErrorMessage = 0;
+    }
 }
 void KServerSocket::error_connect( QString errmess )
 {
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
     os << errmess ;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle ) {
         QTimer::singleShot( 0, this , SLOT ( discardClient()));
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
     //qDebug("MainWindow::sendFile(QSocket* s) ");
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
     mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
     mSyncActionDialog->setCaption(i18n("Received sync request"));
     QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); 
     label->setAlignment ( Qt::AlignHCenter );
     QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
     if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
         int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
-        secs = 333;
+        //secs = 333;
         if ( secs < 0 )
              secs = secs * (-1);
         if ( secs > 30 ) 
             //if ( true ) 
             {
                 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
                 QLabel* label = new QLabel( warning, mSyncActionDialog ); 
                 label->setAlignment ( Qt::AlignHCenter );
                 lay->addWidget( label);
                 if ( secs > 180 )
                     {
                         if ( secs > 300 ) {
                             if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
                                 qDebug("KSS::Sync cancelled ,cs"); 
                                 mErrorMessage = 0;
                                 end_connect();
@@ -1508,32 +1513,37 @@ void KCommandSocket::readFileFromSocket()
             if (  line.left( 6 ) == "ERROR_" ) {
                 if (  line.left( 8 ) == "ERROR_PW" ) {
                     mRetVal = errorPW;
                     deleteSocket();
                     return ;
                 }
                 if (  line.left( 8 ) == "ERROR_CA" ) {
                     mRetVal = errorCA;
                     deleteSocket();
                     return ;
                 }
                 if (  line.left( 8 ) == "ERROR_FI" ) {
                     mRetVal = errorFI;
                     deleteSocket();
                     return ;
                 }
+                if (  line.left( 8 ) == "ERROR_ED" ) {
+                    mRetVal = errorED;
+                    deleteSocket();
+                    return ;
+                }
                 mRetVal = errorUN;
                 deleteSocket();
                 return ;
             }
         }
         mFileString += line;
         //qDebug("readline: %s ", line.latin1());
     }
     if ( mTime.elapsed () < 3000 ) {
         // wait for more 
         //qDebug("waitformore ");
         QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
         return;
     }
     QString fileName = mFileName;
     QFile file ( fileName );
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index bd3ecdc..30ec1e6 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -65,33 +65,33 @@ class KServerSocket : public QServerSocket
     void send_file();
     void get_file();
     void end_connect();
     void error_connect( QString );
     QDialog* mSyncActionDialog;
     QSocket* mSocket; 
     QString mPassWord;
     QString mFileName; 
     QTime piTime;
     QString piFileString;
 };
 
 class KCommandSocket : public QObject
 {
     Q_OBJECT
         public:
-    enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet };
+    enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet };
     KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget*  cap = 0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
 
  private slots :
     void sendFileRequest();
        
  signals:
     void commandFinished( KCommandSocket*, int );
     private slots:
     void startReadFileFromSocket();
     void readFileFromSocket();
     void deleteSocket();
     void writeFileToSocket();
  private :