--- a/connectionutilities/ConnectionDialogs/cconndlg/inc/ConnDlgPlugin.h Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/cconndlg/inc/ConnDlgPlugin.h Wed Sep 01 12:23:51 2010 +0100
@@ -16,10 +16,6 @@
*/
-// NOTE that the functionality this header contains is DEPRECATED
-// None on the methods have UI functionality, the plugins complete the requests
-// immediately when they are started
-
#ifndef __CONNDLGPLUGIN_H__
#define __CONNDLGPLUGIN_H__
@@ -91,6 +87,8 @@
// FORWARD DECLARATION
class CAknMultiLineDataQueryDialog;
class CAknQueryDialog;
+class CActiveCConnDlgIapPlugin;
+class CActiveSelectConnectionPlugin;
// CLASS DECLARATION
@@ -113,65 +111,7 @@
* @param -
* return CConnDlgIapPlugin*
*/
- static CConnDlgIapPlugin* NewL( const TBool /*aResourceFileResponsible*/ );
-
- /**
- * RegisterL register the client notifier function
- * @param -
- * return TNotifierInfo
- */
- TNotifierInfo RegisterL();
-
- /**
- * Start the Notifier
- * @param aBuffer Buffer
- * @param aReplySlot Identifies which message argument to use for the
- * reply. This message argument will refer to a
- * modifiable descriptor, a TDes8 type, into which data
- * can be returned.
- * @param aMessage Message
- * return -
- */
- void StartL( const TDesC8& aBuffer, TInt aReplySlot,
- const RMessagePtr2& aMessage );
-
- /**
- * Cancel() the notifier
- * @param -
- * return -
- */
- void Cancel();
-
-public:
-
- /**
- * CompleteL the notifier is complete
- * @param aStatus status
- * return -
- */
- void CompleteL( TInt aStatus );
-
-private:
- TUint32 iIAP; // Internet Access Point
- };
-
-
-/**
- * Authentication Plugin class
- */
-NONSHARABLE_CLASS( CConnDlgAuthenticationPlugin ) :
- public CConnectionDialogsNotifBase
- {
-public:
- CConnDlgAuthenticationPlugin();
-
- /**
- * NewL function
- * @param -
- * return CConnDlgAuthenticationPlugin*
- */
- static CConnDlgAuthenticationPlugin* NewL(
- const TBool /*aResourceFileResponsible*/ );
+ static CConnDlgIapPlugin* NewL( const TBool aResourceFileResponsible );
/**
* RegisterL register the client notifier function
@@ -208,6 +148,102 @@
* return -
*/
void CompleteL( TInt aStatus );
+
+ /**
+ * Sets the preferred iap into db.
+ * calls iActivePlugin
+ * @param aIAPId id of the preferred iap
+ */
+ void SetPreferredIapIdL( TUint32 aIAPId );
+
+private:
+
+ /**
+ * Gets user connection info.
+ * @param aIapId id of the iap
+ */
+ TInt GetUserConnection( TInt& aIapId );
+
+ /**
+ * Gets active connection info.
+ * @param aIapId id of the iap
+ * @param aBearer bearer type
+ */
+ TInt GetActiveConnection( TInt& aIapId, TInt& aBearer );
+
+private:
+ TUint32 iIAP; // Internet Access Point
+ TPckgBuf<TConnectionPrefs> iPrefs; // Selected preferences
+ CActiveCConnDlgIapPlugin* iActivePlugin; // pointer to active object
+ };
+
+
+/**
+ * Authentication Plugin class
+ */
+NONSHARABLE_CLASS( CConnDlgAuthenticationPlugin ) :
+ public CConnectionDialogsNotifBase
+ {
+public:
+ CConnDlgAuthenticationPlugin::CConnDlgAuthenticationPlugin();
+
+ /**
+ * NewL function
+ * @param -
+ * return CConnDlgAuthenticationPlugin*
+ */
+ static CConnDlgAuthenticationPlugin* NewL(
+ const TBool aResourceFileResponsible );
+
+ /**
+ * RegisterL register the client notifier function
+ * @param -
+ * return TNotifierInfo
+ */
+ TNotifierInfo RegisterL();
+
+ /**
+ * Start the Notifier
+ * @param aBuffer Buffer
+ * @param aReplySlot Identifies which message argument to use for the
+ * reply. This message argument will refer to a
+ * modifiable descriptor, a TDes8 type, into which data
+ * can be returned.
+ * @param aMessage Message
+ * return -
+ */
+ void StartL( const TDesC8& aBuffer, TInt aReplySlot,
+ const RMessagePtr2& aMessage );
+
+ /**
+ * Cancel() the notifier
+ * @param -
+ * return -
+ */
+ void Cancel();
+
+public:
+
+ /**
+ * GetAuthenticationL() show the Authenticate dialog
+ * @param -
+ * return -
+ */
+ void GetAuthenticationL();
+
+ /**
+ * CompleteL the notifier is complete
+ * @param aStatus status
+ * return -
+ */
+ void CompleteL( TInt aStatus );
+
+private:
+ TPckgBuf<TAuthenticationPair> iAuthPair; // Authentication pair
+ // (username and password)
+ TPckgBuf<TAuthenticationPairBuff> iAuthPairBuff; // Authentication pair
+ // (username and password)
+ CAknMultiLineDataQueryDialog *iDialog; // Pointer to the dialog
};
@@ -225,7 +261,7 @@
* return CConnDlgReconnectPlugin*
*/
static CConnDlgReconnectPlugin* NewL(
- const TBool /*aResourceFileResponsible*/ );
+ const TBool aResourceFileResponsible );
/**
* RegisterL register the client notifier function
@@ -257,11 +293,22 @@
public:
/**
+ * GetReconnectL() call the reconnect dialog
+ * @param -
+ * return -
+ */
+ void GetReconnectL();
+
+ /**
* CompleteL the notifier is complete
* @param aStatus status
* return -
*/
void CompleteL(TInt aStatus);
+
+private:
+ CAknQueryDialog* iDialog; // Pointer to the dialog
+ TBool iBool; // Tells if it has to connect to the IAP
};
@@ -277,7 +324,137 @@
* @param -
* return CConnDlgReconnectPlugin*
*/
- static CConnDlgQosPlugin* NewL( const TBool /*aResourceFileResponsible*/ );
+ static CConnDlgQosPlugin* NewL( const TBool aResourceFileResponsible );
+
+ /**
+ * RegisterL register the client notifier function
+ * @param -
+ * return TNotifierInfo
+ */
+ TNotifierInfo RegisterL();
+
+ /**
+ * Start the Notifier
+ * @param aBuffer Buffer
+ * @param aReplySlot Identifies which message argument to use for the
+ * reply. This message argument will refer to a
+ * modifiable descriptor, a TDes8 type, into which data
+ * can be returned.
+ * @param aMessage Message
+ * return -
+ */
+ void StartL( const TDesC8& aBuffer, TInt aReplySlot,
+ const RMessagePtr2& aMessage );
+
+ /**
+ * Cancel() the notifier
+ * @param -
+ * return -
+ */
+ void Cancel();
+
+public:
+
+ /**
+ * GetReconnectL() call the reconnect dialog
+ * @param -
+ * return -
+ */
+ void GetReconnectL();
+
+ /**
+ * CompleteL the notifier is complete
+ * @param aStatus status
+ * return -
+ */
+ void CompleteL( TInt aStatus );
+
+private:
+ CAknQueryDialog* iDialog; // Pointer to the dialog
+ TBool iBool; // Tells if it has to connect to the IAP
+ };
+
+
+/**
+ * New IAP Plugin class
+ */
+NONSHARABLE_CLASS( CConnDlgNewIapPlugin ) : public CConnectionDialogsNotifBase
+ {
+public:
+
+ /**
+ * NewL function
+ * @param -
+ * return CConnDlgNewIapPlugin*
+ */
+ static CConnDlgNewIapPlugin* NewL( const TBool aResourceFileResponsible );
+
+ /**
+ * RegisterL register the client notifier function
+ * @param -
+ * return TNotifierInfo
+ */
+ TNotifierInfo RegisterL();
+
+ /**
+ * Start the Notifier
+ * @param aBuffer Buffer
+ * @param aReplySlot Identifies which message argument to use for the
+ * reply. This message argument will refer to a
+ * modifiable descriptor, a TDes8 type, into which data
+ * can be returned.
+ * @param aMessage Message
+ * return -
+ */
+ void StartL( const TDesC8& aBuffer, TInt aReplySlot,
+ const RMessagePtr2& aMessage );
+
+ /**
+ * Cancel() the notifier
+ * @param -
+ * return -
+ */
+ void Cancel();
+
+public:
+
+ /**
+ * GetNewIapL show NewIap dialog
+ * @param -
+ * return -
+ */
+ void GetNewIapL();
+
+ /**
+ * CompleteL the notifier is complete
+ * @param aStatus status
+ * return -
+ */
+ void CompleteL( TInt aStatus );
+
+private:
+ CAknQueryDialog* iDialog; // Pointer to the dialog
+ TBool iConnect; // Tells if it has to connect
+ // to the IAP
+ TPckgBuf<TNewIapConnectionPrefs> iPrefs; // Selected preferences
+ };
+
+
+
+/**
+ * Connection Selection Plugin class
+ */
+NONSHARABLE_CLASS( CConnDlgSelectConnectionPlugin ) :
+ public CConnectionDialogsNotifBase
+ {
+public:
+ /**
+ * NewL function
+ * @param -
+ * return CConnDlgSelectConnectionPlugin*
+ */
+ static CConnDlgSelectConnectionPlugin* NewL(
+ const TBool aResourceFileResponsible );
/**
* RegisterL register the client notifier function
@@ -314,115 +491,36 @@
* return -
*/
void CompleteL( TInt aStatus );
- };
-
-
-/**
- * New IAP Plugin class
- */
-NONSHARABLE_CLASS( CConnDlgNewIapPlugin ) : public CConnectionDialogsNotifBase
- {
-public:
-
+
/**
- * NewL function
- * @param -
- * return CConnDlgNewIapPlugin*
- */
- static CConnDlgNewIapPlugin* NewL( const TBool /*aResourceFileResponsible*/ );
-
- /**
- * RegisterL register the client notifier function
- * @param -
- * return TNotifierInfo
+ * Sets the preferred iap into db.
+ * calls iActivePlugin
+ * @param aIAPId id of the preferred iap
+ * @param aDestinationId id of the preferred Destination
*/
- TNotifierInfo RegisterL();
-
- /**
- * Start the Notifier
- * @param aBuffer Buffer
- * @param aReplySlot Identifies which message argument to use for the
- * reply. This message argument will refer to a
- * modifiable descriptor, a TDes8 type, into which data
- * can be returned.
- * @param aMessage Message
- * return -
- */
- void StartL( const TDesC8& aBuffer, TInt aReplySlot,
- const RMessagePtr2& aMessage );
-
- /**
- * Cancel() the notifier
- * @param -
- * return -
- */
- void Cancel();
-
-public:
+ void SetElementIDL( TUint32 aIAPId, TUint32 aDestinationId );
+
+private:
/**
- * CompleteL the notifier is complete
- * @param aStatus status
- * return -
- */
- void CompleteL( TInt aStatus );
- };
-
-
-
-/**
- * Connection Selection Plugin class
- */
-NONSHARABLE_CLASS( CConnDlgSelectConnectionPlugin ) :
- public CConnectionDialogsNotifBase
- {
-public:
- /**
- * NewL function
- * @param -
- * return CConnDlgSelectConnectionPlugin*
- */
- static CConnDlgSelectConnectionPlugin* NewL(
- const TBool /*aResourceFileResponsible*/ );
-
- /**
- * RegisterL register the client notifier function
- * @param -
- * return TNotifierInfo
+ * Gets user connection info.
+ * @param aIapId id of the iap
+ * @param aSnapId id of the destination
*/
- TNotifierInfo RegisterL();
-
+ TInt GetUserConnection( TInt& aIapId, TInt& aSnapId );
+
/**
- * Start the Notifier
- * @param aBuffer Buffer
- * @param aReplySlot Identifies which message argument to use for the
- * reply. This message argument will refer to a
- * modifiable descriptor, a TDes8 type, into which data
- * can be returned.
- * @param aMessage Message
- * return -
- */
- void StartL( const TDesC8& /*aBuffer*/, TInt aReplySlot,
- const RMessagePtr2& aMessage );
-
- /**
- * Cancel() the notifier
- * @param -
- * return -
- */
- void Cancel();
-
-public:
-
- /**
- * CompleteL the notifier is complete
- * @param aStatus status
- * return -
- */
- void CompleteL( TInt aStatus );
+ * Gets active connection info.
+ * @param aIapId id of the iap
+ * @param aSnapId id of the destination
+ * @param aBearer bearer type
+ */
+ TInt GetActiveConnection( TInt& aIapId, TInt& aSnapId, TInt& aBearer );
private:
TUint32 iElementID;
+ TPckgBuf<TConnectionPrefs> iPrefs; // Selected preferences
+ CActiveSelectConnectionPlugin* iActivePlugin; // pointer to active object
};
#endif