diff -r b922b9936679 -r 3f1ffafb31ec omads/omadsappui/AspSyncUtil/src/AspSyncHandler.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspSyncHandler.cpp Fri Mar 12 15:41:30 2010 +0200 +++ b/omads/omadsappui/AspSyncUtil/src/AspSyncHandler.cpp Mon Mar 15 12:39:28 2010 +0200 @@ -30,9 +30,11 @@ #include #include #include //For TRequestStatus +#include #include "CPreSyncPlugin.h" #include "AspPreSyncPluginInterface.h" +#include /****************************************************************************** @@ -100,6 +102,7 @@ } delete iWait; + RProperty::Delete(KPSUidNSmlDSSyncApp, KDsJobCancel); CloseSyncSession(); @@ -128,7 +131,13 @@ iSyncSessionOpen = EFalse; iWait = new (ELeave) CActiveSchedulerWait(); - + //Define property for cancel operation. + static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy); + static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData); + RProperty::Define( KPSUidNSmlDSSyncApp,KDsJobCancel,RProperty::EInt, + KAllowAllPolicy,KAllowWriteDeviceDataPolicy); + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrNone ); FLOG( _L("CAspSyncHandler::ConstructL END") ); } @@ -179,6 +188,9 @@ // close handling (eg. end key) if (aButtonId == EKeyPhoneEnd && syncRunning) { + //Set Cancel property when user cancel the Caopy All from Server. + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrCancel ); TRAPD(err, iSyncJob.StopL()); if (err != KErrNone) @@ -206,6 +218,9 @@ // cancel key handling if (aButtonId == EEikBidCancel && syncRunning) { + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrCancel ); + if (iStopEventReceived) { CompleteWithDelay(KErrNone); @@ -419,6 +434,12 @@ { FLOG( _L("CAspSyncHandler::DoSynchronizeL START") ); + //set the cancel Pub sub key to none + if(aSyncParam.iSyncDirection == ESyncDirectionRefreshFromServer) + { + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrNone ); + } iApplicationId = aSyncParam.iApplicationId; iProfileId = aSyncParam.iProfileId; if (aSyncParam.iDialogMode == EModeDialogWait) @@ -491,7 +512,8 @@ FLOG( _L("CAspSyncHandler::SynchronizeCompleted START") ); iSyncRunning = EFalse; - + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrNone ); if (aError != KErrNone) { iSyncError = aError; @@ -550,6 +572,9 @@ if (aEvent == EJobStop) { + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrNone ); + iStopEventReceived = ETrue; if (aError != KErrNone) { @@ -568,6 +593,8 @@ if (aEvent == EJobStartFailed || aEvent == EJobRejected) { + RProperty::Set( KPSUidNSmlDSSyncApp, + KDsJobCancel, KErrNone ); CompleteWithDelay(aError); }