2 files changed, 47 insertions, 21 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 452f1bc..a7967cb 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2802,98 +2802,123 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
                         qDebug("Error writing back AB to file ");
                     if ( isXML ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
                     }
                 }
         }
         setModified();
         
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
-#if 0
 
-    if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
-        getEventViewerDialog()->setSyncMode( true );
-        syncOK = synchronizeCalendar( mCalendar, calendar, mode );
-        getEventViewerDialog()->setSyncMode( false );
-        if (  syncOK ) {
-           if ( KOPrefs::instance()->mWriteBackFile )
-            {
-                storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
-                storage->save();
-            }
-        }
-        setModified();
-    }
-  
-#endif
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
+    if (  resource == "phone" )
+        return syncPhone();
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
-
-void KABCore::getFile( bool success )
+void KABCore::message( QString m )
 {
+    
+    topLevelWidget()->setCaption( m );
     QTimer::singleShot( 15000, this , SLOT ( setCaptionBack()));
+}
+bool KABCore::syncPhone()
+{
+    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
+    QString fileName;
+#ifdef _WIN32_
+    fileName = locateLocal("tmp", "phonefile.vcf");
+#else
+    fileName = "/tmp/phonefile.vcf";
+#endif
+    if ( !PhoneAccess::readFromPhone( fileName) ) {
+        message(i18n("Phone access failed!"));
+        return false;
+    }   
+    AddressBook abLocal( fileName,"syncContact");
+    bool syncOK = false;
+    if ( abLocal.load() ) {
+        qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
+        mGlobalSyncMode = SYNC_MODE_EXTERNAL;
+        abLocal.preparePhoneSync( mCurrentSyncDevice, true );
+        abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
+        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
+        if (  syncOK ) {
+            if ( syncManager->mWriteBackFile ) {
+                abLocal.saveABphone( fileName );
+                abLocal.preparePhoneSync( mCurrentSyncDevice, false );
+                abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
+                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
+            }
+        }
+        setModified();
+    }
+    if ( syncOK )
+        mViewManager->refreshView();
+    return syncOK;
+}
+void KABCore::getFile( bool success )
+{
     if ( ! success ) {
-        setCaption( i18n("Error receiving file. Nothing changed!") );
+        message( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mAddressBook->importFromFile( sentSyncFile() , false, true );
-    topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
+    message( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
     mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef _WIN32_
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {
     topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 43c5f99..04ce33d 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -443,41 +443,42 @@ class KABCore : public QWidget, public KSyncInterface
     QPopupMenu *settingsMenu;
     QPopupMenu *changeMenu;
 //US    QAction *mActionSave;
     QPopupMenu *ImportMenu;
     QPopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
     KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
 
     class KABCorePrivate;
     KABCorePrivate *d;
     //US    bool mBlockSaveFlag;
 
 #ifdef KAB_EMBEDDED
     KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
 
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
     virtual bool syncExternal(KSyncManager* manager, QString resource);
-
+    bool syncPhone();
+    void message( QString m );
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
     QPopupMenu *syncMenu;
     KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
     // *********************
 
 };
 
 #endif