2 files changed, 38 insertions, 28 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
@@ -71,11 +71,13 @@ OContact::OContact( const QMap<int, QString> &fromMap ) :
         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() );
 }
@@ -573,3 +575,3 @@ QString OContact::toRichText() const
                 + Qtopia::escapeString(str) + "<br>";
-    if ( !birthday().isValid() ){
+    if ( birthday().isValid() ){
             str = TimeString::numberDateString( birthday() );
@@ -578,3 +580,3 @@ QString OContact::toRichText() const
     }
-    if ( !anniversary().isValid() ){
+    if ( anniversary().isValid() ){
             str = TimeString::numberDateString( anniversary() );
@@ -1125,3 +1127,3 @@ static VObject *createVObject( const OContact &c )
     // Exporting Birthday regarding RFC 2425 (5.8.4)
-    if ( !c.birthday().isValid() ){
+    if ( c.birthday().isValid() ){
             QString birthd_rfc2425 = QString("%1-%2-%3")
@@ -1171,7 +1173,11 @@ static QDate convVCardDateToDate( const QString& datestr )
                 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();
+                }
         }
@@ -1551,3 +1557,2 @@ QDate OContact::birthday() const
 { 
-        QDate empty;
         QString str = find( Qtopia::Birthday );
@@ -1557,3 +1562,3 @@ QDate OContact::birthday() const
         else
-                return empty;
+                return QDate();
 }
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index bf27d0f..acd65c4 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -71,11 +71,13 @@ OContact::OContact( const QMap<int, QString> &fromMap ) :
         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() );
 }
@@ -573,3 +575,3 @@ QString OContact::toRichText() const
                 + Qtopia::escapeString(str) + "<br>";
-    if ( !birthday().isValid() ){
+    if ( birthday().isValid() ){
             str = TimeString::numberDateString( birthday() );
@@ -578,3 +580,3 @@ QString OContact::toRichText() const
     }
-    if ( !anniversary().isValid() ){
+    if ( anniversary().isValid() ){
             str = TimeString::numberDateString( anniversary() );
@@ -1125,3 +1127,3 @@ static VObject *createVObject( const OContact &c )
     // Exporting Birthday regarding RFC 2425 (5.8.4)
-    if ( !c.birthday().isValid() ){
+    if ( c.birthday().isValid() ){
             QString birthd_rfc2425 = QString("%1-%2-%3")
@@ -1171,7 +1173,11 @@ static QDate convVCardDateToDate( const QString& datestr )
                 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();
+                }
         }
@@ -1551,3 +1557,2 @@ QDate OContact::birthday() const
 { 
-        QDate empty;
         QString str = find( Qtopia::Birthday );
@@ -1557,3 +1562,3 @@ QDate OContact::birthday() const
         else
-                return empty;
+                return QDate();
 }