many phone AB sync fixes

1 files changed, 43 insertions, 3 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 607ae26..548305a 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -300,21 +300,27 @@ void Addressee::mergeContact( const Addressee& ad )
     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 ;
+    PhoneNumber::List phoneAD = phoneNumbers();
+    PhoneNumber::List::Iterator phoneItAD;
+    bool found = false;
+    for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
 
+        
+    }
     // pending:
     // merging phonenumbers 
     // merging addresses
     // merging emails;
     // merging categories;
     // merging custom;
     // merging keys
-    qDebug("merge contact %s ", ad.uid().latin1());
+    //qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
     setRevision( ad.revision() );
 }
 
 bool Addressee::removeVoice()
 {
@@ -330,20 +336,54 @@ bool Addressee::removeVoice()
             }
         }
         
     }
     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()
 {
-    if ( mData->addresses.count() < 3 ) return ;
+    int max = 2;
+    if (  mData->url.isValid() )
+        max = 1; 
+    if ( mData->addresses.count() <= max ) return ;
     int count = 0;
     Address::List list;
     Address::List::Iterator it;
     for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
-        if ( count > 1 )
+        if ( count >= max )
             list.append( *it );
         ++count;
     }
     for( it = list.begin(); it != list.end(); ++it ) {
         removeAddress( (*it) );
     }