more AB sync

9 files changed, 141 insertions, 57 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3a2dc5f..fda62f1 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -46,48 +46,49 @@ static bool matchBinaryPattern( int value, int pattern );
 
 struct Addressee::AddresseeData : public KShared
 {
   QString uid;
   QString name;
   QString formattedName;
   QString familyName;
   QString givenName;
   QString additionalName;
   QString prefix;
   QString suffix;
   QString nickName;
   QDateTime birthday;
   QString mailer;
   TimeZone timeZone;
   Geo geo;
   QString title;
   QString role;
   QString organization;
   QString note;
   QString productId;
   QDateTime revision;
   QString sortString;
   QString externalUID;
+  QString originalExternalUID;
   KURL url;
   Secrecy secrecy;
   Picture logo;
   Picture photo;
   Sound sound;
   Agent agent;
   QString mExternalId;
   PhoneNumber::List phoneNumbers;
   Address::List addresses;
   Key::List keys;
   QStringList emails;
   QStringList categories;
   QStringList custom;
   int mTempSyncStat;
   Resource *resource;
 
   bool empty    :1;
   bool changed  :1;
 };
 
 Addressee::Addressee()
 {
   mData = new AddresseeData;
   mData->empty = true;
@@ -352,48 +353,60 @@ QString Addressee::getCsum( const QString &  prof)
 
 void Addressee::setIDStr( const QString & s )
 { 
     detach();
     mData->mExternalId = s;
 }
 
 QString Addressee::IDStr() const
 {
     return mData->mExternalId;
 }
 
 void Addressee::setExternalUID( const QString &id )
 {
   if ( id == mData->externalUID ) return;
   detach();
   mData->empty = false;
   mData->externalUID = id;
 }
 
 QString Addressee::externalUID() const
 {
   return mData->externalUID;
 }
+void Addressee::setOriginalExternalUID( const QString &id )
+{
+  if ( id == mData->originalExternalUID ) return;
+  detach();
+  mData->empty = false;
+  mData->originalExternalUID = id;
+}
+
+QString Addressee::originalExternalUID() const
+{
+  return mData->originalExternalUID;
+}
 
 void Addressee::setUid( const QString &id )
 {
   if ( id == mData->uid ) return;
   detach();
   mData->empty = false;
   mData->uid = id;
 }
 
 QString Addressee::uid() const
 {
   if ( mData->uid.isEmpty() )
     mData->uid = KApplication::randomString( 10 );
 
   return mData->uid;
 }
 
 QString Addressee::uidLabel()
 {
   return i18n("Unique Identifier");
 }
 
 void Addressee::setName( const QString &name )
 {
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 3ba7777..8baa888 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -93,48 +93,50 @@ class Addressee
 
     Addressee( const Addressee & );
     Addressee &operator=( const Addressee & );
 
     bool operator==( const Addressee & ) const;
     bool operator!=( const Addressee & ) const;
     // sync stuff
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     QString IDStr() const;
     void setID( const QString &, const QString & );
     QString  getID( const QString & );
     void setCsum( const QString &, const QString & );
     QString getCsum( const QString & );
     void removeID(const QString &);
     void computeCsum(const QString &dev);
     ulong getCsum4List( const QStringList &  attList);
     /**
       Return, if the address book entry is empty.
      */
     bool isEmpty() const;
     void setExternalUID( const QString &id );
     QString externalUID() const;
+    void setOriginalExternalUID( const QString &id );
+    QString originalExternalUID() const;
     void mergeContact(  const Addressee& ad ); 
     /**
       Set unique identifier.
      */
     void setUid( const QString &uid );
     /**
       Return unique identifier.
      */
     QString uid() const;
     /**
       Return translated label for uid field.
      */
     static QString uidLabel();
 
     /**
       Set name.
      */
     void setName( const QString &name );
     /**
       Return name.
      */
     QString name() const;
     /**
       Return translated label for name field.
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 148da2a..c0aa960 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,27 +1,27 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 
 TARGET = microkabc_qtopia
 
-INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
+INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpepim
 LIBS += -lqpe
 
 INTERFACES = \
 
 HEADERS = \
  resourceqtopia.h \
  resourceqtopiaconfig.h \
  qtopiaconverter.h
 
 SOURCES = \
  resourceqtopia.cpp \
  resourceqtopiaconfig.cpp \
  qtopiaconverter.cpp 
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 7d00a3f..de45e63 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -11,92 +11,96 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 //US
 #include "kglobal.h"
 
 
 #include "qtopiaconverter.h"
 
 #include <qpe/categories.h>
+#include <libkdepim/ksyncprofile.h>
 //US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 
 QtopiaConverter::QtopiaConverter() : catDB(0)
 {
 }
 
 QtopiaConverter::~QtopiaConverter()
 {
   deinit();
 }
 
 bool QtopiaConverter::init()
 {
   catDB = new Categories();
 
   if (!catDB)
     return false;
 
   catDB->load( categoryFileName() );
   return true;
 }
 
 void QtopiaConverter::deinit()
 {
   if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
 }
 
 bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &addr )
 {
     // name
     addr.setFormattedName(contact.fileAs());
     addr.setFamilyName( contact.lastName() );
     addr.setGivenName( contact.firstName() );
     addr.setAdditionalName( contact.middleName() );
     addr.setPrefix( contact.nameTitle() );
     addr.setSuffix( contact.suffix() );
+
+    addr.setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
     QString exuid = contact.uid().toString();
+    addr.setOriginalExternalUID( exuid );
     int ente = exuid.find( "-0000");
     if ( exuid.left(1) == "{" )
         exuid = exuid.mid(1);
     if ( ente > -1 )
         exuid = exuid.left( ente-1 );
     addr.setExternalUID( exuid );
     //qDebug("QtopiaConverter:set uid %s ",addr.externalUID().latin1() );
 
     // email
     QStringList emails = contact.emailList();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
     }
 
     if (!contact.defaultEmail().isEmpty())
       addr.insertEmail(contact.defaultEmail(), true);
 
     // home
     if ((!contact.homeStreet().isEmpty()) ||
         (!contact.homeCity().isEmpty()) ||
         (!contact.homeState().isEmpty()) ||
         (!contact.homeZip().isEmpty()) ||
         (!contact.homeCountry().isEmpty()))
     {
@@ -230,48 +234,51 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
 
     addr.setNote( contact.notes() );
 
 
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
     QArray<int> catArray = contact.categories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label("contact", catArray[i]);
       if ( cat.isEmpty() )
         addr.insertCategory(QString::number(catArray[i]));
       else
         addr.insertCategory( cat );
     }
 
     return true;
 }
 
 bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &contact )
 {
+
+
+    
     // name
     contact.setLastName(addr.familyName());
     contact.setFirstName(addr.givenName());
     contact.setMiddleName(addr.additionalName());
     contact.setNameTitle(addr.prefix());
     contact.setSuffix(addr.suffix());
     contact.setFileAs();
 
 
     // email
     QStringList emails = addr.emails();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       contact.insertEmail(*it);
     }
     contact.setDefaultEmail( addr.preferredEmail() );
 
 
     // home
     const Address homeaddress = addr.address(Address::Home);
     if (!homeaddress.isEmpty()) {
       contact.setHomeStreet(homeaddress.street());
       contact.setHomeCity(homeaddress.locality());
       contact.setHomeState(homeaddress.region());
       contact.setHomeZip(homeaddress.postalCode());
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 8f4c698..012a6e2 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -10,48 +10,49 @@
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_QTOPIACONVERTER_H
 #define KABC_QTOPIACONVERTER_H
 
 #include <qstring.h>
 
 #include "addressee.h"
 #include <qpe/pim/contact.h>
+#include <qpe/quuid.h>
 
 class Categories;
 
 namespace KABC {
 
 class QtopiaConverter
 {
 public:
 
   /**
    * Constructor.
    */
   QtopiaConverter();
 
   /**
    * Destructor.
    */
   virtual ~QtopiaConverter();
   
   bool init();
   void deinit();
   
   /**
    * Converts a vcard string to an addressee.
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 48a9f22..935a1cf 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -31,48 +31,50 @@ $Id$
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include <qpe/pim/addressbookaccess.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 #include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
+#include <libkdepim/ksyncprofile.h>
+#include <qpe/quuid.h>
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_qtopia()
   {
     return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidgetContainer>();
   }
 }
 
 ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
   : Resource( config, syncable ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
   init( fileName );
 }
 
 ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
   init( fileName );
 }
 
@@ -168,80 +170,102 @@ bool ResourceQtopia::load()
   AddressBookIterator it(*mAccess);
   const PimContact* contact;
   bool res;
 
   for (contact=it.toFirst(); it.current(); ++it)
   {
     contact = it.current();
 
     KABC::Addressee addressee;
 
     res = mConverter->qtopiaToAddressee( (*contact), addressee );
 
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
   }
 
   return true;
 }
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
-  qDebug("ResourceQtopia::save: %s", fileName().latin1());
-
-  mDirWatch.stopScan();
-
-  KABC::AddressBook::Iterator it;
-  bool res;
-
-  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
-    PimContact c;
-    KABC::Addressee addressee = (*it);
-
-    res = mConverter->addresseeToQtopia( *it, c );
-    if (res == true)
-    {
-      mAccess->addContact(c);
-//      if (res == false)
-//        qDebug("Unable to append Contact %s", c.fullName().latin1());
+    qDebug("ResourceQtopia::save: %s", fileName().latin1());
+
+    mDirWatch.stopScan();
+
+    KABC::AddressBook::Iterator it;
+    bool res;
+
+    for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+        //KABC::Addressee addressee = (*it);
+        if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+            QUuid uid( (*it).originalExternalUID() );
+            bool ok;
+            PimContact c = mAccess->contactForId( uid, &ok );
+            res = mConverter->addresseeToQtopia( *it, c );
+            if (res == true) {
+                if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) {
+                    mAccess->addContact(c);
+                    KABC::Addressee addressee;
+                    mConverter->qtopiaToAddressee( c, addressee );
+                    addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
+                    addressBook()->insertAddressee( addressee );
+
+                } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+                    if (  ok ) 
+                        mAccess->removeContact(c);
+                    else
+                        qDebug("Error revoe contact from qtopia ");
+                } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+                    if (  ok ) {
+                        mAccess->updateContact(c);
+                        KABC::Addressee addressee;
+                        mConverter->qtopiaToAddressee( c, addressee );
+                        addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+                        addressBook()->insertAddressee( addressee );
+                    }
+                    else
+                        qDebug("Error update contact from qtopia ");
+                        
+                }
+       
+            }  else {
+                qDebug("Unable to convert Addressee %s", (*it).formattedName().latin1());
+            }
+        }
     }
-    else
-    {
-      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
-    }
-  }
 
-//  mAccess->addressBookUpdated();
+    //  mAccess->addressBookUpdated();
 
-  mDirWatch.startScan();
+    mDirWatch.startScan();
 
-  delete ticket;
-  unlock( fileName() );
+    delete ticket;
+    unlock( fileName() );
 
-  return true;
+    return true;
 }
 
 bool ResourceQtopia::lock( const QString &lockfileName )
 {
   qDebug("ResourceQtopia::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
     return false;
   }
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d6482fb..b3d88de 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2731,76 +2731,82 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     Addressee inR ;//= er.first();
     Addressee  inL;
     QProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
-        QString idS;
+        QString idS,OidS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->findByUid( uid );
             inR = remote->findByUid( uid );
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
                 if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
                     //qDebug("take %d %s ", take, inL.summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                             local->insertAddressee(  inL, false );
+                            idS = inR.externalUID();
+                            OidS = inR.originalExternalUID();
                         }
                         else
                             idS = inR.IDStr();
                         remote->removeAddressee( inR );
                         inR = inL;
                         inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
-                        if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
+                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                            inR.setOriginalExternalUID( OidS );
+                            inR.setExternalUID( idS );
+                        } else {
                             inR.setIDStr( idS );
+                        }
                         inR.setResource( 0 );
                         remote->insertAddressee(  inR , false);
                         ++changedRemote;
-                    } else {
+                    } else { // take == 2  take remote
                         idS = inL.IDStr();
                         local->removeAddressee( inL );
                         inL = inR;
                         inL.setIDStr( idS );
                         inL.setResource( 0 );
                         local->insertAddressee(  inL , false );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
                     if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         remote->insertAddressee( inR, false );
                         ++deletedAddresseeR; 
                     } else {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
                         inL = inR;
                         inL.setResource( 0 );
                         local->insertAddressee( inL , false);
                         ++addedAddressee;
                     }
@@ -2833,49 +2839,49 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         uid = el[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
             inR = remote->findByUid( uid );
             if ( inR.isEmpty() ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                         local->removeAddressee( inL );
                         ++deletedAddresseeL; 
                     } else {
                         if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
                             inL.removeID(mCurrentSyncDevice );
                             ++addedAddresseeR;
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
-                            inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
+                            inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
                             inR.setResource( 0 );
                             remote->insertAddressee( inR, false );
                         }
                     }
                 } else {
                     if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                         // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                         local->removeAddressee( inL );
                         ++deletedAddresseeL; 
                     } else {
                         if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
                             ++addedAddresseeR; 
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
                             inR.setResource( 0 );
                             remote->insertAddressee( inR, false );
                         }
                     }
                 }
             }
         }
         ++incCounter;
     }
@@ -2898,89 +2904,118 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
     if ( KABPrefs::instance()->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
     }
     qDebug( mes );
     return syncOK;
 }
 
 bool KABCore::syncAB(QString filename, int mode)
 {
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
         bool external = false;
-        Addressee lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
-        if ( ! lse.isEmpty() ) {
-            if ( lse.familyName().left(4) == "!E: " )
-                external = true;
-        } else {
-            bool found = false;
-            QDateTime dt( QDate( 2004,1,1));
-            AddressBook::Iterator it;
-            for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
-                if ( (*it).revision() != dt ) {
-                    found = true;
-                    break;
-                }
-            }
-            external = ! found;
-        }
 
-        if ( external ) {
-            qDebug("Setting vcf mode to external ");
+        if ( filename.right(4) == ".xml") {
             mGlobalSyncMode = SYNC_MODE_EXTERNAL;
             AddressBook::Iterator it;  
             for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
-                (*it).setID( mCurrentSyncDevice, (*it).uid() );
+                (*it).setID( mCurrentSyncDevice, (*it).externalUID() );
                 (*it).computeCsum( mCurrentSyncDevice );
             }
+            abLocal.mergeAB( mAddressBook ,mCurrentSyncDevice );
+
+        } else {
+            Addressee lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
+            if ( ! lse.isEmpty() ) {
+                if ( lse.familyName().left(4) == "!E: " )
+                    external = true;
+            } else {
+                bool found = false;
+                QDateTime dt( QDate( 2004,1,1));
+                AddressBook::Iterator it;
+                for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
+                    if ( (*it).revision() != dt ) {
+                        found = true;
+                        break;
+                    }
+                }
+                external = ! found;
+            }
+
+            if ( external ) {
+                qDebug("Setting vcf mode to external ");
+                mGlobalSyncMode = SYNC_MODE_EXTERNAL;
+                AddressBook::Iterator it;  
+                for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
+                    (*it).setID( mCurrentSyncDevice, (*it).uid() );
+                    (*it).computeCsum( mCurrentSyncDevice );
+                }
+            }
         }
         //AddressBook::Iterator it;
         //QStringList vcards;
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
-        if ( filename.right(4) == ".xml")
-            abLocal.mergeAB( mAddressBook ,mCurrentSyncDevice );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
             if ( KABPrefs::instance()->mWriteBackFile )
                 {
-                    if ( external )
+                    if ( external && filename.right(4) != ".xml")
                         abLocal.removeDeletedAddressees();
                     qDebug("Saving remote AB ");
                     abLocal.saveAB();
+                    if ( external && filename.right(4) == ".xml") {
+                        // afterwrite processing
+                        AddressBook::Iterator it;  
+                        for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
+                            if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
+                                 (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
+                                Addressee ad = mAddressBook->findByUid( ( (*it).uid() ));
+                                if ( ad.isEmpty() ) {
+                                    qDebug("ERROR ad empty ");
+                                } else {
+                                    (*it).computeCsum( mCurrentSyncDevice );
+                                    if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
+                                        ad.setID( mCurrentSyncDevice, (*it).externalUID() );
+                                    ad.setCsum( mCurrentSyncDevice, (*it).getCsum( mCurrentSyncDevice ) );
+                                    mAddressBook->insertAddressee( ad );
+                                }
+                            }
+                        }
+                    }
                 }
         }
         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();
     }
   
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index e7fc670..d56eab6 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -525,51 +525,51 @@ bool SharpFormat::save( Calendar *calendar)
             status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getEventString( ev );
             if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
             else  if ( ev->getID("Sharp_DTM").isEmpty()  ) {       // add new 
                 QString fileNameIn = "/tmp/kopitempin";
                 QFile fileIn( fileNameIn );
                 if (!fileIn.open( IO_WriteOnly ) ) {
                     return false;
                 } 
                 QTextStream tsIn( &fileIn );
                 tsIn.setCodec( QTextCodec::codecForName("utf8") );
                 tsIn << ePrefix << eString ;
                 fileIn.close();  
                 //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 command = "(cat /tmp/kopitempin | db2file datebook -w -g -c " + codec+ ") > "+ fileName;
-                qDebug("command ++++++++ ");
-                qDebug("%s ",command.latin1());
-                qDebug("command -------- ");
+                //qDebug("command ++++++++ ");
+                //qDebug("%s ",command.latin1());
+                //qDebug("command -------- ");
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, ev  ) ;
 
             }
             else { // change existing
                 //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() );
                 //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 changeString += eString + "\n";
                 changeEnt = true;
 
             }
         } 
         ev =  er.next();
     }
diff --git a/libkcal/syncdefines.h b/libkcal/syncdefines.h
index 57642ec..704a670 100644
--- a/libkcal/syncdefines.h
+++ b/libkcal/syncdefines.h
@@ -1,22 +1,24 @@
  
 #ifndef _KSYNC_DEFINES_H_
 #define _KSYNC_DEFINES_H_
 
 #define SYNC_PREF_LOCAL 0
 #define SYNC_PREF_REMOTE 1
 #define SYNC_PREF_NEWEST 2
 #define SYNC_PREF_ASK 3
 #define SYNC_PREF_FORCE_LOCAL 4
 #define SYNC_PREF_FORCE_REMOTE 5
 #define SYNC_PREF_TAKE_BOTH 6
 
 #define SYNC_MODE_NORMAL 0
 #define SYNC_MODE_EXTERNAL 1
 
 #define SYNC_TEMPSTATE_INITIAL 0
+#define SYNC_TEMPSTATE_ADDED_EXTERNAL -1
 #define SYNC_TEMPSTATE_NEW_EXTERNAL  -2
 #define SYNC_TEMPSTATE_DELETE -3
 #define SYNC_TEMPSTATE_NEW_ID -4
+#define SYNC_TEMPSTATE_NEW_CSUM -5
 
 
 #endif