1 files changed, 53 insertions, 32 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 0ac5517..2a7b11d 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -484,13 +484,14 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
                         printWarn(string("removing file ")
                                   + tmpFileMoved.latin1()
                                   + " failed!");
                 }
         }
         ret = e_success;
-        printDebug(string("writing file { compress: ")
+        printDebug(string("writing file { name: ")
+                   + filename.latin1() + "   compress: "
                    + tostr(static_cast<int>(compress)) + "   cryptAlgo: "
                    + tostr(static_cast<int>(cryptAlgo)) + "   hashAlgo: "
                    + tostr(static_cast<int>(hashAlgo))
                    + " }");
         goto out;
 out_moveback:
@@ -602,13 +603,15 @@ out_success:
 
 PwMerror PwMDoc::writeFileHeader(char keyHash, char dataHash, char crypt, char compress,
                                  QString *pw, QFile *f)
 {
         PWM_ASSERT(pw);
         PWM_ASSERT(f);
-        PWM_ASSERT(listView);
+        //US ENH: or maybe a bug: checking here for listView does not make sense because we do not check anywhere else
+        //Wenn I sync, I open a doc without a view => listView is 0 => Assertion 
+                //USPWM_ASSERT(listView);
         if (f->writeBlock(FILE_ID_HEADER, strlen(FILE_ID_HEADER)) !=
             static_cast<Q_LONG>(strlen(FILE_ID_HEADER))) {
                 return e_writeFile;
         }
         if (f->putch(PWM_FILE_VER) == -1 ||
             f->putch(keyHash) == -1 ||
@@ -2801,16 +2804,25 @@ PwMerror PwMDoc::importFromGpasman(const QString *file)
 
 void PwMDoc::ensureLvp()
 {
         if (isDocEmpty())
                 return;
 
+        //US ENH BUG: when using syncronizing, this way of sorting
+        //is not sufficient, because there might be empty spaces
+        // at the beginning. But this algorythm only can add elements
+        //to the end.The result are crashes because of listoverflows
+        //we need something to fill all gaps.
         vector< vector<PwMDataItem>::iterator > undefined;
+        vector< vector<PwMDataItem>::iterator > sorted;
         vector< vector<PwMDataItem>::iterator >::iterator undefBegin,
                                                           undefEnd,
                                                           undefI;
+        vector< vector<PwMDataItem>::iterator >::iterator sortedBegin,
+                                                          sortedEnd,
+                                                          sortedI;
         vector<PwMCategoryItem>::iterator catBegin = dti.dta.begin(),
                                           catEnd = dti.dta.end(),
                                           catI = catBegin;
         vector<PwMDataItem>::iterator entrBegin, entrEnd, entrI;
         int lvpTop, tmpLvp;
 
@@ -2823,16 +2835,30 @@ void PwMDoc::ensureLvp()
                 entrI = entrBegin;
 
                 while (entrI != entrEnd) {
                         tmpLvp = entrI->listViewPos;
                         if (tmpLvp == -1)
                                 undefined.push_back(entrI);
-                        else if (tmpLvp > lvpTop)
-                                lvpTop = tmpLvp;
+                        else
+                          sorted[tmpLvp] = entrI;
+                                //US            else if (tmpLvp > lvpTop)
+                        //US lvpTop = tmpLvp;
                         ++entrI;
                 }
+
+                //now we have all undefied in the collection. Now insert the existing
+                sortedBegin = sorted.begin();
+                sortedEnd = sorted.end();
+                sortedI = sortedBegin;
+
+                while (sortedI != sortedEnd) {
+                        tmpLvp = (*sortedI)->listViewPos;
+                        undefined[tmpLvp] = *sortedI;
+                        ++sortedI;
+                }
+
                 undefBegin = undefined.begin();
                 undefEnd = undefined.end();
                 undefI = undefBegin;
                 while (undefI != undefEnd) {
                         (*undefI)->listViewPos = ++lvpTop;
                         ++undefI;
@@ -2845,12 +2871,22 @@ QString PwMDoc::getTitle()
 {
         /* NOTE: We have to ensure, that the returned title
          *       is unique and not reused somewhere else while
          *       this document is valid (open).
          */
         QString title(getFilename());
+
+        //US ENH: The whole filename on PDAs is too long. So use only the last characters
+        if (QApplication::desktop()->width() < 640)
+        {
+          if (title.length() > 30)
+            title = "..." + title.right(30);
+
+        }
+
+
         if (title.isEmpty()) {
                 if (unnamedNum == 0) {
                         unnamedNum = PwMDocList::getNewUnnamedNumber();
                         PWM_ASSERT(unnamedNum != 0);
                 }
                 title = DEFAULT_TITLE;
@@ -2924,13 +2960,13 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         qDebug("PwMDoc::syncronize : newly created local sync data could not be found");
         return e_syncError;
       }
             }
 
   syncItemLocal = syncLocal->getSyncDataEntry(index); 
-  qDebug("Last Sync %s ", syncItemLocal->lastSyncDate.toString().latin1());
+  qDebug("Last Sync Local %s ", syncItemLocal->lastSyncDate.toString().latin1());
 
   //Step 2. Find syncinfo in remote file and create if not existent.
   found = syncRemote->findSyncData(mCurrentSyncName, &index);
   if (found == false)
     {
       qDebug("FULLDATE 1");
@@ -2944,39 +2980,40 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         qDebug("PwMDoc::syncronize : newly created remote sync data could not be found");
         return e_syncError;
       }
     }
   
   syncItemRemote = syncRemote->getSyncDataEntry(index); 
+  qDebug("Last Sync Remote %s ", syncItemRemote->lastSyncDate.toString().latin1());
   //and remove the found entry here. We will reenter it later again.
   //US  syncRemote->delSyncDataEntry(index, true);
 
 
   if ( syncItemLocal->lastSyncDate == mLastSync ) {
     qDebug("FULLDATE 2");
     fullDateRange = true;
   }
   
   if ( ! fullDateRange  ) {
         if ( syncItemLocal->lastSyncDate != syncItemRemote->lastSyncDate ) {
             
-            // 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());
+          //            qDebug("set fulldate to true %s %s" ,syncItemLocal->lastSyncDate.toString().latin1(), syncItemRemote->lastSyncDate.toString().latin1() ); 
+            //            qDebug("%d %d %d %d ", syncItemLocal->lastSyncDate.time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
             qDebug("FULLDATE 3 %s %s", syncItemLocal->lastSyncDate.toString().latin1() , syncItemRemote->lastSyncDate.toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
         mLastSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastSync = syncItemLocal->lastSyncDate;
 
 
     qDebug("*************************** ");
-    // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
+    qDebug("mLastSync %s ",mLastSync.toString().latin1() );
     QStringList er = syncRemote->getIDEntryList(); 
     PwMDataItem* inRemote ;//= er.first();
     PwMDataItem* inLocal;
     unsigned int catLocal, indexLocal;
     unsigned int catRemote, indexRemote;
 
@@ -2998,13 +3035,13 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
 
             inLocal = syncLocal->findEntryByID( uid, &catLocal, &indexLocal );
             inRemote = syncRemote->findEntryByID( uid, &catRemote, &indexRemote );
             PWM_ASSERT(inRemote);
             if ( inLocal != 0 ) { // maybe conflict - same uid in both files
                 if ( (take = takePwMDataItem( inLocal, inRemote, mLastSync, mode, fullDateRange) ) ) {
-                    //qDebug("take %d %s ", take, inL.summary().latin1());
+                    qDebug("take %d %s ", take, inLocal->desc.c_str());
                     if ( take == 3 )
                         return e_syncError;
                     if ( take == 1  ) {// take local
                         //US                        syncRemote->removeAddressee( inRemote );
                         (*inRemote) = (*inLocal);
                         //US                        syncRemote->insertAddressee(  inRemote , false);
@@ -3049,12 +3086,13 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         qApp->processEvents();
         if (manager->isProgressBarCanceled())
             return e_syncError;
         if ( incCounter % modulo == 0 )
           manager->showProgressBar(incCounter);
         uid = el[ incCounter ]; 
+        qDebug("sync uid %s from local file", uid.latin1());
 
         inLocal = syncLocal->findEntryByID( uid, &catLocal, &indexLocal );
         inRemote = syncRemote->findEntryByID( uid, &catRemote, &indexRemote );
         PWM_ASSERT(inLocal);
 
         if ( inRemote == 0 ) { 
@@ -3129,22 +3167,22 @@ int PwMDoc::takePwMDataItem( PwMDataItem* local,  PwMDataItem* remote, QDateTime
        return 0;
         
     qDebug(" %d %d conflict on %s %s ", mode, full, local->desc.c_str(), remote->desc.c_str() );
 
     //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
+    full = true; //debug only
     if ( full ) {
-      bool equ = true;//US ( (*local) == (*remote) );
+      bool equ = ( (*local) == (*remote) );
         if ( equ ) {
-            //qDebug("equal ");
+            qDebug("equal ");
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
-        }//else //debug only
-        //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
+        }else //debug only
+        qDebug("not equal %s %s ", local->desc.c_str(), remote->desc.c_str());
     }
     
     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()  );
 
@@ -3212,13 +3250,13 @@ bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
   if (this->isDeepLocked()) {
     PwMerror ret = this->deepLock(false);
     if (ret != e_success)
       return false;
   }
 
-  //2)  construct and open a new doc on the stack(automatic cleanup) for remote file.
+  //2)  construct and open a new doc on the stack(automatic cleanup of remote file).
   PwMDoc syncTarget(this, "synctarget");
   PwMDoc* pSyncTarget = &syncTarget;
 
 
   PwMerror err = pSyncTarget->openDoc(&filename, 1 /*== open with all entries locked*/);
 
@@ -3264,29 +3302,12 @@ bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
   }
   else {
     return false;
   }
 }
 
-//called by the syncmanager to indicate that the work has to marked as dirty.
-void PwMDoc::sync_setModified()
-{
-  flagDirty();
-}
-
-//called by the syncmanager to ask if the dirty flag is set.
-bool PwMDoc::sync_isModified()
-{
-  return isDirty();
-}
-
-//called by the syncmanager to indicate that the work has to be saved.
-void PwMDoc::sync_save()
-{
-  saveDoc(conf()->confGlobCompression());
-}
 #endif
 
 
 bool PwMDoc::findSyncData(const QString &syncname, unsigned int *index)
 {
         vector<PwMSyncItem>::iterator i = dti.syncDta.begin(),