*** empty log message ***

1 files changed, 40 insertions, 8 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 4e8a603..6c1a9c0 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2884,28 +2884,31 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
     QString uid;
     manager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
 
     int modulo = (er.count()/10)+1;
     unsigned int incCounter = 0;
     while ( incCounter < er.count()) {
         if (manager->isProgressBarCanceled())
             return e_syncError;
         if ( incCounter % modulo == 0 )
           manager->showProgressBar(incCounter);
 
         uid = er[ incCounter ]; 
+        qDebug("sync uid %s from remote file", uid.latin1());
+
         qApp->processEvents();
 
             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());
                     if ( take == 3 )
                         return e_syncError;
                     if ( take == 1  ) {// take local
                         //US                        syncRemote->removeAddressee( inRemote );
                         (*inRemote) = (*inLocal);
                         //US                        syncRemote->insertAddressee(  inRemote , false);
                         ++changedRemote;
                     } else { // take == 2  take remote
                       //US                        syncLocal->removeAddressee( inLocal );
@@ -3085,44 +3088,73 @@ int PwMDoc::takePwMDataItem( PwMDataItem* local,  PwMDataItem* remote, QDateTime
     }
     return 0;
 }
 
 
 
 
 //this are the overwritten callbackmethods from the syncinterface
 bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
 {
   QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
-  // construct on the stack = automatic cleanup.
+  //1) unlock local file first if necessary (ask for password)
+  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.
   PwMDoc syncTarget(this, "synctarget");
+  PwMDoc* pSyncTarget = &syncTarget;
+
 
-  PwMerror err = syncTarget.openDoc(&filename, 2 /*== deeplocked*/);
+  PwMerror err = pSyncTarget->openDoc(&filename, 1 /*== open with all entries locked*/);
 
-  if (err != e_success)
+  if (err == e_alreadyOpen) {
+    PwMDocList::listItem li;
+    if (getOpenDocList()->find(filename.latin1(), &li))
+      pSyncTarget = li.doc;
+    else {
+      qDebug("PwmDoc::sync: sync failed. Error %i while opening file %s",err, filename.latin1());
+      return false;
+    }
+  }
+  else if (err != e_success) {
+    qDebug("PwmDoc::sync: sync failed. Error %i while opening file %s",err, filename.latin1());
     return false;
-  
+  }
+
   qDebug("PWM file loaded %s,sync mode %d",filename.latin1(), mode );
 
+
+  //3) unlock remote file first if necessary (ask for password)
+  if (pSyncTarget->isDeepLocked()) {
+    PwMerror ret = pSyncTarget->deepLock(false);
+    if (ret != e_success)
+      return false;
+  }
+
   
-  err = syncronize(manager, this, &syncTarget, mode );
+  err = syncronize(manager, this, pSyncTarget, mode );
 
   if (err == e_success) {
             if ( PWMPrefs::instance()->mWriteBackFile ){
       qDebug("Saving remote PWManager file");
-      err = syncTarget.saveDoc(conf()->confGlobCompression());
-      if (err != e_success)
+      err = pSyncTarget->saveDoc(conf()->confGlobCompression());
+      if (err != e_success) {
+        qDebug("PwmDoc::sync: Sync failed. Error %i while storing file %s",err, filename.latin1());
         return false;
-
+      }
     }
 
     flagDirty();
     return true;
   }
   else {
     return false;
   }
 }
 
 //called by the syncmanager to indicate that the work has to marked as dirty.
 void PwMDoc::sync_setModified()