diff -r b183ec05bd8c -r 19bba8228ff0 syncmlfw/dm/syncagent/src/nsmldmagent.cpp --- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Tue Aug 31 16:04:06 2010 +0300 +++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Wed Sep 01 12:27:42 2010 +0100 @@ -50,6 +50,7 @@ #include "NSmlPrivateAPI.h" // FOTA end #include +const TUid KUidNotifier = { 0x101F8769 }; const TInt KNotifierTimeout = 300000000; // 5 min timeout _LIT8 ( KNSmlDMFotaNode, "FUMO" ); @@ -207,7 +208,10 @@ aAlertCode == KNSmlDMAgentNextMessage || aAlertCode == KNSmlDMAgentSessionAbortAlert || aAlertCode == KNSmlDMAgentDisplayAlert || - aAlertCode == KNSmlDMAgentContinueOrAbortAlert ) + aAlertCode == KNSmlDMAgentContinueOrAbortAlert + || aAlertCode == KNSmlDMAgentUserInputAlert + || aAlertCode == KNSmlDMAgentSingleChoiceAlert + || aAlertCode == KNSmlDMAgentMultipleChoiceAlert ) { return ETrue; } @@ -1873,9 +1877,9 @@ // StartNotifier called to avoid Notifier server panic, if // notifier does not exist anymore. TBuf8<1> dummy; -// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. -// iNotifier.CancelNotifier( KUidNotifier ); -// iNotifier.Close(); + iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. + iNotifier.CancelNotifier( KUidNotifier ); + iNotifier.Close(); iNotifierTimeOut.Cancel(); Cancel(); } @@ -1895,9 +1899,19 @@ SetActive(); } + //connect to repository + CRepository* rep = CRepository::NewLC( KCRUidPolicyManagementUtilInternalKeys ); + + //get parameters + TSyncMLAppLaunchNotifParams params; + TPckg data( params ); + User::LeaveIfError( rep->Get( KSyncMLSessionParamsKey, data)); + + CleanupStack::PopAndDestroy( rep); + iNotifierTimeOut.LaunchNotifierTimer( this ); -// User::LeaveIfError( iNotifier.Connect() ); -// iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf ); + User::LeaveIfError( iNotifier.Connect() ); + iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf ); } // -------------------------------------------------------------------------- @@ -1911,9 +1925,9 @@ // StartNotifier called to avoid Notifier server panic, if // notifier does not exist anymore. TBuf8<1> dummy; -// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. + iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. -// iNotifier.CancelNotifier( KUidNotifier ); + iNotifier.CancelNotifier( KUidNotifier ); } // -------------------------------------------------------------------------- @@ -1943,6 +1957,7 @@ if ( ret == KErrNone ) { + TInt sid = iResBuf().iSecureId.iUid; // read secure id from notifier. // Check the response and error code. If there is a fail, dump the job. // Also compare sid to creator id saved for current job to secure that listener owns the job.