FCL/sf/app/devicecontrol: comparison applicationmanagement/omascomoadapter/src/omascomoadapter.cpp

equal deleted inserted replaced

-:c4687ff85147
+:6757f1e2efd2
 #include <SyncMLClient.h>
 #include <SyncMLClientDM.h>
 #include <e32property.h>
 #include <centralrepository.h>
 #include <DevManInternalCRKeys.h>
-#include <httpdownloadmgrcommon.h>
 #include "NSmlPrivateAPI.h"
 #include "nsmldmconst.h"
 #include "ampskeys.h"
 #include "nsmldmtreedbclient.h"
-#include "SyncService.h"
+//#include "SyncService.h"
 #include "amprivateCRKeys.h"
 #include <e32cmn.h>
 #include <SWInstDefs.h>
 #ifdef __TARM_SYMBIAN_CONVERGENCY
 accessTypesGetAddReplaceDelete.SetDelete();
 TSmlDmAccessTypes accessTypesAddReplace =
 	    accessTypesAdd;
 accessTypesAddReplace.SetReplace();
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step1" );
 /*
 Node: ./SCOMO
 AM node is the common parent to all application management functionality nodes.
 Support: Mandatory
 MSmlDmDDFObject& am = aDDF.AddChildObjectL(KAMNodeName);
 FillNodeInfoL(am, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 2" );
 /*
 Node: ./SCOMO/Inventory
 This node is start node to application inventory.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& inv = am.AddChildObjectL(KAMInventoryNodeName);
 FillNodeInfoL(inv, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMInventoryNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 3" );
 /*
 Node: ./SCOMO/Inventory/Delivered
 This is node under which applications that are delivered but not installed are found.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& del = inv.AddChildObjectL(KAMDeliveredNodeName);
 FillNodeInfoL(del, accessTypesGetAdd, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMDeliveredNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 4" );
 /*
 Node: ./SCOMO/Inventory/Deployed
 This is a node under which active applications are found.
 The child node descriptions are same as Delivered sibling node, except that <X> cannot be created, data node does not exist and there's no InstallOpts leaf.
 Support: Mandatory
 MSmlDmDDFObject& ac = inv.AddChildObjectL(KAMDeployedNodeName);
 FillNodeInfoL(ac, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMDeployedNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 5" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>
 This dynamic node is placeholder applications that are in Delivered state.
 Support: Mandatory
 Occurs: ZeroOrMore
 MSmlDmDDFObject& deldyna = del.AddChildObjectGroupL();
 FillNodeInfoL(deldyna, accessTypesGetAddReplaceDelete,
 MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
 MSmlDmDDFObject::ENode, KAMDeliveredDynaNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 6" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/PkgID
 This leaf node holds an identifier for an application.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& delid = deldyna.AddChildObjectL(KAMPkgIDNodeName);
 FillNodeInfoL(delid, accessTypesGetAddReplace, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMPkgIDNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 7" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/Name
 This leaf node holds name of an application.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& delname = deldyna.AddChildObjectL(KAMNameNodeName);
 FillNodeInfoL(delname, accessTypesGetAddReplace,
 MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
 MSmlDmDDFObject::EChr, KAMNameNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 8" );
 /*
 Node: ./SCM/Inventory/Delivered/<X>/Status
 This leaf node holds the status of the Delivered. The client updates the node value.
 The values are typically error codes of Operations done on delivered node
 Support: Mandatory
 MSmlDmDDFObject& delstatus = deldyna.AddChildObjectL(KAMStatusNodeName);
 FillNodeInfoL(delstatus, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EInt,
 KAMStatusNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 9" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/PkgType
 This leaf node holds an identifier for an application.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& delpkgtype = deldyna.AddChildObjectL(KAMPkgTypeNodeName);
 FillNodeInfoL(delpkgtype, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMPkgTypeNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 10" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/Data
 This leaf node holds the data of an application.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& delda = deldyna.AddChildObjectL(KAMDataNodeName);
 FillNodeInfoNoDefaultMimeL(delda, accessTypesAddReplace,
 MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
 MSmlDmDDFObject::EBin, KAMDataNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 11" );
 delda.AddDFTypeMimeTypeL(KSisxMimeType);
 delda.AddDFTypeMimeTypeL(KSisMimeType);
 delda.AddDFTypeMimeTypeL(KPipMimeType);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 12" );
 FeatureManager::InitializeLibL();
 if (FeatureManager::FeatureSupported(KFeatureIdJavaMIDP20) )
 {
+	    RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 13" );
 delda.AddDFTypeMimeTypeL(KJadMIMEType);
 delda.AddDFTypeMimeTypeL(KJarMIMEType);
 delda.AddDFTypeMimeTypeL(KJavaMIMEType);
 }
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 14" );
 FeatureManager::UnInitializeLib();
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/Description
 This leaf node holds the possible metadata of an application. Descriptor can be for example such a data that is required by the actual data in the Data leaf, but for some reason they cannot be bundled into same package. An example is Java JAR and JAD file combination, in which JAD file could be placed in MetaData and JAR in Data leaf.
 MSmlDmDDFObject& delmd = deldyna.AddChildObjectL(KAMDescriptionNodeName);
 FillNodeInfoL(delmd, accessTypesGetAddReplace,
 MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
 MSmlDmDDFObject::EBin, KAMDescriptorNodeDescription);
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 15" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/State
 This leaf node holds state value of an application.
 Support: ?
 Occurs: One
 MSmlDmDDFObject& delstate =
 deldyna.AddChildObjectL(KAMStateValueNodeName);
 FillNodeInfoL(delstate, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMStateValueNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 16" );
 /*
 Node: ./SCOMO/Inventory/Delivered/<X>/Operations
 This is a node that allows vendors to extend functionality.
 Support: Optional
 Occurs: One
 KAMRemoveNodeDescription);
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
 DEPLOYED
 *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 17" );
 /*
 Node: ./SCOMO/Inventory/Deployed/<X>
 This dynamic node is placeholder applications that are in Inactive state.
 Support: Mandatory
 Occurs: ZeroOrMore
 */
 MSmlDmDDFObject& deplver = depldyna.AddChildObjectL(KAMVersionNodeName);
 FillNodeInfoL(deplver, accessTypesGetAddReplace,
 MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
 MSmlDmDDFObject::EChr, KAMVersionNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 18" );
 /*
 Node: ./SCOMO/Inventory/Deployed/<X>/Description
 This leaf node holds the version of an application.
 Support: Mandatory
 Occurs: One
 MSmlDmDDFObject& deplstate =
 depldyna.AddChildObjectL(KAMStateValueNodeName);
 FillNodeInfoL(deplstate, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMStateValueNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 19" );
 /*
 Node: ./SCOMO/Inventory/Deployed/<X>/Operations
 This is a node that allows vendors to extend functionality.
 Support: Optional
 Occurs: One
 */
 MSmlDmDDFObject& deplrem = deplop.AddChildObjectL(KAMRemoveNodeName);
 FillNodeInfoL(deplrem, accessTypesExecReplace, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMRemoveNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 20" );
 /*
 Node: ./SCOMO/Inventory/Deployed/<X>/Operations/Activate
 Exec command causes device to activate an application.
 Support: Mandatory
 Occurs: One
 */
 MSmlDmDDFObject& dowid = dowdyna.AddChildObjectL(KAMPkgIDNodeName);
 FillNodeInfoL(dowid, accessTypesGetAddReplace, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMPkgIDNodeDescription);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 21" );
 /*
 Node: ./SCOMO/Download/<X>/Name
 This leaf node holds name of an application.
 Support: Mandatory
 Occurs: One
 dowop.AddChildObjectL(KAMDownloadAndInstallAndInActivateNodeName);
 FillNodeInfoL(dowdownia, accessTypesExec, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMDownloadAndInstallAndInActivateNodeName);
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 22" );
 #ifdef __AM_LASTERROR_NODE
 MSmlDmDDFObject& amext = am.AddChildObjectL(KAMExtNodeName);
 FillNodeInfoL(amext, accessTypesGet, MSmlDmDDFObject::EOne,
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
 KAMExtNodeDescription);
 MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
 KAMLastErrorDescription);
 #endif
 // Ignore generic alert error status if any otherwise adapter fails to load
+RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 23" );
 TRAP_IGNORE(SendPendingGenericAlertL());
-if (GetAdapterValue() == KAMSCOMOAdapter)
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 24" );
-{
+//if (GetAdapterValue() == KAMSCOMOAdapter)
+{
+		RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 25" );
 CheckStateChangesL();
 SetAdapterValue(KAMDefaultValue);
 }
+	RDEBUG( "CSCOMOAdapter::DDFStructureL(): Step 26" );
 CheckAndAddPredefinedNodeL();
 RDEBUG( "CSCOMOAdapter::DDFStructureL(): end" );
 }
 void CSCOMOAdapter::SendPendingGenericAlertL()
 TBuf8<6> dataresult;
 dataresult.Num(finalresult);
-RDEBUG8_2("CSCOMOAdapter::GetIdentifierIdL is targetURIGet '%S'", &targetURIGet);
+TPtrC8 mapping(NSmlDmURI::LastURISeg(targetURIGet) );
-//TPtrC8 mapping(NSmlDmURI::LastURISeg(targetURIGet) );
-HBufC8* identifier=GetIdentifierIdL(internalid );
 TInt retryupdate = iAMdb->GetRetryCountForLuidL(internalid);
 // If retryupdate in Zero then delete its entry from
 // database.
 //ptr.Append(KDataStart);
 ptr.Append(KResultCodeStart);
 ptr.Append(dataresult);
 ptr.Append(KResultCodeEnd);
 ptr.Append(KIdentifierStart);
-ptr.Append(*identifier);
+ptr.Append(mapping);
 ptr.Append(KIdentifierEnd);
 //ptr.Append(KDataEnd);
 HBufC8 *sourceuri = genericalerts[i]->iSourceURI;
 		iItemArray.AppendL(*item);
 TRAP_IGNORE(privateAPI.AddDMGenericAlertRequestL(
 *genericalerts[i]->iCorrelator,iItemArray ));
-//cleanup all the allocated heap cells
-if(data)
 delete data;
-if(metamark)
 delete metamark;
-if(metaformat)
 delete metaformat;
-if(metatype)
 delete metatype;
-if(targeturi)
 delete targeturi;
-if(item)
 delete item;
-if(identifier)
-delete identifier;
 iItemArray.Reset();
 			iItemArray.Close();
 CleanupStack::PopAndDestroy( &privateAPI);
 }
 if (errx == KErrNone && re)
 {
 TPckg<TCertInfo> pcert(info);
 errx = re->Get(KCertKey, pcert) ;
-RDEBUG("CSCOMOAdapter::SessionL() aCertInfo");
+RDEBUG_2("aCertInfo.iFingerprint.Length() is  %u",info.iFingerprint.Length() );
-//RDEBUG_2("aCertInfo.iFingerprint.Length() is  %u",info.iFingerprint.Length() );
 if (errx == KErrNone)
 {
 RDEBUG("CSCOMOAdapter::SessionL() errx == KErrNone");
 }
 else
 TRAP_IGNORE( session.UpdateDeploymentComponentL( iluid, EDCInstallOptions, obj ) );
 TDeplCompAttrType fl(UpdateFlagFromMapping(mapping) );
 if (mapping == KAMDataNodeName || mapping
 == KAMDescriptorNodeName)
 {
 TInt erx(KErrNone);
 if ((mapping == KAMDataNodeName) &&(RecognizeMimeType(aType)== EFalse))
 TPtrC8 aclmapping(URISegsUpTo(aURI, 4) );
 SetMappingL(aclmapping, aTargetState, aLUID);
 iManagement.StateChangeComplete(aLuidi);
 DeactivateIfInactive(aLuidi, aTargetState);
-aRet = EExecSuccess;
+aRet = EOk;
 }
 else
 {
 RDEBUG_2( "CSCOMOAdapter::InstallL(): INSTALL FAILED '%d'" , err);
-//MAPERROR( err, aRet, _L8("Install %d") );
+MAPERROR( err, aRet, _L8("Install %d") );
-	  aRet = EExecInstallFailed;
 }
 }
 // ------------------------------------------------------------------------------------------------
 // CSCOMOAdapter::DefaultMapError( const TInt aErr, TError &aRet )
 // ------------------------------------------------------------------------------------------------
 void CSCOMOAdapter::ExecuteCommandL(const TDesC8& aURI, const TDesC8& aLUID,
 const TDesC8& aArgument, const TDesC8& /*aType*/, TInt aStatusRef)
 {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
+#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
 TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
 #else
 //nothing
 #endif
 RDEBUG8_3("CSCOMOAdapter::ExecuteCommandL(): begin, '%S', '%S'", &aURI, &aLUID );
 SetAdapterValue(KAMSCOMOAdapter);
 CheckStateChangesL();
-TError ret(EExecUndefError);
+TError ret(EError);
 if (aLUID == KNullDesC8)
 {
 RDEBUG("CSCOMOAdapter::ExecuteCommandL(): WARNING no valid luid provided" );
 }
-#ifdef __TARM_SYMBIAN_CONVERGENCY
+#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
 TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
 #else
 TInt cnt(NSmlDmURI::NumOfURISegs(aURI) );
 #endif
 ret = ENotFound;
 }
 else
 if (errx == KErrArgument)
 {
-ret = EExecUndefError;
+ret = EInvalidObject ;
 }
 else
 {
-ret = EExecUndefError;
+ret = EError;
 }
 }
-			SetSCOMOTargetURIL(*iUriDel, mapping, ret);
 }
 else
 {
-ret = EExecUndefError;
+ret = ENotFound;
 RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 5 Not found node" );
 }
 break;
 }
 case 6:
 TInt err(iDbSession.RemoveMappingInfoL(KAMAdapterImplUid,
 *iUriDel, iluid) );
 }
 else
 {
-ret = EExecInstallFailed;
+ret = ENotFound;
 RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 install Not found node" );
 }
 }
 else
 if (mapping == KAMRemoveNodeName)
 // "Nullify" the mapping for argument
 err = iDbSession.RemoveMappingInfoL(KAMAdapterImplUid, aclmapping);
 if (err == KErrNone)
 {
-ret = EExecSuccess;
+ret = EOk;
 }
 if (iInAtomic)
 {
 iBuffer.Append(TAMCommandBufferElement(
 aStatusRef, aURI) );
 else
 {
 RDEBUG_2( "CSCOMOAdapter::ExecuteCommandL(): Remove FAILED '%d'", err);
 if (err == SwiUI::KSWInstErrUserCancel)
-ret = EExecUserCancelled;
+ret = EError;
 else
 MAPERROR( err, ret, _L8("Execute Remove %d") );
 }
 }
 else
 {
-ret = EExecRemoveFailed;
+ret = ENotFound;
 RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 remove Not found node" );
 }
-SetSCOMOTargetURIL(*iUriDel, mapping, ret);
 }
 else
 if (mapping == KAMActivateNodeName)
 {
 //DBG_ARGS8( "CSCOMOAdapter::ExecuteCommandL(): Activating " );
 EDCSInactive) ;
 }
 if (iluid > 0)
 {
 TRAP_IGNORE( SessionL().ActivateL( iluid ) );
-ret = EExecSuccess;
+ret = EOk;
 //MAPERROR( erx, ret, _L8("Activate %d") );
 }
 else
 {
-ret = EExecActivateFailed;
+ret = ENotFound;
 RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 Activate Not found node" );
 }
-SetSCOMOTargetURIL(*iUriDel, mapping, ret);
 }
 else
 if (mapping == KAMDeActivateNodeName)
 {
 //DBG_ARGS8( "CSCOMOAdapter::ExecuteCommandL(): Inactivating " );
 }
 if (iluid > 0)
 {
 TRAP_IGNORE(SessionL().DeactivateL( iluid ) )
 ;
-										ret = EExecSuccess;
+										ret = EOk;
 //MAPERROR( erx, ret,_L8("Dectivate %d") );
 }
 else
 {
-ret = EExecDeactivateFailed;
+ret = ENotFound;
 RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 DeActivate Not found node" );
 }
-SetSCOMOTargetURIL(*iUriDel, mapping, ret);
 }
 else
 {
 RDEBUG8_2( "CSCOMOAdapter::ExecuteCommandL(): ASKED NOT SUPPORTED OPERATION '%S'", &mapping );
-ret = EExecUndefError;
+ret = EError;
 }
 break;
 }
 default:
 {
 RDEBUG8_3( "CSCOMOAdapter::ExecuteCommandL(): ILLEGAL LEVEL %d NODE %S", cnt, &aURI );
-ret = EExecUndefError;
+ret = EInvalidObject;
 break;
 }
 }
 SetStatusL(aStatusRef, ret) ;
 }
-void CSCOMOAdapter::SetSCOMOTargetURIL(const TDesC8& aURI,
-const TDesC8& aMapping,const TError& aErrorStatus)
-{
-RDEBUG( "CSCOMOAdapter:: SetSCOMOTargetURI" );
-TInt cnt(NSmlDmURI::NumOfURISegs(aURI));
-_LIT8( KNSmlNull, "null" );
-CRepository* cenrep = NULL;
-TInt errr(KErrNone);
-TRAP(errr, cenrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ));
-if (errr == KErrNone)
-{
-switch (cnt)
-{
-case 3:
-{
-RDEBUG( "CSCOMOAdapter:: SetSCOMOTargetURI case 3" );
-TInt ASyncSupported = -1;
-CRepository *repository = CRepository::NewLC(
-KCRUidPrivateApplicationManagementKeys);
-repository->Get(KAsyncEnabled, ASyncSupported);
-CleanupStack::PopAndDestroy();
-//means accepted for processing set <Target><LOCURI> to NULL.
-if (ASyncSupported)
-{
-RDEBUG( "CSCOMOAdapter:: ASyncSupported" );
-TInt err1 = cenrep->Set(KNSmlDMSCOMOTargetRef, KNSmlNull);
-RDEBUG_2( "CSCOMOAdapter:: ASyncSupported %d", err1 );
-}
-}
-break;
-case 4:
-{
-RDEBUG( "CSCOMOAdapter:: SetSCOMOTargetURI case 4" );
-if (aMapping == KAMRemoveNodeName)
-{
-if (aErrorStatus == EExecSuccess)
-{
-cenrep->Set(KNSmlDMSCOMOTargetRef, KNSmlNull);
-}
-}
-if (aMapping == KAMActivateNodeName || aMapping
-== KAMDeActivateNodeName)
-{
-RDEBUG( "CSCOMOAdapter:: SetSCOMOTargetURI case KAMActivateNodeName or KAMDeActivateNodeName " );
-if (aErrorStatus == EExecSuccess)
-{
-RDEBUG( "CSCOMOAdapter:: EExecSuccess " );
-_LIT8( KAMInitial, "./" );
-_LIT8( KAMSeparator8, "/" );
-_LIT8( KAMStateValueNodeName, "State" );
-TBuf8<256> targetStateURI;
-targetStateURI.Append(KAMInitial);
-targetStateURI.Append(aURI);
-targetStateURI.Append(KAMSeparator8);
-targetStateURI.Append(KAMStateValueNodeName);
-cenrep->Set(KNSmlDMSCOMOTargetRef, targetStateURI);
-RDEBUG( "CSCOMOAdapter:: EExecSuccess End" );
-}
-else
-{
-cenrep->Set(KNSmlDMSCOMOTargetRef, KNSmlNull);
-}
-}
-}
-break;
-}
-}
-if (cenrep)
-{
-delete cenrep;
-cenrep = NULL;
-}
-}
 void CSCOMOAdapter::ASyncReportL(TUint32 aLuid, const TDesC8& aArgument,
 const TDownloadTarget aTarget,const TDesC8& aURI)
 {
 // while sending generic alert
 // adapter uses entry stored in database and constructs generic alert
 // using SyncML framework API.
 TInt index = 0;
 	// Default max retry count is 5. It is also cenep configurable
 	// Cenrep configuration responsible can change the max retry
 	// count
 TInt retrycount = 5;
 CleanupStack::PushL(serverId);
 //Add Download entry to database
 iAMdb->SaveToDatabaseL(index, aLuid, profId, retrycount, aURI,
 *serverId, aArgument);
 CleanupStack::PopAndDestroy(serverId);
 }
 RProperty counter;
 TInt r=counter.Attach(KUidPSApplicationManagementKeys, KSyncNotifier,
 EOwnerThread);
 User::LeaveIfError(r);
-CSyncService *syncService = CSyncService::NewL(NULL, KDevManServiceStart);
+/*CSyncService *syncService = CSyncService::NewL(NULL, KDevManServiceStart);
 if (syncService)
 {
 syncService->EnableProgressNoteL(EFalse);
 }
-delete syncService;
+delete syncService;*/
 // wait for the previously attached ‘counter’ property to be updated
 TRequestStatus s;
 counter.Subscribe(s);
 User::WaitForRequest(s);
 		switch(status)
 		{
 			case KStatusUserCancelled:
 			{
-				aRet = MSmlDmAdapter::EExecUserCancelled;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusDowloadFailedOOM:
 			{
-				aRet = MSmlDmAdapter::EExecDownFailOOM;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusAlternateDownldAuthFail:
 			{
-			    aRet = MSmlDmAdapter::EExecAltDwnldAuthFail;
+			    aRet = MSmlDmAdapter::EError;
 			    break;
 			}
 			case KStatusDownloadFailed:
 			{
-				aRet = MSmlDmAdapter::EExecDownloadFailed;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusPkgValidationFailed:
 			{
-				aRet = MSmlDmAdapter::EExecPkgValidationFail;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusInstallFailedOOM:
 			{
-				aRet = MSmlDmAdapter::EExecInstallOOM;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusInstallFailed:
 			{
-				aRet = MSmlDmAdapter::EExecInstallFailed;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 		  case KStatusUnSupportedEnvironment:
 			{
-				aRet = MSmlDmAdapter::EExecOperationReject;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			case KStatusAltDowldUnavailable:
 			{
-				aRet = MSmlDmAdapter::EExecAltDwnldSrvUnavailable;
+				aRet = MSmlDmAdapter::EError;
 				break;
 			}
 			default:
 			{
-			    aRet = MSmlDmAdapter::EExecSuccess;
+			    aRet = MSmlDmAdapter::EOk;
 				break;
 			}
 		}
 return value;
 }
 void CSCOMOAdapter::CheckAndAddPredefinedNodeL()
 {
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): begin");
 // Check if SCOMODefault node addition is enabled.
 TInt staticnodeenabled = 0;
 CRepository* cenrep = CRepository::NewLC( KCRUidPrivateApplicationManagementKeys );
 cenrep->Get( KAMStaticNodeEnabled, staticnodeenabled );
 CleanupStack::PopAndDestroy(); //cenrep
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step1");
 if(staticnodeenabled)
 {
 TBuf8<KMaxFullName> temp;
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step2");
 GetPredefinedNodeL(temp);
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step3");
 if (temp.Length())
 {
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step4");
 TBuf8<KMaxFullName> temp1;
 temp1.Zero();
 temp1.Copy(KAMNodeName);
 temp1.Append(KAMSeparator8);
 temp1.Append(KAMDownloadNodeName);
 temp1.Append(KAMSeparator8);
 temp1.Append(temp);
 HBufC8* luid = DirectGetLuidAllocLC(temp1);
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step5");
 if (luid->Length() > 0)
 {
 CleanupStack::PopAndDestroy(luid);
 return;
 }
 else
 {
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step6");
 // Not found, add node and mapping ...
 //TError status(EError);
 TPtrC8 mapping(NSmlDmURI::LastURISeg(temp1) );
 TPtrC8 parent(NSmlDmURI::RemoveLastSeg(temp1) );
 TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
 TInt cnt(NSmlDmURI::NumOfURISegs(temp1) );
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step7");
 TUint32 newLuid(SessionL().DownloadL(mapping));
 //Callback().SetMappingL( temp1, *IntToDes8LC( newLuid ) );
 //CleanupStack::PopAndDestroy();
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step8");
 DirectSetMappingL(temp1, *IntToDes8LC(newLuid) );
+RDEBUG("CSCOMOAdapter::CheckAndAddPredefinedNodeL(): step9");
 CleanupStack::PopAndDestroy(); // for IntToDes8LC()
 CleanupStack::PopAndDestroy(luid);
 }
 }
 }
 TInt CSCOMOAdapter::GetAdapterValue()
 {
 TInt adapterValue;
 CRepository *repository = NULL;
 TRAPD( err, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) );
+RDEBUG_2("error reading cenrep %d", err);
 if (err == KErrNone)
 {
 err = repository->Get(KAMAdapterValue, adapterValue);
 }
 delete repository;
 {
 isSupportedMimeType = ETrue;
 }
 return isSupportedMimeType;
 }
-HBufC8* CSCOMOAdapter::GetIdentifierIdL(const TUint32 aluid)
-{
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: const TUint32 aluid, const TDesC8& aTargetUri" );
-_LIT8(KNull, "null");
-TDeploymentComponent comp;
-HBufC8 *id = NULL;
-TInt err(SessionL().DeploymentComponent(aluid, comp) );
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: Step 1" );
-if(err == KErrNone)
-{
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: Step 1.1" );
-if(comp.iState == EDCSDelivered || comp.iState ==EDCSDownload)
-{
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: iState EDCSActive,EDCSInactive" );
-id = (comp.iPkgID).AllocL();
-}
-else if(comp.iState==EDCSActive || comp.iState ==EDCSInactive)
-{
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: iState EDCSDelivered,EDCSDownload" );
-id = (comp.iId).AllocL();
-}
-else
-{
-id = KNull().AllocL();
-}
-}
-RDEBUG( "CSCOMOAdapter::GetIdentifierIdL: Step 1 end" );
-return id;
-}
 // End of File

branch	RCL_3
changeset 57	6757f1e2efd2
parent 55	c4687ff85147
child 58	5b858729772b