sync fixes

author: zautrix <zautrix> 2004-10-27 19:44:10 (UTC)
committer: zautrix <zautrix> 2004-10-27 19:44:10 (UTC)
commit: bb82cac85cc196b3f60921ab27e84204036b54b8 (patch) (unidiff)
tree: 518629480b983b6b85a4cf1e5542f94fe1687e41
parent: 85a0e0d9b1d60805cb4947be1c296c18e73c82b8 (diff)
download: kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.zip
kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.tar.gz
kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.tar.bz2
4 files changed, 26 insertions, 13 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 9b196b5..5774c36 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -493,751 +493,762 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
        data.replace ( QRegExp("LABEL") , "ADR" );
        data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
    } else
        data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
    KABC::VCardTool tool;
    list =  tool.parseVCards( data );
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
        if ( !id.isEmpty() ) 
            (*it).setIDStr(id );
        (*it).setResource( 0 );
        if ( replaceLabel )
            (*it).removeVoice();
        if ( removeOld )
            (*it).setTagged( true );
        insertAddressee( (*it), false, true );
    }
    if ( removeOld )
        removeUntagged();
    return list.count();
 }
 void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        if ( setNonSyncTagged ) {
            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
                (*ait).setTagged( true );
            } else
                (*ait).setTagged( false );
        } else
            (*ait).setTagged( false );
    }
 }
 void AddressBook::removeUntagged()
 {
  Iterator ait;
  bool todelete = false;
  Iterator todel;
  for ( ait = begin(); ait != end(); ++ait ) {
      if ( todelete )
          removeAddressee( todel );
      if (!(*ait).tagged()) {
          todelete = true;
          todel = ait;
      } else
          todelete = false;
  } 
  if ( todelete )
      removeAddressee( todel );
  deleteRemovedAddressees();
 }
 void AddressBook::smplifyAddressees() 
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        (*ait).simplifyEmails();
        (*ait).simplifyPhoneNumbers();
        (*ait).simplifyPhoneNumberTypes();
        (*ait).simplifyAddresses();
    }
 }
 void AddressBook::removeSyncInfo( QString syncProfile)
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        (*ait).removeID( syncProfile );
    } 
    if ( syncProfile.isEmpty() ) {
        Iterator it = begin();
        Iterator it2 ;
        QDateTime dt ( QDate( 2004,1,1) );
        while ( it != end() ) {
            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                it2 = it;
                //qDebug("removing %s ",(*it).uid().latin1() );
                ++it;
                removeAddressee( it2 );
            } else  {
                //qDebug("skipping %s ",(*it).uid().latin1() );
                ++it;
            }
        }
    } else { 
        Addressee lse;
        lse =  findByUid( "last-syncAddressee-"+ syncProfile );
        if ( ! lse.isEmpty() )
            removeAddressee( lse );  
    }
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        QString id = (*ait).IDStr();
        (*ait).setIDStr( ":");
        (*ait).setExternalUID( id );
        (*ait).setOriginalExternalUID( id ); 
        if ( isPreSync )
            (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
        else {
            (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
            (*ait).setID( currentSyncDevice,id );
            
        }
    }
 }
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
 
    setUntagged();
    KABC::Addressee::List list;
    QFile file( fileName );
    file.open( IO_ReadOnly );
    QByteArray rawData = file.readAll();
    file.close();
    QString data;
    data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
    KABC::VCardTool tool;
    list =  tool.parseVCards( data );
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        Iterator ait;
        for ( ait = begin(); ait != end(); ++ait ) {
            if ( !(*ait).tagged() ) {
                if ( (*ait).containsAdr(*it)) {
                    (*ait).setTagged(true);
                    QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
                    (*it).setIDStr( ":");
                    (*it).setID( currentSyncDevice,id );
                    (*it).setExternalUID( id );
                    (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
                    (*it).setUid( ( (*ait).uid() ));
                    break;
                }
            }
            
        }
        if ( ait == end() )
            qDebug("ERROR:: no ext ID found for uid: %s", (*it).uid().latin1());      
    }
    clear();
    for ( it = list.begin(); it != list.end(); ++it ) {
        insertAddressee( (*it)  );
    }
 }
 bool AddressBook::saveABphone( QString fileName )
 {
    //smplifyAddressees();
    qDebug("saveABphone:: saving AB... ");
    if ( ! export2PhoneFormat( QStringList() ,fileName ) )
        return false;
    qDebug("saveABphone:: writing to phone... ");   
    if ( !PhoneAccess::writeToPhone( fileName) ) {
        return false;
    }
    qDebug("saveABphone:: re-reading from phone... ");   
    if ( !PhoneAccess::readFromPhone( fileName) ) {
        return false;
    }
    return true;
 }
 bool AddressBook::saveAB()
 {
  bool ok = true;
  deleteRemovedAddressees();
  Iterator ait;
  for ( ait = begin(); ait != end(); ++ait ) {
      if ( !(*ait).IDStr().isEmpty() ) {
          (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
    }
  }
  KRES::Manager<Resource>::ActiveIterator it;
  KRES::Manager<Resource> *manager = d->mManager;
  qDebug("SaveAB::saving..." );
  for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
      qDebug("SaveAB::checking resource..." );
      if ( (*it)->readOnly() )
          qDebug("resource is readonly." );
      if ( (*it)->isOpen() )
          qDebug("resource is open" );
      
    if ( !(*it)->readOnly() && (*it)->isOpen() ) {
      Ticket *ticket = requestSaveTicket( *it );
      qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
      if ( !ticket ) {
        qDebug( i18n( "Unable to save to resource '%1'. It is locked." )
                   .arg( (*it)->resourceName() ) );
        return false;
      }
      //if ( !save( ticket ) ) 
      if ( ticket->resource() ) {
          QString name = ticket->resource()->resourceName();
          if ( ! ticket->resource()->save( ticket )  )
              ok = false;
          else
              qDebug("StdAddressBook::resource saved '%s'", name.latin1() );
              
      } else 
          ok = false;
          
    }
  }
  return ok;
 }
 AddressBook::Iterator AddressBook::begin()
 {
  Iterator it = Iterator();
  it.d->mIt = d->mAddressees.begin();
  return it;
 }
 AddressBook::ConstIterator AddressBook::begin() const
 {
  ConstIterator it = ConstIterator();
  it.d->mIt = d->mAddressees.begin();
  return it;
 }
 AddressBook::Iterator AddressBook::end()
 {
  Iterator it = Iterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 AddressBook::ConstIterator AddressBook::end() const
 {
  ConstIterator it = ConstIterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 void AddressBook::clear()
 {
  d->mAddressees.clear();
 }
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
  kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
  if ( !resource )
  {
    qDebug("AddressBook::requestSaveTicket no resource" );
    resource = standardResource();
  }
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( (*it) == resource ) {
      if ( (*it)->readOnly() || !(*it)->isOpen() )
        return 0;
      else
        return (*it)->requestSaveTicket();
    }
  }
  return 0;
 }
 //void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
 void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource )
 {
    if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
        //qDebug("block insert ");
        return;
    }
    //qDebug("inserting.... %s ",a.uid().latin1() );
    bool found = false;
    Addressee::List::Iterator it;
    for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
        if ( a.uid() == (*it).uid() ) {
       
            bool changed = false;
            Addressee addr = a;
            if ( addr != (*it) )
                changed = true;
            if ( takeResource ) {
                Resource * res = (*it).resource();
                (*it) = a;
                (*it).setResource( res );
            } else {
                (*it) = a;
                if ( (*it).resource() == 0 )
                    (*it).setResource( standardResource() );
            }
            if ( changed ) {
                if ( setRev ) {
              
                    // get rid of micro seconds
                    QDateTime dt =  QDateTime::currentDateTime();
                    QTime t =  dt.time();
                    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
                    (*it).setRevision( dt ); 
                }
                (*it).setChanged( true );
            }
            found = true;
        } else {
            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                QString name = (*it).uid().mid( 19 );
                Addressee b = a;
                QString id = b.getID( name );
                if (  ! id.isEmpty() ) {
                    QString des = (*it).note();
                    int startN;
                    if( (startN = des.find( id ) ) >= 0 ) {
                        int endN = des.find( ",", startN+1 );
                        des =  des.left( startN ) + des.mid( endN+1 );
                        (*it).setNote( des );
                    }
                }
            }
        }
    }
    if ( found )
        return;
    d->mAddressees.append( a );
    Addressee& addr = d->mAddressees.last();
    if ( addr.resource() == 0 )
        addr.setResource( standardResource() );
    addr.setChanged( true );
 }
 void AddressBook::removeAddressee( const Addressee &a )
 {
  Iterator it;
  Iterator it2;
  bool found = false;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
        found = true;
        it2 = it;
    } else {
        if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
            QString name = (*it).uid().mid( 19 );
            Addressee b = a;
            QString id = b.getID( name );
            if ( ! id.isEmpty() ) {
                QString des = (*it).note();
                if( des.find( id ) < 0 ) {
                    des +=   id  + ",";
                    (*it).setNote( des );
                }
            }
        }
        
    }
  }
  if ( found )
      removeAddressee( it2 );
      
 }
 void AddressBook::removeSyncAddressees( bool removeDeleted )
 {
    Iterator it = begin();
    Iterator it2 ;
    QDateTime dt ( QDate( 2004,1,1) );
    while ( it != end() ) {
        (*it).setRevision( dt );
        if (( *it).IDStr() != "changed" ) { 
            // "changed" is used for tagging changed addressees when syncing with KDE or OL
            (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
            (*it).setIDStr("");
        }
        if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted  )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
            it2 = it;
            //qDebug("removing %s ",(*it).uid().latin1() );
            ++it;
            removeAddressee( it2 );
        } else  {
            //qDebug("skipping %s ",(*it).uid().latin1() );
+            if ( removeDeleted ) {
+                // we have no postprocessing in the resource, we have to do it here
+                // we have to compute csum for all, because it could be the first sync
+                (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+              
+            }
            ++it;
        }
    }
    deleteRemovedAddressees();
 }
 void AddressBook::removeAddressee( const Iterator &it )
 {
  d->mRemovedAddressees.append( (*it) );
  d->mAddressees.remove( it.d->mIt );
 }
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
      return it;
    }
  }
  return end();
 }
 Addressee AddressBook::findByUid( const QString &uid )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( uid == (*it).uid() ) {
      return *it;
    }
  }
  return Addressee();
 }
 void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool isSubset )
 {
    //qDebug("AddressBook::preExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
        (*it).setID( csd, (*it).externalUID() );
        (*it).computeCsum( csd );
    }
    mergeAB( aBook ,csd, isSubset );  
 }
-void AddressBook::postExternSync( AddressBook* aBook , const QString& csd)
+void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
    //qDebug("AddressBook::postExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
-        // qDebug("check uid %s ", (*it).uid().latin1() );
+        //qDebug("check uid %s ", (*it).uid().latin1() );
        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
            Addressee ad = aBook->findByUid( ( (*it).uid() ));
            if ( ad.isEmpty() ) {
                qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
            } else {
+                (*it).setIDStr(":");
                (*it).computeCsum( csd );
-                if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
+                if ( setID ) {
-                    ad.setID( csd, (*it).externalUID() );
+                    if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
+                        ad.setID( csd, (*it).externalUID() );
+                } else
+                    ad.setID( csd, "_" );
                ad.setCsum( csd, (*it).getCsum( csd ) );
                aBook->insertAddressee( ad );
            }
        }
    }
 }
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        if ( uid == (*it).externalUID( ) )
            return true;
    }
    return false;
 }
 Addressee   AddressBook::findByExternUid( const QString& uid , const QString& profile  )
 {
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        if ( uid == (*it).getID( profile ) )
            return (*it);
    }
    return Addressee();
 }
 void  AddressBook::mergeAB( AddressBook *aBook, const QString& profile , bool isSubset )
 {
    Iterator it;
    Addressee ad;
    for ( it = begin(); it != end(); ++it ) {
        ad = aBook->findByExternUid( (*it).externalUID(), profile );
            if ( !ad.isEmpty() ) {
                (*it).mergeContact( ad ,isSubset);
            }
    }
 #if 0 
    // test only
    for ( it = begin(); it != end(); ++it ) {
        
        qDebug("uid %s ", (*it).uid().latin1());
    }
 #endif
 }
 #if 0
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
    Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).uid().left( 19 ) == "last-syncAddressee-"  ) {
        if ( (*it).familyName().left(4) == "!E: " )
            results.append( *it );
    }
  }
  return results;
 }
 #endif
 void AddressBook::resetTempSyncStat()
 {
    Iterator it;
  for ( it = begin(); it != end(); ++it ) {
      (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
  }
 }
 
 QStringList AddressBook:: uidList()
 {
    QStringList results;
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        results.append( (*it).uid() );
    }
    return results;
 }
 Addressee::List AddressBook::allAddressees()
 {
   return d->mAddressees; 
 
 }
 Addressee::List AddressBook::findByName( const QString &name )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( name == (*it).realName() ) {
      results.append( *it );
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
  Addressee::List results;
  QStringList mailList;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    mailList = (*it).emails();
    for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
      if ( email == (*ite) ) {
        results.append( *it );
      }
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).hasCategory( category) ) {
      results.append( *it );
    }
  }
  return results;
 }
 void AddressBook::dump() const
 {
  kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl;
  ConstIterator it;
  for( it = begin(); it != end(); ++it ) {
    (*it).dump();
  }
  kdDebug(5700) << "AddressBook::dump() ---  end  ---" << endl;
 }
 QString AddressBook::identifier()
 {
  QStringList identifier;
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( !(*it)->identifier().isEmpty() )
      identifier.append( (*it)->identifier() );
  }
  return identifier.join( ":" );
 }
 Field::List AddressBook::fields( int category )
 {
  if ( d->mAllFields.isEmpty() ) {
    d->mAllFields = Field::allFields();
  }
  if ( category == Field::All ) return d->mAllFields;
  Field::List result;
  Field::List::ConstIterator it;
  for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
    if ( (*it)->category() & category ) result.append( *it );
  }
  return result;
 }
 bool AddressBook::addCustomField( const QString &label, int category,
                                  const QString &key, const QString &app )
 {
  if ( d->mAllFields.isEmpty() ) {
    d->mAllFields = Field::allFields();
  }
 //US  QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
  QString a = app.isNull() ? KGlobal::getAppName() : app;
  QString k = key.isNull() ? label : key;
  Field *field = Field::createCustomField( label, category, k, a );
  if ( !field ) return false;
  d->mAllFields.append( field );
  return true;
 }
 QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 {
  if (!ab.d) return s;
  return s << ab.d->mAddressees;
 }
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
  if (!ab.d) return s;
  s >> ab.d->mAddressees;
  return s;
 }
 bool AddressBook::addResource( Resource *resource )
 {
  if ( !resource->open() ) {
    kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
    return false;
  }
  resource->setAddressBook( this );
  d->mManager->add( resource );
  return true;
 }
 bool AddressBook::removeResource( Resource *resource )
 {
  resource->close();
  if ( resource == standardResource() )
    d->mManager->setStandardResource( 0 );
  resource->setAddressBook( 0 );
  d->mManager->remove( resource );
  return true;
 }
 QPtrList<Resource> AddressBook::resources()
 {
  QPtrList<Resource> list;
 //  qDebug("AddressBook::resources() 1");
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
    list.append( *it );
  return list;
 }
 /*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
  delete d->mErrorHandler;
  d->mErrorHandler = handler;
 }
 */
 void AddressBook::error( const QString& msg )
 {
 /*US
  if ( !d->mErrorHandler ) // create default error handler
    d->mErrorHandler = new ConsoleErrorHandler;
  if ( d->mErrorHandler )
    d->mErrorHandler->error( msg );
  else
    kdError(5700) << "no error handler defined" << endl;
 */
    kdDebug(5700) << "msg" << endl;
    qDebug(msg);
 }
 void AddressBook::deleteRemovedAddressees()
 {
  Addressee::List::Iterator it;
  for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {
    Resource *resource = (*it).resource();
    if ( resource && !resource->readOnly() && resource->isOpen() )
      resource->removeAddressee( *it );
  }
  d->mRemovedAddressees.clear();
 }
 void AddressBook::setStandardResource( Resource *resource )
 {
 //  qDebug("AddressBook::setStandardResource 1");
  d->mManager->setStandardResource( resource );
 }
 Resource *AddressBook::standardResource()
 {
  return d->mManager->standardResource();
 }
 KRES::Manager<Resource> *AddressBook::resourceManager()
 {
  return d->mManager;
 }
 void AddressBook::cleanUp()
 {
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( !(*it)->readOnly() && (*it)->isOpen() )
      (*it)->cleanUp();
  }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index f124dc9..75f8b51 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -1,349 +1,349 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    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_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 #include <qobject.h>
 #include <kresources/manager.h>
 #include <qptrlist.h>
 #include "addressee.h"
 #include "field.h"
 namespace KABC {
 class ErrorHandler;
 class Resource;
 class Ticket;
 /**
  @short Address Book
  This class provides access to a collection of address book entries.
 */
 class AddressBook : public QObject
 {
    Q_OBJECT
    friend QDataStream &operator<<( QDataStream &, const AddressBook & );
    friend QDataStream &operator>>( QDataStream &, AddressBook & );
    friend class StdAddressBook;
  public:
    /**
      @short Address Book Iterator
      This class provides an iterator for address book entries.
    */
    class Iterator
    {
      public:
        Iterator();
        Iterator( const Iterator & );
              ~Iterator();
              Iterator &operator=( const Iterator & );
        const Addressee &operator*() const;
        Addressee &operator*();
        Addressee* operator->();
        Iterator &operator++();
        Iterator &operator++(int);
        Iterator &operator--();
        Iterator &operator--(int);
        bool operator==( const Iterator &it );
        bool operator!=( const Iterator &it );
              struct IteratorData;
        IteratorData *d;
    };
    /**
      @short Address Book Const Iterator
      This class provides a const iterator for address book entries.
    */
    class ConstIterator
    {
      public:
        ConstIterator();
        ConstIterator( const ConstIterator & );
              ~ConstIterator();
              ConstIterator &operator=( const ConstIterator & );
        const Addressee &operator*() const;
        const Addressee* operator->() const;
        ConstIterator &operator++();
        ConstIterator &operator++(int);
        ConstIterator &operator--();
        ConstIterator &operator--(int);
        bool operator==( const ConstIterator &it );
        bool operator!=( const ConstIterator &it );
              struct ConstIteratorData;
        ConstIteratorData *d;
    };
    /**
      Constructs a address book object.
      @param format File format class.
    */
    AddressBook();
    AddressBook( const QString &config );
    AddressBook( const QString &config, const QString &family );
    virtual ~AddressBook();
    /**
      Requests a ticket for saving the addressbook. Calling this function locks
      the addressbook for all other processes. If the address book is already
      locked the function returns 0. You need the returned @ref Ticket object
      for calling the @ref save() function.
      @see save()
    */
    Ticket *requestSaveTicket( Resource *resource=0 );
    /**
      Load address book from file.
    */
    bool load();
    /**
      Save address book. The address book is saved to the file, the Ticket
      object has been requested for by @ref requestSaveTicket().
      @param ticket a ticket object returned by @ref requestSaveTicket()
    */
    bool save( Ticket *ticket );
    bool saveAB( );
    bool saveABphone( QString fileName );
    void smplifyAddressees(); 
    void removeSyncInfo( QString syncProfile); 
    void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
    void export2File( QString fileName );
    bool export2PhoneFormat(  QStringList uids ,QString fileName );
    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
    void setUntagged( bool setNonSyncTagged = false );
    void removeUntagged();
    void findNewExtIds(  QString fileName, QString currentSyncDevice  );
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator begin();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator begin() const;
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator end();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator end() const;
    /**
      Removes all entries from address book.
    */
    void clear();
    /**
      Insert an Addressee object into address book. If an object with the same
      unique id already exists in the address book it it replaced by the new
      one. If not the new object is appended to the address book.
    */
    void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
    /**
      Removes entry from the address book.
    */
    void removeAddressee( const Addressee & );
    /**
      This is like @ref removeAddressee() just above, with the difference that
      the first element is a iterator, returned by @ref begin().
    */
    void removeAddressee( const Iterator & );
    /**
      Find the specified entry in address book. Returns end(), if the entry
      couldn't be found.
    */
    Iterator find( const Addressee & );
    /**
      Find the entry specified by an unique id. Returns an empty Addressee
      object, if the address book does not contain an entry with this id.
    */
    Addressee findByUid( const QString & );
    /**
      Returns a list of all addressees in the address book. This list can
      be sorted with @ref KABC::AddresseeList for example.
    */
    Addressee::List allAddressees();
    /**
      Find all entries with the specified name in the address book. Returns
      an empty list, if no entries could be found.
    */
    Addressee::List findByName( const QString & );
    /**
      Find all entries with the specified email address  in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByEmail( const QString & );
    /**
      Find all entries wich have the specified category in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByCategory( const QString & );
    /**
      Return a string identifying this addressbook.
    */
    virtual QString identifier();
    /**
      Used for debug output.
    */
    void dump() const;
    void emitAddressBookLocked() { emit addressBookLocked( this ); }
    void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
    void emitAddressBookChanged() { emit addressBookChanged( this ); }
    /**
      Return list of all Fields known to the address book which are associated
      with the given field category.
    */
    Field::List fields( int category = Field::All );
    /**
      Add custom field to address book.
      @param label    User visible label of the field.
      @param category Ored list of field categories.
      @param key      Identifier used as key for reading and writing the field.
      @param app      String used as application key for reading and writing
                      the field.
    */
    bool addCustomField( const QString &label, int category = Field::All,
                         const QString &key = QString::null,
                         const QString &app = QString::null );
    /**
      Add address book resource.
    */
    bool addResource( Resource * );
    /**
      Remove address book resource.
    */
    bool removeResource( Resource * );
    /**
      Return pointer list of all resources.
    */
    QPtrList<Resource> resources();
    /**
      Set the @p ErrorHandler, that is used by @ref error() to
      provide gui-independend error messages.
    */
    void setErrorHandler( ErrorHandler * );
    /**
      Shows gui independend error messages.
    */
    void error( const QString& );
    /**
      Query all resources to clean up their lock files
     */
    void cleanUp();
    // sync stuff 
    //Addressee::List getExternLastSyncAddressees();
    void resetTempSyncStat(); 
    QStringList uidList(); 
    void removeSyncAddressees( bool removeDeleted = false );
    void  mergeAB( AddressBook *aBook, const QString& profile, bool isSubset );
    Addressee findByExternUid( const QString& uid , const QString& profile  );
    bool   containsExternalUid( const QString& uid  );
    void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset );
-    void postExternSync( AddressBook* aBook, const QString& csd  );
+    void postExternSync( AddressBook* aBook, const QString& csd , bool setID );
  signals:
    /**
      Emitted, when the address book has changed on disk.
    */
    void addressBookChanged( AddressBook * );
    /**
      Emitted, when the address book has been locked for writing.
    */
    void addressBookLocked( AddressBook * );
    /**
      Emitted, when the address book has been unlocked.
    */
    void addressBookUnlocked( AddressBook * );
  protected:
    void deleteRemovedAddressees();
    void setStandardResource( Resource * );
    Resource *standardResource();
    KRES::Manager<Resource> *resourceManager();
    void init(const QString &config, const QString &family);
  private:
 //US    QPtrList<Resource> mDummy; // Remove in KDE 4
    struct AddressBookData;
    AddressBookData *d;
    bool blockLSEchange;
 };
 QDataStream &operator<<( QDataStream &, const AddressBook & );
 QDataStream &operator>>( QDataStream &, AddressBook & );
 }
 #endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index a660a9d..d5a110a 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,653 +1,653 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    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$
 */
 #include <kconfig.h>
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 //US #include "resource.h"
 #include "addressee.h"
 using namespace KABC;
 static bool matchBinaryPattern( int value, int pattern );
 static bool matchBinaryPatternA( int value, int pattern );
 static bool matchBinaryPatternP( 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;
  bool tagged   :1;
 };
 Addressee::Addressee()
 {
  mData = new AddresseeData;
  mData->empty = true;
  mData->changed = false;
  mData->resource = 0;
  mData->mExternalId = ":";
  mData->revision = QDateTime ( QDate( 2003,1,1));
  mData->mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 Addressee::~Addressee()
 {
 }
 Addressee::Addressee( const Addressee &a )
 {
  mData = a.mData;
 }
 Addressee &Addressee::operator=( const Addressee &a )
 {
  mData = a.mData;
  return (*this);
 }
 Addressee Addressee::copy()
 {
  Addressee a;
  *(a.mData) = *mData;
  return a;
 }
 void Addressee::detach()
 {
  if ( mData.count() == 1 ) return;
  *this = copy();
 }
 bool Addressee::operator==( const Addressee &a ) const
 {
  if ( uid() != a.uid() ) return false;
  if ( mData->name != a.mData->name ) return false;
  if ( mData->formattedName != a.mData->formattedName ) return false;
  if ( mData->familyName != a.mData->familyName ) return false;
  if ( mData->givenName != a.mData->givenName ) return false;
  if ( mData->additionalName != a.mData->additionalName ) return false;
  if ( mData->prefix != a.mData->prefix ) return false;
  if ( mData->suffix != a.mData->suffix ) return false;
  if ( mData->nickName != a.mData->nickName ) return false;
  if ( mData->birthday != a.mData->birthday ) return false;
  if ( mData->mailer != a.mData->mailer ) return false;
  if ( mData->timeZone != a.mData->timeZone ) return false;
  if ( mData->geo != a.mData->geo ) return false;
  if ( mData->title != a.mData->title ) return false;
  if ( mData->role != a.mData->role ) return false;
  if ( mData->organization != a.mData->organization ) return false;
  if ( mData->note != a.mData->note ) return false;
  if ( mData->productId != a.mData->productId ) return false;
  //if ( mData->revision != a.mData->revision ) return false;
  if ( mData->sortString != a.mData->sortString ) return false;
  if ( mData->secrecy != a.mData->secrecy ) return false;
  if ( mData->logo != a.mData->logo ) return false;
  if ( mData->photo != a.mData->photo ) return false;
  if ( mData->sound != a.mData->sound ) return false;
  if ( mData->agent != a.mData->agent ) return false;
  if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
       ( mData->url != a.mData->url ) ) return false;
  if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
  if ( mData->addresses != a.mData->addresses ) return false;
  if ( mData->keys != a.mData->keys ) return false;
  if ( mData->emails != a.mData->emails ) return false;
  if ( mData->categories != a.mData->categories ) return false;
  if ( mData->custom != a.mData->custom ) return false;
  return true;
 }
 bool Addressee::operator!=( const Addressee &a ) const
 {
  return !( a == *this );
 }
 bool Addressee::isEmpty() const
 {
  return mData->empty;
 }
 ulong  Addressee::getCsum4List( const QStringList &  attList)
 {
    int max = attList.count();
    ulong cSum = 0;
    int j,k,i;
    int add;
    for ( i = 0; i < max ; ++i ) {
        QString s = attList[i];
        if ( ! s.isEmpty() ){
            j = s.length();
            for ( k = 0; k < j; ++k ) {
                int mul = k +1;
                add = s[k].unicode ();
                if ( k < 16 )
                    mul = mul * mul;
                int ii = i+1;
                add = add * mul *ii*ii*ii;
                cSum += add;
            }
        }
            
    }
    //QString dump = attList.join(",");
    //qDebug("csum: %d %s", cSum,dump.latin1()); 
    
    return cSum;
 }
 void Addressee::computeCsum(const QString &dev)
 {
    QStringList l;
    if ( !mData->name.isEmpty() ) l.append(mData->name);
    if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
    if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
    if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
    if ( !mData->additionalName  ) l.append( mData->additionalName );
    if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
    if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
    if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
    if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
    if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
    if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
    if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
    if ( !mData->title .isEmpty() ) l.append( mData->title );
    if ( !mData->role.isEmpty() ) l.append( mData->role );
    if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
    if ( !mData->note.isEmpty() ) l.append( mData->note ); 
    if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
    if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
    if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
    // if ( !mData->logo.isEmpty() ) l.append(  ); 
    //if ( !mData->photo.isEmpty() ) l.append(  );
    //if ( !mData->sound.isEmpty() ) l.append(  );
    //if ( !mData->agent.isEmpty() ) l.append(  ); 
    if (  mData->url.isValid() )
        if ( ! mData->url.path().isEmpty()) l.append( mData->url.path()  ); 
    KABC::PhoneNumber::List phoneNumbers;
    KABC::PhoneNumber::List::Iterator phoneIter;
    QStringList t;
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter )
        t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) );
    t.sort();
    uint iii;
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->emails;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->categories;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->custom;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    KABC::Address::List::Iterator addressIter;
    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
          ++addressIter ) {
        t = (*addressIter).asList();
        t.sort();
        for ( iii = 0; iii < t.count(); ++iii)
            l.append( t[iii]  );
    }
    uint cs = getCsum4List(l);
-    // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
+    //qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
    setCsum( dev, QString::number (cs ));
 }
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
    detach();
    if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
    if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
    if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
    if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
    if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
    if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
    if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
    if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
    if ( !mData->birthday.isValid() ) 
        if ( ad.mData->birthday.isValid()) 
            mData->birthday =  ad.mData->birthday;
    if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
    if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
    if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
    if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
    if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
    if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
    if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
    if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
    if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
    if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
    if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
    QStringList t;
    QStringList tAD;
    uint iii;
    // ********** phone numbers
    PhoneNumber::List phoneAD = ad.phoneNumbers();
    PhoneNumber::List::Iterator phoneItAD;
    for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
        bool found = false;
        PhoneNumber::List::Iterator it;
        for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
            if ( ( *phoneItAD ).contains( (*it)  ) ) {
                found = true;
                (*it).setType( ( *phoneItAD ).type() );
                (*it).setNumber( ( *phoneItAD ).number() );
                break;
            }
        }
        if ( isSubSet && ! found )
            mData->phoneNumbers.append( *phoneItAD );                
    }
    if ( isSubSet ) {
        // ************* emails;
        t = mData->emails;
        tAD = ad.mData->emails;
        for ( iii = 0; iii < tAD.count(); ++iii)
            if ( !t.contains(tAD[iii] ) )
                mData->emails.append( tAD[iii] );
    }
    // ************* categories;
    t = mData->categories;
    tAD = ad.mData->categories;
    for ( iii = 0; iii < tAD.count(); ++iii)
        if ( !t.contains(tAD[iii] ) )
            mData->categories.append( tAD[iii] );
    QStringList::ConstIterator it;
    for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) {
        QString qualifiedName = (*it).left( (*it).find( ":" )); 
        bool found = false;
        QStringList::ConstIterator itL;
        for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) {
            if ( (*itL).startsWith( qualifiedName ) ) {
                found = true;
                break;
            }
        }
        if ( ! found ) {
            mData->custom.append( *it );
        }
    }
    if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo;
    if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo;
    if ( !mData->sound.isIntern() ) {
        if ( mData->sound.url().isEmpty() ) {
            mData->sound = ad.mData->sound;
        }
    }
    if ( !mData->agent.isIntern() ) {
        if ( mData->agent.url().isEmpty() ) {
            mData->agent = ad.mData->agent;
        }
    }
    { 
        Key::List::Iterator itA;
        for( itA = ad.mData->keys.begin(); itA != ad.mData->keys.end(); ++itA ) {
            bool found = false;
            Key::List::Iterator it;
            for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
                if ( (*it) == (*itA)) {
                    found = true;
                    break;
                    
                }
            }
            if ( ! found ) {
                mData->keys.append( *itA );
            }
        }
    }
    KABC::Address::List::Iterator addressIterA;
    for ( addressIterA = ad.mData->addresses.begin(); addressIterA != ad.mData->addresses.end(); ++addressIterA ) {
        bool found = false;
        KABC::Address::List::Iterator addressIter;
        for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
              ++addressIter ) {
            if ( (*addressIter) == (*addressIterA)) {
                found = true;
                (*addressIter).setType( (*addressIterA).type() );
                break;
            }
        }
        if ( isSubSet && ! found ) {
            mData->addresses.append( *addressIterA );
        }
    }
    //qDebug("merge contact %s ", ad.uid().latin1());
    setUid( ad.uid() );
    setRevision( ad.revision() );
 }
 bool Addressee::removeVoice()
 {
    PhoneNumber::List phoneN = phoneNumbers();
    PhoneNumber::List::Iterator phoneIt;
    bool found = false;
    for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
        if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
            if ((*phoneIt).type() - PhoneNumber::Voice ) {
                (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                insertPhoneNumber( (*phoneIt) );
                found = true;
            }
        }
        
    }
    return found;
 }
 bool Addressee::containsAdr(const Addressee& ad )
 {
    if ( ! ad.mData->familyName.isEmpty()  )  if ( mData->familyName  != ad.mData->familyName) return false;
    if ( ! ad.mData->givenName.isEmpty() )if (  mData->givenName   != ad.mData->givenName ) return false;
    if (  ad.mData->url.isValid() ) if (mData->url != ad.mData->url) return false ;
    if ( ! ad.mData->role.isEmpty() ) if (mData->role != ad.mData->role) return false ;
    if ( ! ad.mData->organization.isEmpty() ) if (mData->organization != ad.mData->organization) return false ; 
    if ( ! ad.mData->note.isEmpty() ) if (mData->note != ad.mData->note) return false ; 
    if ( ! ad.mData->title .isEmpty() ) if (mData->title != ad.mData->title ) return false ;
    // compare phone numbers
    PhoneNumber::List phoneN = ad.phoneNumbers();
    PhoneNumber::List::Iterator phoneIt;
    bool found = false;
    for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
        bool found = false;
        PhoneNumber::List phoneL = ad.phoneNumbers();
        PhoneNumber::List::Iterator phoneItL;
        for ( phoneItL = phoneL.begin(); phoneItL != phoneL.end(); ++phoneItL ) {
            if ( ( *phoneItL ).number() == ( *phoneIt ).number()  ) {
                found = true;
                break;
            }
        }
        if ( ! found )
            return false;
    }
    return true;
   
 }
 void Addressee::simplifyAddresses()
 {
    Address::List list;
    Address::List::Iterator it;
    Address::List::Iterator it2;
    for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
        it2 = it;
        ++it2;
        for( ; it2 != mData->addresses.end(); ++it2 ) {
            if ( (*it) == (*it2) ) {
                list.append( *it );
                break;
            }
        }
    }
    for( it = list.begin(); it != list.end(); ++it ) {
        removeAddress( (*it) );
    }
    list.clear();
    int max = 2;
    if (  mData->url.isValid() )
        max = 1; 
    if ( mData->addresses.count() <= max ) return ;
    int count = 0;
    for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
        if ( count >= max )
            list.append( *it );
        ++count;
    }
    for( it = list.begin(); it != list.end(); ++it ) {
        removeAddress( (*it) );
    }
 }
 // removes all emails but the first 
 // needed by phone sync
 void Addressee::simplifyEmails()
 { 
    if ( mData->emails.count() == 0 ) return ;
    QString email = mData->emails.first();
    detach();
    mData->emails.clear();
    mData->emails.append( email );
 }
 void Addressee::simplifyPhoneNumbers()
 {
    int max = 4;
    int inList = mData->phoneNumbers.count();
    KABC::PhoneNumber::List removeNumbers;
    KABC::PhoneNumber::List::Iterator phoneIter;
    if ( inList > max ) {
        // delete non-preferred numbers
        for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
              ++phoneIter ) {
            if ( inList > max ) {
                if ( ! (( *phoneIter ).type() &  PhoneNumber::Pref )) {
                    removeNumbers.append( ( *phoneIter ) );
                    --inList;
                }
            } else
                break;
        }
        for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
              ++phoneIter ) {
            removePhoneNumber(( *phoneIter ));
        }
        // delete preferred numbers
        if ( inList > max ) {
            for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
                  ++phoneIter ) {
                if ( inList > max ) {
                        removeNumbers.append( ( *phoneIter ) );
                        --inList;
                } else
                    break;
            }
            for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
                  ++phoneIter ) {
                removePhoneNumber(( *phoneIter ));
            }
        }
    }
    // remove non-numeric characters
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter ) {
        if ( ! ( *phoneIter ).simplifyNumber() )
            removeNumbers.append( ( *phoneIter ) );
    }
    for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
          ++phoneIter ) {
        removePhoneNumber(( *phoneIter ));
    }
 }
 void Addressee::simplifyPhoneNumberTypes()
 {
    KABC::PhoneNumber::List::Iterator phoneIter;
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter )
        ( *phoneIter ).simplifyType();
 }
 void Addressee::removeID(const QString &prof)
 {
    detach();
    if ( prof.isEmpty() )
        mData->mExternalId = ":";
    else
        mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
    
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
    detach();
    mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
    //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
 }
 void Addressee::setTempSyncStat( int id )
 {
    if ( mData->mTempSyncStat == id ) return;
    detach();
    mData->mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
    return mData->mTempSyncStat;
 }
 QString Addressee::getID( const QString &  prof)
 {
    return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
    detach();
    //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
    mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
    //qDebug("setcsum2 %s ",mData->mExternalId.latin1() );
 }
 QString Addressee::getCsum( const QString &  prof)
 {
    return KIdManager::getCsum ( mData->mExternalId, 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;
  //qDebug("*******Set orig uid %s ", id.latin1());
  mData->originalExternalUID = id;
 }
 QString Addressee::originalExternalUID() const
 {
  return mData->originalExternalUID;
 }
 void Addressee::setUid( const QString &id )
 {
  if ( id == mData->uid ) return;
  detach();
  //qDebug("****setuid %s ", id.latin1());
  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");
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ea87929..b0cb986 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2132,804 +2132,806 @@ void KABCore::configureKeyBindings()
 }
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
  KRES::KCMKResources dlg( this, "" , 0 );
  if ( !dlg.exec() )
    return;
  KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
 * for the attendees list of an event.
 */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
  QStringList nameList;
  QStringList emailList;
  QStringList uidList;
  KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
  uint i=0;
  for (i=0; i < list.count(); i++)
  {
        nameList.append(list[i].realName());
        emailList.append(list[i].preferredEmail());
        uidList.append(list[i].uid());
  }
  bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 }
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
 * to put them into the calendar.
 */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
  //  qDebug("KABCore::requestForBirthdayList");
  QStringList birthdayList;
  QStringList anniversaryList;
  QStringList realNameList;
  QStringList preferredEmailList;
  QStringList assembledNameList;
  QStringList uidList;
  KABC::AddressBook::Iterator it;
    int count = 0;
    for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
        ++count;
    }
    QProgressBar bar(count,0 );
    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();
    bar.setCaption (i18n("Collecting birthdays - close to abort!") );
    qApp->processEvents();
    QDate bday;
    QString anni;
    QString formattedbday;
  for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
  {
        if ( ! bar.isVisible() )
            return;
        bar.setProgress( count++ );
        qApp->processEvents();
        bday = (*it).birthday().date();
        anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
        if ( bday.isValid() || !anni.isEmpty())
        {
          if (bday.isValid()) 
            formattedbday = KGlobal::locale()->formatDate(bday,  true, KLocale::ISODate);
          else
            formattedbday = "NOTVALID";
          if (anni.isEmpty())
            anni = "INVALID";
            
          birthdayList.append(formattedbday);
          anniversaryList.append(anni); //should be ISODate
          realNameList.append((*it).realName());
          preferredEmailList.append((*it).preferredEmail());
          assembledNameList.append((*it).assembledName());
          uidList.append((*it).uid());
          qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() );
        }
  }
  bool res = ExternalAppHandler::instance()->returnBirthdayListFromKAPI(sourceChannel, uid, birthdayList, anniversaryList, realNameList, preferredEmailList, assembledNameList, uidList);
 }
 /* this method will be called through the QCop interface from other apps to show details of a contact.
 */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
    qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
    QString foundUid = QString::null;
    if ( ! uid.isEmpty() ) {
        Addressee adrr = mAddressBook->findByUid( uid );
        if (  !adrr.isEmpty() ) {
            foundUid = uid;
        }
            if ( email == "sendbacklist" ) {
                //qDebug("ssssssssssssssssssssssend ");
                QStringList nameList;
                QStringList emailList;
                QStringList uidList;
                nameList.append(adrr.realName());
                emailList = adrr.emails();
                uidList.append( adrr.preferredEmail());
                bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
                return;
            }
        
    }
  
  if ( email == "sendbacklist" ) 
      return;
  if (foundUid.isEmpty())
  {
    //find the uid of the person first
    Addressee::List namelist;
    Addressee::List emaillist;
    if (!name.isEmpty())
      namelist = mAddressBook->findByName( name );
    if (!email.isEmpty())
      emaillist = mAddressBook->findByEmail( email );
    qDebug("count %d %d ",  namelist.count(),emaillist.count() );
    //check if we have a match in Namelist and Emaillist
    if ((namelist.count() == 0) && (emaillist.count() > 0)) {
      foundUid = emaillist[0].uid();
    }
    else if ((namelist.count() > 0) && (emaillist.count() == 0))
      foundUid = namelist[0].uid();
    else
    {
      for (int i = 0; i < namelist.count(); i++)
      {
        for (int j = 0; j < emaillist.count(); j++)
        {
          if (namelist[i] == emaillist[j])
          {
            foundUid = namelist[i].uid();
          }
        }
      }
    }
  }
  else
  {
    foundUid = uid;
  }
  if (!foundUid.isEmpty())
  {
   
    // raise Ka/Pi if it is in the background
 #ifndef DESKTOP_VERSION
 #ifndef KORG_NODCOP
      //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
    
    mMainWindow->showMaximized();
    mMainWindow-> raise();
    mViewManager->setSelected( "", false);
    mViewManager->refreshView( "" );
    mViewManager->setSelected( foundUid, true );
    mViewManager->refreshView( foundUid );
    if ( !mMultipleViewsAtOnce )
    {
      setDetailsVisible( true );
      mActionDetails->setChecked(true);
    }
  }
 }
 void KABCore::whatsnew()
 {
    KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 }
 void KABCore::synchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void  KABCore::faq()
 {
  KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
 }
 #include <libkcal/syncdefines.h>
 KABC::Addressee KABCore::getLastSyncAddressee()
 {
    Addressee lse; 
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
    lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
    if (lse.isEmpty()) {
        qDebug("Creating new last-syncAddressee ");
        lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
        QString sum = "";
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
            sum = "E: ";
        lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
        lse.setRevision( mLastAddressbookSync );
        lse.setCategories( i18n("SyncEvent") );
        mAddressBook->insertAddressee( lse );
    }
    return lse;
 }
 int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
 {
 
    //void setZaurusId(int id);
    // int zaurusId() const;
    //  void setZaurusUid(int id);
   // int zaurusUid() const;
   // void setZaurusStat(int id);
   // int zaurusStat() const;
    // 0 equal
    // 1 take local
    // 2 take remote
    // 3 cancel 
    QDateTime lastSync = mLastAddressbookSync;
    QDateTime localMod = local->revision();
    QDateTime remoteMod = remote->revision();
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
        bool remCh, locCh;
        remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
       
        //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
        locCh = ( localMod > mLastAddressbookSync );
        if ( !remCh && ! locCh ) {
            //qDebug("both not changed ");
            lastSync = localMod.addDays(1);
            if ( mode <= SYNC_PREF_ASK )
                return 0;
        } else {
            if ( locCh ) {
                //qDebug("loc changed %s %s",  localMod.toString().latin1(), mLastAddressbookSync.toString().latin1());
                lastSync = localMod.addDays( -1 );
                if ( !remCh )
                    remoteMod =( lastSync.addDays( -1 ) );
            } else {
                //qDebug(" not loc changed ");
                lastSync = localMod.addDays( 1 );
                if ( remCh )
                    remoteMod =( lastSync.addDays( 1 ) );
                
            }
        }
        full = true;  
        if ( mode < SYNC_PREF_ASK )
            mode = SYNC_PREF_ASK;
    } else {
          if ( localMod == remoteMod )
                return 0;
        
    }
    // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
    //qDebug("%s %d  %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod);  
    //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().time().msec() );
    //full = true; //debug only
    if ( full ) {
        bool equ = ( (*local) == (*remote) );
        if ( equ ) {
            //qDebug("equal ");
            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
            }
            if ( mode < SYNC_PREF_FORCE_LOCAL )
                return 0;
              
        }//else //debug only
        //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
    }
    int result;
    bool localIsNew;
    //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
    if ( full && mode < SYNC_PREF_NEWEST )
        mode = SYNC_PREF_ASK;
    switch( mode ) {
    case SYNC_PREF_LOCAL:
        if ( lastSync > remoteMod )
            return 1;
        if ( lastSync > localMod )
            return 2;
        return 1;
        break;
    case SYNC_PREF_REMOTE:
        if ( lastSync > remoteMod )
            return 1;
        if ( lastSync > localMod )
            return 2;
        return 2;
        break;
    case SYNC_PREF_NEWEST:
        if ( localMod > remoteMod )
            return 1;
        else
            return 2;
        break;
    case SYNC_PREF_ASK: 
        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
        if ( lastSync > remoteMod )
            return 1;
        if ( lastSync > localMod )
            return 2;
        localIsNew = localMod >= remoteMod;
        //qDebug("conflict! ************************************** ");
        {
            KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
            result = acd.executeD(localIsNew);
            return result;
        }
        break;
    case SYNC_PREF_FORCE_LOCAL:
        return 1;
        break;
    case SYNC_PREF_FORCE_REMOTE:
        return 2;
        break;
       
    default:
        // SYNC_PREF_TAKE_BOTH not implemented
        break;
    }
    return 0;
 }
 bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode)
 {
    bool syncOK = true;
    int addedAddressee = 0;
    int addedAddresseeR = 0;
    int deletedAddresseeR = 0;
    int deletedAddresseeL = 0;
    int changedLocal = 0;
    int changedRemote = 0;
    QString mCurrentSyncName = syncManager->getCurrentSyncName();
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    //QPtrList<Addressee> el = local->rawAddressees(); 
    Addressee addresseeR;
    QString uid;
    int take;
    Addressee addresseeL;
    Addressee addresseeRSync;
    Addressee addresseeLSync;
    // KABC::Addressee::List  addresseeRSyncSharp = remote->getExternLastSyncAddressees();
    //KABC::Addressee::List  addresseeLSyncSharp = local->getExternLastSyncAddressees();
    bool fullDateRange = false;
    local->resetTempSyncStat();
    mLastAddressbookSync = QDateTime::currentDateTime();
    if ( syncManager->syncWithDesktop() ) {
-        remote->removeSyncInfo( QString());//remove all info
+        // remote->removeSyncInfo( QString());//remove all info
        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
            mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
            qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
        } else {
-            qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime ");
+            qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime ");
        }
    }
    QDateTime modifiedCalendar = mLastAddressbookSync;
    addresseeLSync = getLastSyncAddressee();
    qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
    addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
    if ( !addresseeR.isEmpty() ) {
        addresseeRSync = addresseeR;
        remote->removeAddressee(addresseeR );
    } else {
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
            addresseeRSync = addresseeLSync         ;
        } else {
            qDebug("FULLDATE 1");
            fullDateRange = true;
            Addressee newAdd;
            addresseeRSync = newAdd;
            addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
            addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
            addresseeRSync.setRevision( mLastAddressbookSync );
            addresseeRSync.setCategories( i18n("SyncAddressee") );
        }
    }
    if ( addresseeLSync.revision() == mLastAddressbookSync ) {
            qDebug("FULLDATE 2");
        fullDateRange = true;
    }
    if ( ! fullDateRange  ) {
        if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
            
            // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
            //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
            fullDateRange = true;
            qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
        } 
    }
    // fullDateRange = true; // debug only!
    if ( fullDateRange )
        mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
    else
        mLastAddressbookSync = addresseeLSync.revision();
    // for resyncing if own file has changed
    // PENDING fixme later when implemented
 #if 0
    if ( mCurrentSyncDevice == "deleteaftersync" ) {
        mLastAddressbookSync = loadedFileVersion;
        qDebug("setting mLastAddressbookSync ");
    }
 #endif
    //qDebug("*************************** ");
    // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
    QStringList er = remote->uidList(); 
    Addressee inR ;//= er.first();
    Addressee  inL;
    syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
    int modulo = (er.count()/10)+1;
    int incCounter = 0;
    while ( incCounter < er.count()) {
        if (syncManager->isProgressBarCanceled())
            return false;
        if ( incCounter % modulo == 0 )
          syncManager->showProgressBar(incCounter);
        uid = er[ incCounter ]; 
        bool skipIncidence = false;
        if ( uid.left(19) == QString("last-syncAddressee-") )
            skipIncidence = true;
        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 ( !inL.resource() || inL.resource()->includeInSync() ) {
                    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) );
                                inL.setID( mCurrentSyncDevice, inR.getID(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 ) {
                                inR.setOriginalExternalUID( OidS );
                                inR.setExternalUID( idS );
                                if ( syncManager->syncWithDesktop() )
-                                     inR.setIDStr( "changed" );
+                                    inR.setIDStr("changed" );
+                                    //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" );
                            } else {
                                inR.setIDStr( idS );
                            }
                            inR.setResource( 0 );
                            remote->insertAddressee(  inR , false);
                            ++changedRemote;
                        } else { // take == 2  take remote
                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                if ( inR.revision().date().year() < 2004 )
                                    inR.setRevision( modifiedCalendar );
                            }
                            idS = inL.IDStr();
                            local->removeAddressee( inL );
                            inL = inR;
                            inL.setIDStr( idS );
                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                            }
                            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;
                    }
                } else {
                    if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
                        inR.setRevision( modifiedCalendar );
                        remote->insertAddressee( inR, false );
                        inR.setResource( 0 );
                        local->insertAddressee( inR, false );
                        ++addedAddressee;
                    } else {
                        // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                        remote->removeAddressee( inR );
                        ++deletedAddresseeR; 
                    }
                }
            }
        }
        ++incCounter;
    }
    er.clear();
    QStringList el = local->uidList(); 
    modulo = (el.count()/10)+1;
    syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
    incCounter = 0;
    while ( incCounter < el.count()) {
        qApp->processEvents();
        if (syncManager->isProgressBarCanceled())
            return false;
        if ( incCounter % modulo == 0 )
          syncManager->showProgressBar(incCounter);
        uid = el[ incCounter ]; 
        bool skipIncidence = false;
        if ( uid.left(19) == QString("last-syncAddressee-") )
            skipIncidence = true;
        if ( !skipIncidence )  {
            inL = local->findByUid( uid );
            if ( !inL.resource() || inL.resource()->includeInSync() ) {
                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 ( ! syncManager->mWriteBackExistingOnly ) {
                                inL.removeID(mCurrentSyncDevice );
                                ++addedAddresseeR;
                                inL.setRevision( modifiedCalendar );
                                local->insertAddressee( inL, false );
                                inR = inL;
                                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 ( ! syncManager->mWriteBackExistingOnly ) {
                                ++addedAddresseeR; 
                                inL.setRevision( modifiedCalendar );
                                local->insertAddressee( inL, false );
                                inR = inL;
                                inR.setResource( 0 );
                                remote->insertAddressee( inR, false );
                            }
                        }
                    }
                }
            }
        }
        ++incCounter;
    }
    el.clear();
    syncManager->hideProgressBar();
    mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
    // get rid of micro seconds
    QTime t =  mLastAddressbookSync.time();
    mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
    addresseeLSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
    addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
    addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
    addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
    addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
    addresseeRSync.setNote( "" ) ;
    addresseeLSync.setNote( "" );
    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 ( syncManager->mShowSyncSummary ) {
        KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
    }
    qDebug( mes );
    return syncOK;
 }
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, 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;
    QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
    AddressBook abLocal(filename,"syncContact");
    bool syncOK = false;
    if ( abLocal.load() ) {
        qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
        bool external = false;
        bool isXML = false;
        if ( filename.right(4) == ".xml") {
            mGlobalSyncMode = SYNC_MODE_EXTERNAL;
            isXML = true;
            abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
        } else {
            external = !manager->mIsKapiFile;
            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());
        //}
        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 ) {
+                    if (  external ) {
                        // afterwrite processing
-                        abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
+                        abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
                    }
                }
        }
        setModified();
        
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
    qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
    mAddressBook->removeSyncInfo( syncProfile );
+    setModified();
 }
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
    if (  resource == "phone" )
        return syncPhone();
    disableBR( true );
    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, false );
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile ) {
                abLocal.removeSyncAddressees( false );
                abLocal.saveAB();
-                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
+                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
            }
        }
        setModified();
    }
    if ( syncOK )
        mViewManager->refreshView();
    disableBR( false );
    return syncOK;
 }
 void KABCore::message( QString m )
 {
    topLevelWidget()->setCaption( m );
    mMessageTimer->start( 15000, true );
 }
 bool KABCore::syncPhone()
 {
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    QString fileName = getPhoneFile();
    if ( !PhoneAccess::readFromPhone( fileName) ) {
        message(i18n("Phone access failed!"));
        return false;
    }   
    AddressBook abLocal( fileName,"syncContact");
    bool syncOK = false;
     {
         abLocal.importFromFile( fileName );
        qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
        mGlobalSyncMode = SYNC_MODE_EXTERNAL;
        abLocal.preparePhoneSync( mCurrentSyncDevice, true );
        abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile ) {
                abLocal.removeSyncAddressees( true );
                abLocal.saveABphone( fileName );
                abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
-                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
+                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
            }
        }
        setModified();
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 void KABCore::getFile( bool success )
 {
    if ( ! success ) {
        message( i18n("Error receiving file. Nothing changed!") );
        return;
    }
    int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
    if ( count )
        setModified( true );
    message( i18n("Pi-Sync successful!") );
    mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 { 
    if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) {
        syncManager->slotSyncMenu( 999 );
    } 
    mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
    return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
    return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 void KABCore::setCaptionBack()
 {
    mMessageTimer->stop();
    topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
 }
author	zautrix <zautrix>	2004-10-27 19:44:10 (UTC)
committer	zautrix <zautrix>	2004-10-27 19:44:10 (UTC)
commit	bb82cac85cc196b3f60921ab27e84204036b54b8 (patch) (unidiff)
tree	518629480b983b6b85a4cf1e5542f94fe1687e41
parent	85a0e0d9b1d60805cb4947be1c296c18e73c82b8 (diff)
download	kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.zip kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.tar.gz kdepimpi-bb82cac85cc196b3f60921ab27e84204036b54b8.tar.bz2