Bugfix #383 && #356

1 files changed, 19 insertions, 14 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index bf27d0f..acd65c4 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -60,33 +60,35 @@ OContact::OContact()
 
 /*!
   \internal
   Creates a new contact.  The properties of the contact are
   set from \a fromMap.
 */
 OContact::OContact( const QMap<int, QString> &fromMap ) :
     OPimRecord(), mMap( fromMap ), d( 0 )
 {
     QString cats = mMap[ Qtopia::AddressCategory ];
     if ( !cats.isEmpty() )
 	setCategories( idsFromString( cats ) );
+
     QString uidStr = find( Qtopia::AddressUid );
 
-    if ( uidStr.isEmpty() )
+    if ( uidStr.isEmpty() || (uidStr.toInt() == 0) ){
+	    qWarning( "Invalid UID found. Generate new one.." );
 	setUid( uidGen().generate() );
-    else
+    }else
 	setUid( uidStr.toInt() );
 
-    if ( !uidStr.isEmpty() )
-	setUid( uidStr.toInt() );
+//     if ( !uidStr.isEmpty() )
+// 	setUid( uidStr.toInt() );
 }
 
 /*!
   Destroys a contact.
 */
 OContact::~OContact()
 {
 }
 
 /*! \fn void OContact::setTitle( const QString &str )
   Sets the title of the contact to \a str.
 */
@@ -562,30 +564,30 @@ QString OContact::toRichText() const
     str = gender();
     if ( !str.isEmpty() && str.toInt() != 0 ) {
 	if ( str.toInt() == 1 )
 	    str = QObject::tr( "Male" );
 	else if ( str.toInt() == 2 )
 	    str = QObject::tr( "Female" );
 	text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
     }
     str = spouse();
     if ( !str.isEmpty() )
 	text += "<b>" + QObject::tr("Spouse: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
-    if ( !birthday().isValid() ){
+    if ( birthday().isValid() ){
 	    str = TimeString::numberDateString( birthday() );
 	    text += "<b>" + QObject::tr("Birthday: ") + "</b>"
 		    + Qtopia::escapeString(str) + "<br>";
     }
-    if ( !anniversary().isValid() ){
+    if ( anniversary().isValid() ){
 	    str = TimeString::numberDateString( anniversary() );
 	    text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
 		    + Qtopia::escapeString(str) + "<br>";
     }
     str = nickname();
     if ( !str.isEmpty() )
 	text += "<b>" + QObject::tr("Nickname: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
 
     // notes last
     if ( (value = notes()) ) {
 	QRegExp reg("\n");
@@ -1114,25 +1116,25 @@ static VObject *createVObject( const OContact &c )
 
 
     QStringList emails = c.emailList();
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
 	VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
 	safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
-    if ( !c.birthday().isValid() ){
+    if ( c.birthday().isValid() ){
 	    QString birthd_rfc2425 = QString("%1-%2-%3")
 		    .arg( c.birthday().year() ) 
 		    .arg( c.birthday().month(), 2 )
 		    .arg( c.birthday().day(), 2 );
 	    // Now replace spaces with "0"...
 	    int pos = 0;
 	    while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
 		    birthd_rfc2425.replace( pos, 1, "0" );
 		    
 	    qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
 	    safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
     }
@@ -1160,29 +1162,33 @@ static VObject *createVObject( const OContact &c )
 
 
 /*!
   \internal
 */
 static QDate convVCardDateToDate( const QString& datestr )
 {
 	int monthPos = datestr.find('-');
 	int dayPos = datestr.find('-', monthPos+1 );
 	int sep_ignore = 1;
 	if ( monthPos == -1 || dayPos == -1 ) {
 		qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
-		// Ok.. Outlook is violating ISO 8601, therefore we will try to read their format ( YYYYMMDD )
-		monthPos   = 4;
-		dayPos     = 6;
-		sep_ignore = 0;
-		qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
+		// Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
+		if ( datestr.length() == 8 ){
+			monthPos   = 4;
+			dayPos     = 6;
+			sep_ignore = 0;
+			qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
+		} else {
+			return QDate();
+		}
 	}
 	int y = datestr.left( monthPos ).toInt();
 	int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
 	int d = datestr.mid( dayPos + sep_ignore ).toInt();
 	qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
 	QDate date ( y,m,d );
 	return date;
 }
 
 static OContact parseVObject( VObject *obj )
 {
     OContact c;
@@ -1540,31 +1546,30 @@ void OContact::setBirthday( const QDate &v )
 */
 void OContact::setAnniversary( const QDate &v )
 {
 	if ( ( !v.isNull() ) && ( v.isValid() ) )
 		replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const 
 { 
-	QDate empty;
 	QString str = find( Qtopia::Birthday );
 	qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  TimeConversion::fromString ( str );
 	else
-		return empty;
+		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const 
 { 
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
 	qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )