2 files changed, 86 insertions, 25 deletions

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 760c0e7..5325293 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -60,13 +60,12 @@
 QT_BEGIN_NAMESPACE
 
 QNetworkSessionPrivateImpl::QNetworkSessionPrivateImpl(SymbianEngine *engine)
-:   CActive(CActive::EPriorityUserInput), engine(engine),
-    iSocketServ(qt_symbianGetSocketServer()), ipConnectionNotifier(0),
+:   engine(engine), iSocketServ(qt_symbianGetSocketServer()),
+    ipConnectionNotifier(0), ipConnectionStarter(0),
     iHandleStateNotificationsFromManager(false), iFirstSync(true), iStoppedByUser(false),
     iClosedByUser(false), iError(QNetworkSession::UnknownSessionError), iALREnabled(0),
     iConnectInBackground(false), isOpening(false)
 {
-    CActiveScheduler::Add(this);
 
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
     iMobility = NULL;
@@ -90,7 +89,8 @@ void QNetworkSessionPrivateImpl::closeHandles()
 #endif
 
     // Cancel possible RConnection::Start() - may call RConnection::Close if Start was in progress
-    Cancel();
+    delete ipConnectionStarter;
+    ipConnectionStarter = 0;
     //close any open connection (note Close twice is safe in case Cancel did it above)
     iConnection.Close();
 
@@ -397,9 +397,9 @@ void QNetworkSessionPrivateImpl::open()
 
             pref.SetIapId(symbianConfig->numericIdentifier());
 #endif
-            if (!IsActive()) {
-                iConnection.Start(pref, iStatus);
-                SetActive();
+            if (!ipConnectionStarter) {
+                ipConnectionStarter = new ConnectionStarter(*this, iConnection);
+                ipConnectionStarter->Start(pref);
             }
             // Avoid flip flop of states if the configuration is already
             // active. IsOpen/opened() will indicate when ready.
@@ -425,9 +425,9 @@ void QNetworkSessionPrivateImpl::open()
 #else
         TConnSnapPref snapPref(symbianConfig->numericIdentifier());
 #endif
-        if (!IsActive()) {
-            iConnection.Start(snapPref, iStatus);
-            SetActive();
+        if (!ipConnectionStarter) {
+            ipConnectionStarter = new ConnectionStarter(*this, iConnection);
+            ipConnectionStarter->Start(snapPref);
         }
         // Avoid flip flop of states if the configuration is already
         // active. IsOpen/opened() will indicate when ready.
@@ -436,9 +436,9 @@ void QNetworkSessionPrivateImpl::open()
         }
     } else if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
         iKnownConfigsBeforeConnectionStart = engine->accessPointConfigurationIdentifiers();
-        if (!IsActive()) {
-            iConnection.Start(iStatus);
-            SetActive();
+        if (!ipConnectionStarter) {
+            ipConnectionStarter = new ConnectionStarter(*this, iConnection);
+            ipConnectionStarter->Start();
         }
         newState(QNetworkSession::Connecting);
     }
@@ -1007,13 +1007,14 @@ QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 ia
     return publicConfig;
 }
 
-void QNetworkSessionPrivateImpl::RunL()
+void QNetworkSessionPrivateImpl::ConnectionStartComplete(TInt statusCode)
 {
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
     qDebug() << "QNS this : " << QString::number((uint)this) << " - "
-            << "RConnection::RunL with status code: " << iStatus.Int();
+            << "RConnection::Start completed with status code: " << statusCode;
 #endif
-    TInt statusCode = iStatus.Int();
+    delete ipConnectionStarter;
+    ipConnectionStarter = 0;
 
     switch (statusCode) {
         case KErrNone: // Connection created successfully
@@ -1109,11 +1110,6 @@ void QNetworkSessionPrivateImpl::RunL()
     }
 }
 
-void QNetworkSessionPrivateImpl::DoCancel()
-{
-    iConnection.Close();
-}
-
 // Enters newState if feasible according to current state.
 // AccessPointId may be given as parameter. If it is zero, state-change is assumed to
 // concern this session's configuration. If non-zero, the configuration is looked up
@@ -1500,6 +1496,50 @@ void ConnectionProgressNotifier::RunL()
     }
 }
 
+ConnectionStarter::ConnectionStarter(QNetworkSessionPrivateImpl &owner, RConnection &connection)
+    : CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection)
+{
+    CActiveScheduler::Add(this);
+}
+
+ConnectionStarter::~ConnectionStarter()
+{
+    Cancel();
+}
+
+void ConnectionStarter::Start()
+{
+    if (!IsActive()) {
+        iConnection.Start(iStatus);
+        SetActive();
+    }
+}
+
+void ConnectionStarter::Start(TConnPref &pref)
+{
+    if (!IsActive()) {
+        iConnection.Start(pref, iStatus);
+        SetActive();
+    }
+}
+
+void ConnectionStarter::RunL()
+{
+    iOwner.ConnectionStartComplete(iStatus.Int());
+    //note owner deletes on callback
+}
+
+TInt ConnectionStarter::RunError(TInt err)
+{
+    qWarning() << "ConnectionStarter::RunError" << err;
+    return KErrNone;
+}
+
+void ConnectionStarter::DoCancel()
+{
+    iConnection.Close();
+}
+
 QT_END_NAMESPACE
 
 #endif //QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 13980e9..2dda456 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -68,11 +68,12 @@
 QT_BEGIN_NAMESPACE
 
 class ConnectionProgressNotifier;
+class ConnectionStarter;
 class SymbianEngine;
 
 typedef void (*TOpenCUnSetdefaultifFunction)();
 
-class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive
+class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
                                  , public MMobilityProtocolResp
 #endif
@@ -126,7 +127,7 @@ public: // From MMobilityProtocolResp
 #endif    
 
 protected: // From CActive
-    void RunL();
+    void ConnectionStartComplete(TInt statusCode);
     void DoCancel();
     
 private Q_SLOTS:
@@ -165,12 +166,13 @@ private: // data
     mutable RConnection iConnection;
     mutable RConnectionMonitor iConnectionMonitor;
     ConnectionProgressNotifier* ipConnectionNotifier;
-    
+    ConnectionStarter* ipConnectionStarter;
+
     bool iHandleStateNotificationsFromManager;
     bool iFirstSync;
     bool iStoppedByUser;
     bool iClosedByUser;
-    
+
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE    
     CActiveCommsMobilityApiExt* iMobility;
 #endif    
@@ -188,6 +190,7 @@ private: // data
     bool isOpening;
 
     friend class ConnectionProgressNotifier;
+    friend class ConnectionStarter;
 };
 
 class ConnectionProgressNotifier : public CActive
@@ -210,6 +213,24 @@ private: // Data
     
 };
 
+class ConnectionStarter : public CActive
+{
+public:
+    ConnectionStarter(QNetworkSessionPrivateImpl &owner, RConnection &connection);
+    ~ConnectionStarter();
+
+    void Start();
+    void Start(TConnPref &pref);
+protected:
+    void RunL();
+    TInt RunError(TInt err);
+    void DoCancel();
+
+private: // Data
+    QNetworkSessionPrivateImpl &iOwner;
+    RConnection& iConnection;
+};
+
 QT_END_NAMESPACE
 
 #endif //QNETWORKSESSION_IMPL_H