sync changes

4 files changed, 2 insertions, 394 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 84e3d00..1210094 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -179,34 +179,32 @@ KOPrefs::KOPrefs() :
   addItemFont("EditBox Font",&mEditBoxFont);
   addItemFont("JournalView Font",&mJornalViewFont);
   addItemFont("WhatsNextView Font",&mWhatsNextFont);
   addItemFont("EventView Font",&mEventViewFont);
 
 //   KPrefs::setCurrentGroup("SyncProfiles");
 //   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
 //   addItemStringList("SyncProfileNames",&mSyncProfileNames);
 //   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
 //   addItemBool("UsePasswd",&mUsePassWd,false); 
 //   addItemBool("WriteBackFile",&mWriteBackFile,true);
 //   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
 //   addItemBool("AskForPreferences",&mAskForPreferences,true); 
 //   addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
-  addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); 
-  addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); 
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
   addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3); 
   addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 //   addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
 //   addItemString("RemoteUser",&mRemoteUser, "zaurus");
 //   addItemString("RemotePassWd",&mRemotePassWd, "");
 //   addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index d9ac851..ff09e19 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -265,34 +265,33 @@ class KOPrefs : public KPimPrefs
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
 
-    QString mPassiveSyncPort;
-    QString mPassiveSyncPw;
+  
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
 
     //US I copied the following settings into KPimGlobalPrefs
     // that allows us later to easily remove the settings from here.
     int mPreferredDate;
     QString mUserDateFormatLong;
     QString mUserDateFormatShort;
     int mPreferredLanguage;
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9104347..e3324ee 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -117,33 +117,32 @@ class KOex2phonePrefs : public QDialog
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
     mPassWordPiSync = "abc";
 #ifdef DESKTOP_VERSION
     setFont( QFont("Arial"), 14 );
 #endif
-    mSyncActionDialog = 0;
     mServerSocket = 0;
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KOrganizer/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
    //  if ( QApplication::desktop()->height() > 480 ) {
 //         if ( p->mHourSize == 4 )
 //             p->mHourSize = 6;
 //     }
@@ -2334,336 +2333,16 @@ void MainWindow::syncPhone()
         save();
     mView->syncPhone();
     slotModifiedChanged( true );
 
 }
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
-
-
-KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
-{
-    mPassWord = pw;
-    mSocket = 0;
-    mSyncActionDialog = 0;
-    blockRC = false;
-};
-
-void KServerSocket::newConnection ( int socket ) 
-{
-    // qDebug("KServerSocket:New connection %d ", socket); 
-    if ( mSocket ) {
-        qDebug("KServerSocket::newConnection Socket deleted! ");
-        delete mSocket;
-        mSocket = 0;
-    }
-    mSocket = new QSocket( this );
-    connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
-    connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
-    mSocket->setSocket( socket );
-}
-
-void KServerSocket::discardClient()
-{
-    //qDebug(" KServerSocket::discardClient()");
-    if ( mSocket ) {
-        delete mSocket;
-        mSocket = 0;
-    }
-    //emit endConnect();
-}
-void KServerSocket::readClient()
-{
-    if ( blockRC )
-        return;
-    if ( mSocket == 0 ) {
-        qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
-        return;
-    }
-    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 );
-                send_file();
-            else {
-                KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
-                qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
-            }
-        } 
-        if ( tokens[0] == "PUT" ) {
-            if (  tokens[1] == mPassWord ) {
-                //emit getFile( mSocket );
-                blockRC = true;
-                get_file();
-            }
-            else {
-                KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
-                qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
-            }
-        } 
-        if ( tokens[0] == "STOP" ) {
-            //emit endConnect();
-            end_connect();
-        }
-    }
-}
-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 );
-    QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
-    lay->addWidget( label);
-    lay->setMargin(7);
-    lay->setSpacing(7);
-    mSyncActionDialog->setFixedSize( 230, 120);
-    mSyncActionDialog->show();
-    qDebug("KSS::saving ... ");
-    emit saveFile();
-    qApp->processEvents();
-    QString fileName = mFileName;
-    QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
-        delete mSyncActionDialog;
-        mSyncActionDialog = 0;
-        qDebug("KSS::error open file ");
-        mSocket->close();
-        if ( mSocket->state() == QSocket::Idle )
-            QTimer::singleShot( 10, this , SLOT ( discardClient()));
-        return ;
-        
-    } 
-    mSyncActionDialog->setCaption( i18n("Sending file...") );
-    QTextStream ts( &file );
-    ts.setCodec( QTextCodec::codecForName("utf8") );
-    QTextStream os( mSocket );
-    os.setCodec( QTextCodec::codecForName("utf8") );
-    //os.setEncoding( QTextStream::UnicodeUTF8 );
-    while ( ! ts.atEnd() ) {
-        os << ts.readLine() << "\n";
-    }
-    //os << ts.read();
-    file.close();
-    mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
-    mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
-        QTimer::singleShot( 10, this , SLOT ( discardClient()));
-}
-void KServerSocket::get_file()
-{
-    mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
-   
-    piTime.start();
-    piFileString = "";
-    QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
-}
-
-
-void KServerSocket::readBackFileFromSocket()
-{
-    //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
-    while ( mSocket->canReadLine ()  ) {
-        piTime.restart();
-        QString line = mSocket->readLine ();
-        piFileString += line;
-        //qDebug("readline: %s ", line.latin1());
-        mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length()  ) );
-
-    }
-    if ( piTime.elapsed () < 3000 ) {
-        // wait for more 
-        //qDebug("waitformore ");
-        QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
-        return;
-    }
-    QString fileName = mFileName;
-    QFile file ( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
-        delete mSyncActionDialog;
-        mSyncActionDialog = 0;
-        qDebug("error open cal file ");
-        piFileString = "";
-        emit file_received( false );
-        blockRC = false;
-        return ;
-                    
-    } 
-
-    // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
-    QTextStream ts ( &file );
-    ts.setCodec( QTextCodec::codecForName("utf8") );
-    mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
-    ts << piFileString;
-    mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
-        QTimer::singleShot( 10, this , SLOT ( discardClient()));
-    file.close(); 
-    delete mSyncActionDialog;
-    mSyncActionDialog = 0;
-    piFileString = "";
-    blockRC = false;
-    emit file_received( true );
-
-}
-
-KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
-{
-    mPassWord = password;
-    mSocket = 0;
-    mPort = port;
-    mHost = host;
-
-    mRetVal = quiet;
-    mTimerSocket = new QTimer ( this );
-    connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
-}
-void KCommandSocket::readFile( QString fn )
-{
-    if ( !mSocket ) {
-        mSocket = new QSocket( this );
-        connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
-        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
-    }
-    mFileString = "";
-    mFileName = fn;
-    mFirst = true;
-    mSocket->connectToHost( mHost, mPort ); 
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::UnicodeUTF8 );
-    os << "GET " << mPassWord << "\r\n";
-    mTimerSocket->start( 10000 );
-}
-
-void KCommandSocket::writeFile( QString fileName  )
-{
-    if ( !mSocket ) {
-        mSocket = new QSocket( this );
-        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
-        connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
-    }
-    mFileName = fileName ;
-    mSocket->connectToHost( mHost, mPort ); 
-}
-void KCommandSocket::writeFileToSocket()
-{
-    QFile file2( mFileName );
-    if (!file2.open( IO_ReadOnly ) ) {
-        mRetVal= errorW;
-        mSocket->close();
-        if ( mSocket->state() == QSocket::Idle )
-            QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-        return ;
-    }  
-    QTextStream ts2( &file2 );
-    ts2.setCodec( QTextCodec::codecForName("utf8") );
-    QTextStream os2( mSocket );
-    os2.setCodec( QTextCodec::codecForName("utf8") );
-    os2 << "PUT " << mPassWord << "\r\n";;
-    while ( ! ts2.atEnd() ) {
-        os2 << ts2.readLine() << "\n";
-    }
-    mRetVal= successW;
-    file2.close();
-    mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
-        QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-}
-void KCommandSocket::sendStop()
-{
-    if ( !mSocket ) {
-        mSocket = new QSocket( this );
-        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
-    }
-    mSocket->connectToHost( mHost, mPort ); 
-    QTextStream os2( mSocket );
-    os2.setCodec( QTextCodec::codecForName("utf8") );
-    os2 << "STOP\r\n";
-    mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
-        QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-}
-
-void KCommandSocket::startReadFileFromSocket()
-{
-    if ( ! mFirst )
-        return;
-    mFirst = false;
-    mTimerSocket->stop();
-    mFileString = "";
-    mTime.start();
-    QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
-
-}
-void KCommandSocket::readFileFromSocket()
-{
-    //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
-    while ( mSocket->canReadLine ()  ) {
-        mTime.restart();
-        QString line = mSocket->readLine ();
-        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 );
-    if (!file.open( IO_WriteOnly ) ) {
-        mFileString = "";
-        mRetVal = errorR;
-        qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
-        deleteSocket();
-        return ;
-                    
-    } 
-    // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
-    QTextStream ts ( &file );
-    ts.setCodec( QTextCodec::codecForName("utf8") );
-    ts << mFileString;
-    file.close();  
-    mFileString = "";
-    mRetVal = successR;
-    mSocket->close();
-    // if state is not idle, deleteSocket(); is called via 
-    //  connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
-    if ( mSocket->state() == QSocket::Idle )
-        deleteSocket();
-}
-
-void KCommandSocket::deleteSocket()
-{
-    if ( mTimerSocket->isActive () ) {
-      mTimerSocket->stop();
-      KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? "));
-      mRetVal = errorR;
-    }
-    //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); 
-    if ( mSocket)
-        delete mSocket;
-    mSocket = 0; 
-    emit commandFinished( this, mRetVal );
-}
-
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 4f89e03..0da0be0 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,107 +1,40 @@
 #ifndef KORGE_MAINWINDOW_H
 #define KORGE_MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qtimer.h>
 #include <qdict.h>
 #include <qfile.h>
-#include <qsocket.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
 #include "simplealarmclient.h"
+#include <ksyncmanager.h>
 
 class QAction;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
 #define QPEToolBar QToolBar
 #define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
-#include <qserversocket.h> 
-#include <qsocket.h>
-#include <qnetworkprotocol.h>
 
-class KServerSocket : public QServerSocket
-{
-    Q_OBJECT
-
-public:
-    KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
-
-    void newConnection ( int socket ) ;
-    void setFileName( QString fn  ) {mFileName = fn;};
-   
-signals:
-    //void sendFile(QSocket*); 
-    //void getFile(QSocket*); 
-    void file_received( bool );
-    //void file_sent();
-    void saveFile();
-    void endConnect();
-private slots:
-    void discardClient();
-    void readClient();
-    void readBackFileFromSocket();
- private :
-    bool blockRC;
-    void send_file();
-    void get_file();
-    void end_connect();
-    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, quiet };
-    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
-    void readFile( QString );
-    void writeFile( QString );
-    void sendStop();
-    
-   
-signals:
-    void commandFinished( KCommandSocket*, int );
-private slots:
-    void startReadFileFromSocket();
-    void readFileFromSocket();
-    void deleteSocket();
-    void writeFileToSocket();
- private :
-    QSocket* mSocket; 
-    QString mPassWord;
-    Q_UINT16 mPort;
-    QString mHost;
-    QString mFileName;
-    QTimer* mTimerSocket;
-    int mRetVal;
-    QTime mTime;
-    QString mFileString;
-    bool mFirst;
-};
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
@@ -196,21 +129,20 @@ class MainWindow : public QMainWindow
     
     QAction *mShowAction;
     QAction *mEditAction;
     QAction *mDeleteAction;
     QAction *mCloneAction;
     QAction *mMoveAction;
     QAction *mBeamAction;
     QAction *mCancelAction;
 
 
     void closeEvent( QCloseEvent* ce );
     SimpleAlarmClient mAlarmClient;
     QTimer mSaveTimer;
     bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
-    QDialog * mSyncActionDialog;
 };
 
 
 #endif