Modified contact with avatar in S60 (N95) is duplicated from device …

…sync due to largeObject setKey name.
sailfishos · Oct 18, 2010 · 7b8c432 · 7b8c432
1 parent c905c3b
commit 7b8c432
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libmeegosyncml (0.4.9-42) unstable; urgency=low
+
+  * Fixes: NB#198456 -  Modified contact with avatar in S60 (N95) is duplicated in device after resync from device.
+
+ -- Amit <amit.5.aggarwal@nokia.com>  Thu, 18 Oct 2010 15:16:32 +0530
+
 libmeegosyncml (0.4.9-41) unstable; urgency=low
 
   * Fixed a couple of issues seen with google sync - not handling percent encoded

diff --git a/src/CommandHandler.cpp b/src/CommandHandler.cpp
@@ -406,7 +406,7 @@ void CommandHandler::composeBatches( const SyncParams& aSyncParams, SyncTarget&
 
                 }
                 // Normal object
-                else if( !aStorageHandler.addItem( id, *aTarget.getPlugin(), QString(), parentKey,
+                else if( !aStorageHandler.addItem( id, *aTarget.getPlugin(), parentKey,
                                                    type, format, item.data ) ) {
                     aResponses.insert( id, COMMAND_FAILED );
                 }

diff --git a/src/StorageHandler.cpp b/src/StorageHandler.cpp
@@ -63,7 +63,6 @@ StorageHandler::~StorageHandler()
 
 bool StorageHandler::addItem( const ItemId& aItemId,
                               StoragePlugin& aPlugin,
-			      const SyncItemKey& aLocalKey,
                               const SyncItemKey& aParentKey,
                               const QString& aType,
                               const QString& aFormat,
@@ -85,7 +84,8 @@ bool StorageHandler::addItem( const ItemId& aItemId,
         return false;
     }
 
-    newItem->setKey( aLocalKey );
+    //Setting empty string as we dont have any local key for it.
+    newItem->setKey(QString());
     newItem->setParentKey( aParentKey );
     newItem->setType( aType );
     newItem->setFormat( aFormat );
@@ -129,7 +129,7 @@ bool StorageHandler::replaceItem( const ItemId& aItemId,
 
     if( !item ) {
         LOG_DEBUG( "Could not find item, processing as Add" );
-        return addItem( aItemId, aPlugin, aLocalKey, aParentKey, aType, aFormat, aData );
+        return addItem( aItemId, aPlugin, aParentKey, aType, aFormat, aData );
     }
 
     item->setParentKey( aParentKey );
@@ -187,7 +187,8 @@ bool StorageHandler::startLargeObjectAdd( StoragePlugin& aPlugin,
         return false;
     }
 
-    newItem->setKey( aRemoteKey);
+    //Setting empty string as we dont have any local key for it.
+    newItem->setKey(QString());
     newItem->setParentKey( aParentKey );
     newItem->setType( aType );
     newItem->setFormat( aFormat );
@@ -306,7 +307,7 @@ bool StorageHandler::finishLargeObject( const ItemId& aItemId )
         return false;
     }
 
-    if( iLargeObject->getKey()->isEmpty() ) {
+    if(iLargeObject->getKey()->isEmpty()) {
         LOG_DEBUG( "Queuing large object for addition" );
         iAddList.insert( aItemId, iLargeObject );
     }
@@ -423,10 +424,10 @@ QMap<ItemId, CommitResult> StorageHandler::commitReplacedItems( StoragePlugin& a
         CommitResult result;
 
         result.iItemKey = *i.value()->getKey();
-	result.iStatus = COMMIT_INIT_REPLACE;	
+        result.iStatus = COMMIT_INIT_REPLACE;
 
         iId.iCmdId = i.key().iCmdId;
-	iId.iItemIndex = i.key().iItemIndex;
+        iId.iItemIndex = i.key().iItemIndex;
 
         LOG_DEBUG( "Checking item" << iId.iCmdId <<"/" << iId.iItemIndex << "for conflict" );
 
@@ -443,7 +444,7 @@ QMap<ItemId, CommitResult> StorageHandler::commitReplacedItems( StoragePlugin& a
             else {
                 LOG_DEBUG( "Conflict resolved, remote side wins" );
                 result.iConflict = CONFLICT_REMOTE_WIN;
-		aConflictResolver->revertLocalChange ( result.iItemKey, CR_REMOVE_LOCAL );
+                aConflictResolver->revertLocalChange ( result.iItemKey, CR_REMOVE_LOCAL );
             }
         }
         else {

diff --git a/src/StorageHandler.h b/src/StorageHandler.h
@@ -143,7 +143,6 @@ class StorageHandler : public QObject
      *
      * @param aItemId Item identification
      * @param aPlugin Local storage plugin
-     * @param aLocalKey Local key of the item or empty 
      * @param aParentKey Key of the parent of this item (local id)
      * @param aType MIME type of the item
      * @param aFormat Format of the item
@@ -152,7 +151,6 @@ class StorageHandler : public QObject
      */
     bool addItem( const ItemId& aItemId,
                   StoragePlugin& aPlugin,
-	          const SyncItemKey& aLocalKey,
                   const SyncItemKey& aParentKey,
                   const QString& aType,
                   const QString& aFormat,

diff --git a/tests_meego/StorageHandlerTest.cpp b/tests_meego/StorageHandlerTest.cpp
@@ -55,7 +55,7 @@ void StorageHandlerTest::testAddItem()
     LocalChanges changes;
     ConflictResolver resolver( changes, PREFER_LOCAL_CHANGES );
 
-    QVERIFY( iStorageHandler.addItem( id, storage, QString(), parent, type, format, data ) );
+    QVERIFY( iStorageHandler.addItem( id, storage, parent, type, format, data ) );
 
     QMap<ItemId, CommitResult> commits = iStorageHandler.commitAddedItems( storage, &resolver );
     QList<CommitResult> results = commits.values();