author | zautrix <zautrix> | 2004-10-10 16:00:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-10 16:00:04 (UTC) |
commit | ee6e29a5092d32165b7bf6b39069bd8a1dcd5b0a (patch) (unidiff) | |
tree | 1d908bfc23b8a49d43a58bbeadd82c4e08faeff6 | |
parent | 213a9d993e5a4751b64e18320cfbebb000681d13 (diff) | |
download | kdepimpi-ee6e29a5092d32165b7bf6b39069bd8a1dcd5b0a.zip kdepimpi-ee6e29a5092d32165b7bf6b39069bd8a1dcd5b0a.tar.gz kdepimpi-ee6e29a5092d32165b7bf6b39069bd8a1dcd5b0a.tar.bz2 |
many phone AB sync fixes
-rw-r--r-- | gammu/emb/common/service/gsmmisc.c | 4 | ||||
-rw-r--r-- | gammu/emb/common/service/gsmpbk.c | 17 | ||||
-rw-r--r-- | gammu/emb/gammu/gammu.c | 2 | ||||
-rw-r--r-- | kabc/addressbook.cpp | 148 | ||||
-rw-r--r-- | kabc/addressbook.h | 2 | ||||
-rw-r--r-- | kabc/addressee.cpp | 46 | ||||
-rw-r--r-- | kabc/addressee.h | 1 | ||||
-rw-r--r-- | kabc/phonenumber.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 76 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 7 |
10 files changed, 210 insertions, 97 deletions
diff --git a/gammu/emb/common/service/gsmmisc.c b/gammu/emb/common/service/gsmmisc.c index 6959a22..1c6ec8b 100644 --- a/gammu/emb/common/service/gsmmisc.c +++ b/gammu/emb/common/service/gsmmisc.c | |||
@@ -203,9 +203,9 @@ void SaveVCALText(char *Buffer, int *Length, char *Text, char *Start) | |||
203 | 203 | ||
204 | if (UnicodeLength(Text) != 0) { | 204 | if (UnicodeLength(Text) != 0) { |
205 | EncodeUTF8QuotedPrintable(buffer,Text); | 205 | EncodeUTF8(buffer,Text); |
206 | if (UnicodeLength(Text)==strlen(buffer)) { | 206 | if (UnicodeLength(Text)==strlen(buffer)) { |
207 | *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,DecodeUnicodeString(Text),13,10); | 207 | *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,DecodeUnicodeString(Text),13,10); |
208 | } else { | 208 | } else { |
209 | *Length+=sprintf(Buffer+(*Length), "%s;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:%s%c%c",Start,buffer,13,10); | 209 | *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,buffer,13,10); |
210 | } | 210 | } |
211 | } | 211 | } |
diff --git a/gammu/emb/common/service/gsmpbk.c b/gammu/emb/common/service/gsmpbk.c index 05e5cb9..f7cf7d7 100644 --- a/gammu/emb/common/service/gsmpbk.c +++ b/gammu/emb/common/service/gsmpbk.c | |||
@@ -132,25 +132,25 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade | |||
132 | case PBK_Number_General : | 132 | case PBK_Number_General : |
133 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 133 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
134 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 134 | (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
135 | break; | 135 | break; |
136 | case PBK_Number_Mobile : | 136 | case PBK_Number_Mobile : |
137 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 137 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
138 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 138 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
139 | *Length+=sprintf(Buffer+(*Length),";CELL"); | 139 | *Length+=sprintf(Buffer+(*Length),";CELL"); |
140 | break; | 140 | break; |
141 | case PBK_Number_Work : | 141 | case PBK_Number_Work : |
142 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 142 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
143 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 143 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
144 | *Length+=sprintf(Buffer+(*Length),";WORK;VOICE"); | 144 | *Length+=sprintf(Buffer+(*Length),";WORK"); |
145 | break; | 145 | break; |
146 | case PBK_Number_Fax : | 146 | case PBK_Number_Fax : |
147 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 147 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
148 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 148 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
149 | *Length+=sprintf(Buffer+(*Length),";FAX"); | 149 | *Length+=sprintf(Buffer+(*Length),";FAX"); |
150 | break; | 150 | break; |
151 | case PBK_Number_Home : | 151 | case PBK_Number_Home : |
152 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 152 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
153 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 153 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
154 | *Length+=sprintf(Buffer+(*Length),";HOME;VOICE"); | 154 | *Length+=sprintf(Buffer+(*Length),";HOME"); |
155 | break; | 155 | break; |
156 | case PBK_Text_Note : | 156 | case PBK_Text_Note : |
@@ -161,5 +161,5 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade | |||
161 | * double - once like LABEL, second like ADR | 161 | * double - once like LABEL, second like ADR |
162 | */ | 162 | */ |
163 | SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL"); | 163 | //SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL"); |
164 | *Length+=sprintf(Buffer+(*Length),"ADR"); | 164 | *Length+=sprintf(Buffer+(*Length),"ADR"); |
165 | break; | 165 | break; |
@@ -180,4 +180,5 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade | |||
180 | } | 180 | } |
181 | } | 181 | } |
182 | *Length+=sprintf(Buffer+(*Length), "X-KADDRESSBOOK-X-ExternalID:%d%c%c",pbk->Location,13,10); | ||
182 | if (header) *Length+=sprintf(Buffer+(*Length),"END:VCARD%c%c",13,10); | 183 | if (header) *Length+=sprintf(Buffer+(*Length),"END:VCARD%c%c",13,10); |
183 | } | 184 | } |
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c index 8db9afb..684e67c 100644 --- a/gammu/emb/gammu/gammu.c +++ b/gammu/emb/gammu/gammu.c | |||
@@ -4687,5 +4687,5 @@ static void Restore(int argc, char *argv[]) | |||
4687 | while (Backup.PhonePhonebook[max]!=NULL) max++; | 4687 | while (Backup.PhonePhonebook[max]!=NULL) max++; |
4688 | printmsgerr("%i entries in backup file\n",max); | 4688 | printmsgerr("%i entries in backup file\n",max); |
4689 | if (answer_yes("Restore phone phonebook")) DoRestore = true; | 4689 | /* LR if (answer_yes("Restore phone phonebook")) */DoRestore = true; |
4690 | } | 4690 | } |
4691 | } | 4691 | } |
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index d037d2f..ad0f702 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -342,15 +342,14 @@ bool AddressBook::load() | |||
342 | { | 342 | { |
343 | 343 | ||
344 | |||
345 | clear(); | 344 | clear(); |
346 | |||
347 | KRES::Manager<Resource>::ActiveIterator it; | 345 | KRES::Manager<Resource>::ActiveIterator it; |
348 | bool ok = true; | 346 | bool ok = true; |
349 | for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) | 347 | for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) |
350 | if ( !(*it)->load() ) { | 348 | if ( !(*it)->load() ) { |
351 | error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) ); | 349 | qDebug( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) ); |
352 | ok = false; | 350 | ok = false; |
351 | } else { | ||
352 | qDebug( i18n("Resource loaded: '%1'").arg( (*it)->resourceName() ) ); | ||
353 | } | 353 | } |
354 | |||
355 | // mark all addressees as unchanged | 354 | // mark all addressees as unchanged |
356 | Addressee::List::Iterator addrIt; | 355 | Addressee::List::Iterator addrIt; |
@@ -405,4 +404,73 @@ void AddressBook::export2File( QString fileName ) | |||
405 | outFile.close(); | 404 | outFile.close(); |
406 | } | 405 | } |
406 | // if QStringList uids is empty, all are exported | ||
407 | bool AddressBook::export2PhoneFormat( QStringList uids ,QString fileName ) | ||
408 | { | ||
409 | KABC::VCardConverter converter; | ||
410 | QString datastream; | ||
411 | Iterator it; | ||
412 | bool all = uids.isEmpty(); | ||
413 | for ( it = begin(); it != end(); ++it ) { | ||
414 | // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | ||
415 | if ( ! all ) { | ||
416 | if ( ! ( uids.contains((*it).uid() ) )) | ||
417 | continue; | ||
418 | } | ||
419 | KABC::Addressee a = ( *it ); | ||
420 | if ( a.isEmpty() ) | ||
421 | continue; | ||
422 | a.simplifyEmails(); | ||
423 | a.simplifyPhoneNumbers(); | ||
424 | a.simplifyPhoneNumberTypes(); | ||
425 | a.simplifyAddresses(); | ||
426 | |||
427 | QString vcard; | ||
428 | QString vcardnew; | ||
429 | converter.addresseeToVCard( a, vcard ); | ||
430 | int start = 0; | ||
431 | int next; | ||
432 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { | ||
433 | int semi = vcard.find(";", next); | ||
434 | int dopp = vcard.find(":", next); | ||
435 | int sep; | ||
436 | if ( semi < dopp && semi >= 0 ) | ||
437 | sep = semi ; | ||
438 | else | ||
439 | sep = dopp; | ||
440 | vcardnew +=vcard.mid( start, next - start); | ||
441 | vcardnew +=vcard.mid( next+5,sep -next -5 ).upper(); | ||
442 | start = sep; | ||
443 | } | ||
444 | vcardnew += vcard.mid( start,vcard.length() ); | ||
445 | vcard = ""; | ||
446 | start = 0; | ||
447 | while ( (next = vcardnew.find("ADR", start) )>= 0 ) { | ||
448 | int sep = vcardnew.find(":", next); | ||
449 | vcard +=vcardnew.mid( start, next - start+3); | ||
450 | start = sep; | ||
451 | } | ||
452 | vcard += vcardnew.mid( start,vcardnew.length() ); | ||
453 | vcard.replace ( QRegExp(";;;") , "" ); | ||
454 | vcard.replace ( QRegExp(";;") , "" ); | ||
455 | datastream += vcard; | ||
456 | |||
457 | } | ||
458 | |||
459 | QFile outFile(fileName); | ||
460 | if ( outFile.open(IO_WriteOnly) ) { | ||
461 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); | ||
462 | QTextStream t( &outFile ); // use a text stream | ||
463 | t.setEncoding( QTextStream::UnicodeUTF8 ); | ||
464 | t <<datastream; | ||
465 | t << "\r\n\r\n"; | ||
466 | outFile.close(); | ||
467 | |||
468 | } else { | ||
469 | qDebug("Error open temp file "); | ||
470 | return false; | ||
471 | } | ||
472 | return true; | ||
473 | |||
474 | } | ||
407 | void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld ) | 475 | void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld ) |
408 | { | 476 | { |
@@ -426,4 +494,7 @@ void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem | |||
426 | KABC::Addressee::List::Iterator it; | 494 | KABC::Addressee::List::Iterator it; |
427 | for ( it = list.begin(); it != list.end(); ++it ) { | 495 | for ( it = list.begin(); it != list.end(); ++it ) { |
496 | QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" ); | ||
497 | if ( !id.isEmpty() ) | ||
498 | (*it).setIDStr(id ); | ||
428 | (*it).setResource( 0 ); | 499 | (*it).setResource( 0 ); |
429 | if ( replaceLabel ) | 500 | if ( replaceLabel ) |
@@ -481,13 +552,57 @@ void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync ) | |||
481 | if ( isPreSync ) | 552 | if ( isPreSync ) |
482 | (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 553 | (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
483 | else | 554 | else { |
484 | (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 555 | (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
556 | (*ait).setID( currentSyncDevice,id ); | ||
557 | |||
558 | } | ||
559 | } | ||
560 | } | ||
561 | void AddressBook::findNewExtIds( QString fileName, QString currentSyncDevice ) | ||
562 | { | ||
563 | |||
564 | setUntagged(); | ||
565 | KABC::Addressee::List list; | ||
566 | QFile file( fileName ); | ||
567 | file.open( IO_ReadOnly ); | ||
568 | QByteArray rawData = file.readAll(); | ||
569 | file.close(); | ||
570 | QString data; | ||
571 | |||
572 | data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | ||
573 | KABC::VCardTool tool; | ||
574 | list = tool.parseVCards( data ); | ||
575 | KABC::Addressee::List::Iterator it; | ||
576 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
577 | Iterator ait; | ||
578 | for ( ait = begin(); ait != end(); ++ait ) { | ||
579 | if ( !(*ait).tagged() ) { | ||
580 | if ( (*ait).containsAdr(*it)) { | ||
581 | (*ait).setTagged(true); | ||
582 | QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" ); | ||
583 | (*it).setIDStr( ":"); | ||
584 | (*it).setID( currentSyncDevice,id ); | ||
585 | (*it).setExternalUID( id ); | ||
586 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | ||
587 | (*it).setUid( ( (*ait).uid() )); | ||
588 | break; | ||
589 | } | ||
590 | } | ||
591 | |||
592 | } | ||
593 | if ( ait == end() ) | ||
594 | qDebug("ERROR:: no ext ID found for uid: %s", (*it).uid().latin1()); | ||
595 | } | ||
596 | clear(); | ||
597 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
598 | insertAddressee( (*it) ); | ||
485 | } | 599 | } |
486 | } | 600 | } |
601 | |||
487 | bool AddressBook::saveABphone( QString fileName ) | 602 | bool AddressBook::saveABphone( QString fileName ) |
488 | { | 603 | { |
489 | smplifyAddressees(); | 604 | //smplifyAddressees(); |
490 | qDebug("saveABphone:: saving AB... "); | 605 | qDebug("saveABphone:: saving AB... "); |
491 | if ( ! saveAB() ) | 606 | if ( ! export2PhoneFormat( QStringList() ,fileName ) ) |
492 | return false; | 607 | return false; |
493 | qDebug("saveABphone:: writing to phone... "); | 608 | qDebug("saveABphone:: writing to phone... "); |
@@ -499,7 +614,4 @@ bool AddressBook::saveABphone( QString fileName ) | |||
499 | return false; | 614 | return false; |
500 | } | 615 | } |
501 | qDebug("reloading phone book... "); | ||
502 | if ( !load() ) | ||
503 | return false; | ||
504 | return true; | 616 | return true; |
505 | } | 617 | } |
@@ -517,10 +629,17 @@ bool AddressBook::saveAB() | |||
517 | KRES::Manager<Resource>::ActiveIterator it; | 629 | KRES::Manager<Resource>::ActiveIterator it; |
518 | KRES::Manager<Resource> *manager = d->mManager; | 630 | KRES::Manager<Resource> *manager = d->mManager; |
631 | qDebug("SaveAB::saving..." ); | ||
519 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 632 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
633 | qDebug("SaveAB::checking resource..." ); | ||
634 | if ( (*it)->readOnly() ) | ||
635 | qDebug("readonly." ); | ||
636 | if ( (*it)->isOpen() ) | ||
637 | qDebug("open" ); | ||
638 | |||
520 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { | 639 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { |
521 | Ticket *ticket = requestSaveTicket( *it ); | 640 | Ticket *ticket = requestSaveTicket( *it ); |
522 | // qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); | 641 | qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); |
523 | if ( !ticket ) { | 642 | if ( !ticket ) { |
524 | error( i18n( "Unable to save to resource '%1'. It is locked." ) | 643 | qDebug( i18n( "Unable to save to resource '%1'. It is locked." ) |
525 | .arg( (*it)->resourceName() ) ); | 644 | .arg( (*it)->resourceName() ) ); |
526 | return false; | 645 | return false; |
@@ -531,4 +650,7 @@ bool AddressBook::saveAB() | |||
531 | if ( ! ticket->resource()->save( ticket ) ) | 650 | if ( ! ticket->resource()->save( ticket ) ) |
532 | ok = false; | 651 | ok = false; |
652 | else | ||
653 | qDebug("StdAddressBook::saved '%s'", ticket->resource()->resourceName().latin1() ); | ||
654 | |||
533 | } else | 655 | } else |
534 | ok = false; | 656 | ok = false; |
@@ -594,5 +716,5 @@ Ticket *AddressBook::requestSaveTicket( Resource *resource ) | |||
594 | return 0; | 716 | return 0; |
595 | } | 717 | } |
596 | 718 | //void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false); | |
597 | void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource ) | 719 | void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource ) |
598 | { | 720 | { |
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index cc755d1..df9048b 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -147,7 +147,9 @@ class AddressBook : public QObject | |||
147 | void preparePhoneSync( QString currentSyncDevice, bool isPreSync ); | 147 | void preparePhoneSync( QString currentSyncDevice, bool isPreSync ); |
148 | void export2File( QString fileName ); | 148 | void export2File( QString fileName ); |
149 | bool export2PhoneFormat( QStringList uids ,QString fileName ); | ||
149 | void importFromFile( QString fileName, bool replaceLabel = false, bool removeOld = false ); | 150 | void importFromFile( QString fileName, bool replaceLabel = false, bool removeOld = false ); |
150 | void setUntagged(); | 151 | void setUntagged(); |
151 | void removeUntagged(); | 152 | void removeUntagged(); |
153 | void findNewExtIds( QString fileName, QString currentSyncDevice ); | ||
152 | /** | 154 | /** |
153 | Returns a iterator for first entry of address book. | 155 | Returns a iterator for first entry of address book. |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 607ae26..548305a 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -304,5 +304,11 @@ void Addressee::mergeContact( const Addressee& ad ) | |||
304 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 304 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
305 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 305 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
306 | PhoneNumber::List phoneAD = phoneNumbers(); | ||
307 | PhoneNumber::List::Iterator phoneItAD; | ||
308 | bool found = false; | ||
309 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { | ||
310 | |||
306 | 311 | ||
312 | } | ||
307 | // pending: | 313 | // pending: |
308 | // merging phonenumbers | 314 | // merging phonenumbers |
@@ -312,5 +318,5 @@ void Addressee::mergeContact( const Addressee& ad ) | |||
312 | // merging custom; | 318 | // merging custom; |
313 | // merging keys | 319 | // merging keys |
314 | qDebug("merge contact %s ", ad.uid().latin1()); | 320 | //qDebug("merge contact %s ", ad.uid().latin1()); |
315 | setUid( ad.uid() ); | 321 | setUid( ad.uid() ); |
316 | setRevision( ad.revision() ); | 322 | setRevision( ad.revision() ); |
@@ -334,12 +340,46 @@ bool Addressee::removeVoice() | |||
334 | return found; | 340 | return found; |
335 | } | 341 | } |
342 | |||
343 | bool Addressee::containsAdr(const Addressee& ad ) | ||
344 | { | ||
345 | if ( ! ad.mData->familyName.isEmpty() ) if ( mData->familyName != ad.mData->familyName) return false; | ||
346 | if ( ! ad.mData->givenName.isEmpty() )if ( mData->givenName != ad.mData->givenName ) return false; | ||
347 | if ( ad.mData->url.isValid() ) if (mData->url != ad.mData->url) return false ; | ||
348 | if ( ! ad.mData->role.isEmpty() ) if (mData->role != ad.mData->role) return false ; | ||
349 | if ( ! ad.mData->organization.isEmpty() ) if (mData->organization != ad.mData->organization) return false ; | ||
350 | if ( ! ad.mData->note.isEmpty() ) if (mData->note != ad.mData->note) return false ; | ||
351 | if ( ! ad.mData->title .isEmpty() ) if (mData->title != ad.mData->title ) return false ; | ||
352 | |||
353 | // compare phone numbers | ||
354 | PhoneNumber::List phoneN = ad.phoneNumbers(); | ||
355 | PhoneNumber::List::Iterator phoneIt; | ||
356 | bool found = false; | ||
357 | for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) { | ||
358 | bool found = false; | ||
359 | PhoneNumber::List phoneL = ad.phoneNumbers(); | ||
360 | PhoneNumber::List::Iterator phoneItL; | ||
361 | for ( phoneItL = phoneL.begin(); phoneItL != phoneL.end(); ++phoneItL ) { | ||
362 | if ( ( *phoneItL ).number() == ( *phoneIt ).number() ) { | ||
363 | found = true; | ||
364 | break; | ||
365 | } | ||
366 | } | ||
367 | if ( ! found ) | ||
368 | return false; | ||
369 | } | ||
370 | return true; | ||
371 | |||
372 | } | ||
336 | void Addressee::simplifyAddresses() | 373 | void Addressee::simplifyAddresses() |
337 | { | 374 | { |
338 | if ( mData->addresses.count() < 3 ) return ; | 375 | int max = 2; |
376 | if ( mData->url.isValid() ) | ||
377 | max = 1; | ||
378 | if ( mData->addresses.count() <= max ) return ; | ||
339 | int count = 0; | 379 | int count = 0; |
340 | Address::List list; | 380 | Address::List list; |
341 | Address::List::Iterator it; | 381 | Address::List::Iterator it; |
342 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 382 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
343 | if ( count > 1 ) | 383 | if ( count >= max ) |
344 | list.append( *it ); | 384 | list.append( *it ); |
345 | ++count; | 385 | ++count; |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 0aa2c51..03138f6 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -123,4 +123,5 @@ class Addressee | |||
123 | void simplifyPhoneNumberTypes(); | 123 | void simplifyPhoneNumberTypes(); |
124 | bool removeVoice(); | 124 | bool removeVoice(); |
125 | bool containsAdr(const Addressee& addr ); | ||
125 | 126 | ||
126 | /** | 127 | /** |
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index e5abc0e..6e94c7e 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp | |||
@@ -73,8 +73,6 @@ bool PhoneNumber::simplifyNumber() | |||
73 | Number = mNumber.stripWhiteSpace (); | 73 | Number = mNumber.stripWhiteSpace (); |
74 | mNumber = ""; | 74 | mNumber = ""; |
75 | if ( Number.at(0) == '+' ) | ||
76 | mNumber += "+"; | ||
77 | for ( i = 0; i < Number.length(); ++i) { | 75 | for ( i = 0; i < Number.length(); ++i) { |
78 | if ( Number.at(i).isDigit() ) | 76 | if ( Number.at(i).isDigit() || Number.at(i) == '+'|| Number.at(i) == '*'|| Number.at(i) == '#' ) |
79 | mNumber += Number.at(i); | 77 | mNumber += Number.at(i); |
80 | } | 78 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a7967cb..cd261f6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -186,6 +186,6 @@ class KAex2phonePrefs : public QDialog | |||
186 | mPhoneModel = new QLineEdit( temphb); | 186 | mPhoneModel = new QLineEdit( temphb); |
187 | lay->addWidget( temphb ); | 187 | lay->addWidget( temphb ); |
188 | mWriteToSim= new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this ); | 188 | // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this ); |
189 | lay->addWidget( mWriteToSim ); | 189 | // lay->addWidget( mWriteToSim ); |
190 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) ); | 190 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) ); |
191 | lab->setAlignment (AlignHCenter ); | 191 | lab->setAlignment (AlignHCenter ); |
@@ -695,62 +695,12 @@ void KABCore::export2phone() | |||
695 | 695 | ||
696 | #ifdef _WIN32_ | 696 | #ifdef _WIN32_ |
697 | QString fileName = locateLocal("tmp", "tempfile.vcf"); | 697 | QString fileName = locateLocal("tmp", "phonefile.vcf"); |
698 | #else | 698 | #else |
699 | QString fileName = "/tmp/kdepimtemp.vcf"; | 699 | QString fileName = "/tmp/phonefile.vcf"; |
700 | #endif | 700 | #endif |
701 | 701 | ||
702 | KABC::VCardConverter converter; | 702 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) |
703 | QString description; | 703 | return; |
704 | QString datastream; | ||
705 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | ||
706 | KABC::Addressee a = mAddressBook->findByUid( *it ); | ||
707 | |||
708 | if ( a.isEmpty() ) | ||
709 | continue; | ||
710 | a.simplifyEmails(); | ||
711 | a.simplifyPhoneNumbers(); | ||
712 | a.simplifyPhoneNumberTypes(); | ||
713 | a.simplifyAddresses(); | ||
714 | |||
715 | if (description.isEmpty()) | ||
716 | description = a.formattedName(); | ||
717 | QString vcard; | ||
718 | QString vcardnew; | ||
719 | converter.addresseeToVCard( a, vcard ); | ||
720 | int start = 0; | ||
721 | int next; | ||
722 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { | ||
723 | int semi = vcard.find(";", next); | ||
724 | int dopp = vcard.find(":", next); | ||
725 | int sep; | ||
726 | if ( semi < dopp && semi >= 0 ) | ||
727 | sep = semi ; | ||
728 | else | ||
729 | sep = dopp; | ||
730 | vcardnew +=vcard.mid( start, next - start); | ||
731 | vcardnew +=vcard.mid( next+5,sep -next -5 ).upper(); | ||
732 | start = sep; | ||
733 | } | ||
734 | vcardnew += vcard.mid( start,vcard.length() ); | ||
735 | vcard = ""; | ||
736 | start = 0; | ||
737 | while ( (next = vcardnew.find("ADR", start) )>= 0 ) { | ||
738 | int sep = vcardnew.find(":", next); | ||
739 | vcard +=vcardnew.mid( start, next - start+3); | ||
740 | start = sep; | ||
741 | } | ||
742 | vcard += vcardnew.mid( start,vcardnew.length() ); | ||
743 | vcard.replace ( QRegExp(";;;") , "" ); | ||
744 | vcard.replace ( QRegExp(";;") , "" ); | ||
745 | datastream += vcard; | ||
746 | 704 | ||
747 | } | ||
748 | QFile outFile(fileName); | ||
749 | if ( outFile.open(IO_WriteOnly) ) { | ||
750 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); | ||
751 | QTextStream t( &outFile ); // use a text stream | ||
752 | t.setEncoding( QTextStream::UnicodeUTF8 ); | ||
753 | t <<datastream; | ||
754 | outFile.close(); | ||
755 | if ( PhoneAccess::writeToPhone( fileName ) ) | 705 | if ( PhoneAccess::writeToPhone( fileName ) ) |
756 | qDebug("Export okay "); | 706 | qDebug("Export okay "); |
@@ -758,9 +708,4 @@ void KABCore::export2phone() | |||
758 | qDebug("Error export contacts "); | 708 | qDebug("Error export contacts "); |
759 | 709 | ||
760 | } else { | ||
761 | qDebug("Error open temp file "); | ||
762 | return; | ||
763 | } | ||
764 | |||
765 | 710 | ||
766 | #if 0 | 711 | #if 0 |
@@ -2844,4 +2789,5 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
2844 | if ( syncOK ) { | 2789 | if ( syncOK ) { |
2845 | if ( syncManager->mWriteBackFile ) { | 2790 | if ( syncManager->mWriteBackFile ) { |
2791 | abLocal.removeSyncAddressees( false ); | ||
2846 | abLocal.saveAB(); | 2792 | abLocal.saveAB(); |
2847 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2793 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
@@ -2876,5 +2822,6 @@ bool KABCore::syncPhone() | |||
2876 | AddressBook abLocal( fileName,"syncContact"); | 2822 | AddressBook abLocal( fileName,"syncContact"); |
2877 | bool syncOK = false; | 2823 | bool syncOK = false; |
2878 | if ( abLocal.load() ) { | 2824 | { |
2825 | abLocal.importFromFile( fileName ); | ||
2879 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2826 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
2880 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2827 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
@@ -2884,7 +2831,8 @@ bool KABCore::syncPhone() | |||
2884 | if ( syncOK ) { | 2831 | if ( syncOK ) { |
2885 | if ( syncManager->mWriteBackFile ) { | 2832 | if ( syncManager->mWriteBackFile ) { |
2833 | abLocal.removeSyncAddressees( true ); | ||
2886 | abLocal.saveABphone( fileName ); | 2834 | abLocal.saveABphone( fileName ); |
2887 | abLocal.preparePhoneSync( mCurrentSyncDevice, false ); | 2835 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); |
2888 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2836 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); |
2889 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2837 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2890 | } | 2838 | } |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 84cc448..cf8f996 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -201,5 +201,5 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
201 | topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); | 201 | topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); |
202 | ++iii; | 202 | ++iii; |
203 | mWriteContactToSIM= new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget ); | 203 | mWriteContactToSIM = 0;//new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget ); |
204 | QHBox* temphb = new QHBox( phoneWidget ); | 204 | QHBox* temphb = new QHBox( phoneWidget ); |
205 | new QLabel( i18n("I/O device: "), temphb ); | 205 | new QLabel( i18n("I/O device: "), temphb ); |
@@ -414,4 +414,5 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
414 | mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ; | 414 | mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ; |
415 | 415 | ||
416 | if ( mWriteContactToSIM ) | ||
416 | mWriteContactToSIM->setChecked( prof->getWriteContactToSIM()); | 417 | mWriteContactToSIM->setChecked( prof->getWriteContactToSIM()); |
417 | mPhoneDevice->setText(prof->getPhoneDevice()); | 418 | mPhoneDevice->setText(prof->getPhoneDevice()); |
@@ -581,5 +582,5 @@ void KSyncPrefsDialog::saveProfile() | |||
581 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); | 582 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); |
582 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); | 583 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); |
583 | 584 | if ( mWriteContactToSIM ) | |
584 | prof->setWriteContactToSIM(mWriteContactToSIM->isChecked()); | 585 | prof->setWriteContactToSIM(mWriteContactToSIM->isChecked()); |
585 | prof->setPhoneDevice( mPhoneDevice->text() ); | 586 | prof->setPhoneDevice( mPhoneDevice->text() ); |
@@ -716,5 +717,5 @@ void KSyncPrefsDialog::helpDevice() | |||
716 | void KSyncPrefsDialog::helpModel() | 717 | void KSyncPrefsDialog::helpModel() |
717 | { | 718 | { |
718 | QString hint = i18n("Leave empty or\ninsert name of phone model:\n"); | 719 | QString hint = i18n("Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n"); |
719 | hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection"; | 720 | hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection"; |
720 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | 721 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); |