FCL/sf/mw/appsupport: comparison coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp

equal deleted inserted replaced

-:50b444048a8d
+:920c9a724929
 #include <rfs.rsg>
 #include <PSVariables.h>
 #include <featmgr.h>
 #include <eikenv.h>
 #include <centralrepository.h>
-#include <pdpcontextmanagerpskeys.h>
 #include <pdpcontextmanagerinternalcrkeys.h>
 #include <StringLoader.h>
-// P&S KEYS FROM SIP & PDP CONNECTION
-#include <e32property.h>
-#include <pdpcontextmanagerpskeys.h>
-#include <sipsystemstatemonitorpskeys.h>
 // USER INCLUDES
 #include "rfsConnectionObserver.h"
 #include "RfsTraces.h"
 if (iIsSIPConnectionsPresent || iIsPDPFeatureEnabled)
 {
 Subscribe();
 }
+// Create the Timer Active Object
+iRfsConTimer = CRfsConTimer :: NewL(this);
 TRACES("CRfsConnectionObserver::ConstructL(): End");
 }
 // ---------------------------------------------------------------------------
 // C++ constructor
 // C++ destructor
 // ---------------------------------------------------------------------------
 CRfsConnectionObserver::~CRfsConnectionObserver()
 {
 TRACES("CRfsConnectionObserver::~CRfsConnectionObserver()");
+if(iRfsConTimer)
+{
+delete iRfsConTimer;
+}
 Cancel();
 delete iWait;
 TRACES("CRfsConnectionObserver::~CRfsConnectionObserver(): End");
 }
 }
 // only perform the following operation if the 'iIsClosingConnectionsApplicable' is ETrue
 iAllConnectionClosed = EFalse;
-// Send P&S notification to SIP that RFS has started
 TInt err(KErrNone);
 if (iIsSIPConnectionsPresent && iState == ESipConnectionClose)
 {
+// Send P&S notification to SIP that RFS has started and start the timer
 err = iSIPProperty.Set(KPSSipRfsUid, KSipRfsState, ESipRfsStarted );
+iRfsConTimer->IssueTimerRequest();
 iIsSipInformedForClosingAllConnection = ETrue;
 }
 else if (iIsPDPFeatureEnabled && iState == EPdpConnectionClose)
 {
+// Send P&S notification to PDP that RFS has started and start the timer
 err = iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStart );
+iRfsConTimer->IssueTimerRequest();
 iIsPDPInformedforClosingAllConnection = ETrue;
 }
 // Leave from here is there is any error setting the intial handshake information
 // This means that RFS has failed as there was some problem setting the P&S keys
 User::LeaveIfError(err);
-if(err != KErrNone)
-{
-TRACES1("CRfsConnectionObserver::CloseAlwaysOnConnectionL(): Err = %d", err);
-// This means that the RFS has failed
-return EFalse;
-}
 // we set the flag to indicate showl is called and the dialog needs to be
 // dismissed from within the RunL()
 iIsWaitForDialogExecuted = ETrue;
 // Start displaying the dialog which will then be closed form the RunL()
 }
 if (iIsPDPInformedforClosingAllConnection)
 {
 iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStop);
 }
+if(iRfsConTimer)
+{
+// Cancel the Active timer if the user cancel the Rfs operation
+iRfsConTimer->Cancel();
+}
 }
 void CRfsConnectionObserver::ProgressDialogClosed(const CHbDeviceProgressDialogSymbian *  iDialog)
 {
 {
 if (iIsWaitForDialogExecuted && !iIsPDPFeatureEnabled)
 {
 // set the information that we have closed all the active connections
 // here itself because the PDP connection/feature doen't exist
+// Cancel the outstanding timer request
 iAllConnectionClosed = ETrue;
+iRfsConTimer->Cancel();
 DismissWaitDialog();
 }
 if (iIsPDPFeatureEnabled)
 {
 iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStart );
 // change the state to the next from within this as we are done with closing the SIP connection
-iState = EPdpConnectionClose;
+// Cancel the Outstanding SIP  and timer request
+// Subscribe to PDP  and start the timer
+Cancel();
+iRfsConTimer->Cancel();
+iState = EPdpConnectionClose;
+Subscribe();
+iRfsConTimer->IssueTimerRequest();
 //
 // Under following cases the 'iIsPDPInformedforClosingAllConnection' will be set
 //
 // CASE 1:
 //          When from within CloseAlwaysOnConnectionL we inform the PDP to
 {
 // The response from PDP of closing all its connections have been recieved
 // Now we may proceed to dsmiss the dialog and also set the state to the True for
 // all active connections closed
 iAllConnectionClosed = ETrue;
+iRfsConTimer->Cancel();
 DismissWaitDialog();
 }
 }
 } // end switch-case block
 }
 // ---------------------------------------------------------------------------
 void CRfsConnectionObserver::DoCancel()
 {
 TRACES("CRfsConnectionObserver::DoCancel()");
-if(iIsPDPFeatureEnabled)
+if(iIsSIPConnectionsPresent && iState == ESipConnectionClose)
+{
+iSIPProperty.Cancel();
+if(!iIsPDPFeatureEnabled)
+{
+DismissWaitDialog();
+}
+}
+if(iIsPDPFeatureEnabled && iState == EPdpConnectionClose)
 {
 iPDPProperty.Cancel();
-}
+DismissWaitDialog();
-if(iIsSIPConnectionsPresent)
+}
-{
-iSIPProperty.Cancel();
-}
-DismissWaitDialog();
 TRACES("CRfsConnectionObserver::DoCancel(): End");
 }
 // ---------------------------------------------------------------------------
 // CRfsConnectionObserver::Subscribe

changeset 53	920c9a724929
parent 29	6a787171e1de
child 81	676b6116ca93