--- a/bearermanagement/mpm/src/mpmiapselection.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/bearermanagement/mpm/src/mpmiapselection.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -734,7 +734,7 @@
if ( !connectionAlreadyActive &&
( iSession->IsMMSIap( aPolicyPref->IapId() ) == EFalse ) )
{
- CConnectionUiUtilities* connUiUtils;
+ CConnectionUiUtilities* connUiUtils( NULL );
TRAPD( popupError, connUiUtils = CConnectionUiUtilities::NewL() );
if ( popupError == KErrNone )
{
--- a/bearermanagement/mpm/src/mpmserversession.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/bearermanagement/mpm/src/mpmserversession.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -814,9 +814,7 @@
// check whether a started connection exists which already
// uses this IAP. If so, it won't need to be confirmed again
//
- TConnectionState state = iMyServer.CheckUsageOfIap( aIapId, iConnId );
-
- if ( state == EStarted || state == EStarting || state == ERoaming )
+ if ( iMyServer.CheckUsageOfIap( aIapId, iConnId ) == EStarted )
{
MPMLOGSTRING(
"CMPMServerSession::IsConfirmFirstL - IAP already started, \
@@ -1614,8 +1612,10 @@
{
// Process error according to the fact that the connection
// has already been started.
- //
- if ( ( error == KErrCancel ) || ( error == KErrTimedOut ) )
+ // KErrConnectionTerminated is received when user disconnects
+ // connection from Settings/Connection mgr.
+ //
+ if ( ( error == KErrCancel ) || ( error == KErrTimedOut ) || ( error == KErrConnectionTerminated ) )
{
neededAction = EPropagateError;
--- a/connectionmonitoring/connectionmonitorui/inc/ConnectionMonitorUiView.h Mon Jun 21 16:06:29 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/inc/ConnectionMonitorUiView.h Thu Jul 15 19:05:04 2010 +0300
@@ -91,11 +91,6 @@
*/
void ConnectionKeyObserver() const;
- /**
- * Workaround for Avkon event sequence problem, occuring when
- * connection list has been added elements.
- */
- void HandleItemAdditionL();
protected:
/**
--- a/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiAppUi.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiAppUi.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -388,15 +388,7 @@
{
CleanupStack::PushL( connectionInfo );
iConnectionArray->AppendL( connectionInfo );
- CleanupStack::Pop( connectionInfo );
-
- if ( iView->Id() != KDetailsViewId )
- {
- // Avkon: This is needed due to events' timing issues:
- CConnectionMonitorUiView* view =
- ( CConnectionMonitorUiView* )iView;
- view->HandleItemAdditionL();
- }
+ CleanupStack::Pop( connectionInfo );
}
}
@@ -756,11 +748,11 @@
((CConnectionMonitorUiDetailsView*) iView)->ActivateMainViewL();
activateMainView = EFalse;
}
-
+
TInt interval( KTickInterval );
if ( iTimerObserver )
{
- interval = iTimerObserver->GetTickInerval();
+ interval = iTimerObserver->GetTickInerval();
}
StartTimerL( interval );
}
--- a/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiContainer.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiContainer.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -232,6 +232,8 @@
case EConnMonDeleteConnection:
{
CMUILOGGER_WRITE( "OnEventL EConnMonDeleteConnection" );
+ CMUILOGGER_WRITE_F( "validIndex: %b", validIndex );
+
iListBox->UpdateScrollBarsL();
break;
}
@@ -240,10 +242,6 @@
case EConnMonDeleteSubConnection:
{
CMUILOGGER_WRITE( "OnEventL StatusChange SubConnection" );
- if ( validIndex )
- {
- iListBox->DrawItem( aIndex );
- }
break;
}
default:
@@ -266,7 +264,11 @@
{
iListBox->DrawNow();
TInt iNewConnectionCount = iConnectionArray->MdcaCount();
- if ( iOldConnectionCount > iNewConnectionCount )
+ if( iOldConnectionCount < iNewConnectionCount )
+ {
+ iListBox->HandleItemAdditionL();
+ }
+ else if ( iOldConnectionCount > iNewConnectionCount )
{
iListBox->HandleItemRemovalL();
}
--- a/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiView.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiView.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -416,14 +416,6 @@
}
}
-// ---------------------------------------------------------
-// CConnectionMonitorUiView::HandleItemAdditionL
-// ---------------------------------------------------------
-//
-void CConnectionMonitorUiView::HandleItemAdditionL()
- {
- iContainer->ListBox()->HandleItemAdditionL();
- }
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/ConfirmationQueryNotif.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/ConfirmationQueryNotif.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -179,8 +179,8 @@
if ( iDialogVisitor )
{
- delete iDialog;
- iDialog = NULL;
+ delete iDialogVisitor;
+ iDialogVisitor = NULL;
}
}
--- a/dbcreator/commsdatcreator/Inc/cdcprocessordn.h Mon Jun 21 16:06:29 2010 +0300
+++ b/dbcreator/commsdatcreator/Inc/cdcprocessordn.h Thu Jul 15 19:05:04 2010 +0300
@@ -117,10 +117,10 @@
private:
/**
- * Tells whether the current destination has the internet metadata set.
- * @return ETrue if the destination is Internet, EFalse otherwise.
+ * Helper function for creating destinations.
+ * @param aDnId Destination ID for the new destination
*/
-// TBool IsInternet();
+ void CreateDestination( TInt aDnId );
private:
@@ -147,4 +147,4 @@
#endif PROCESSOR_DN_H
-// End of File.
\ No newline at end of file
+// End of File.
--- a/dbcreator/commsdatcreator/Src/cdcprocessordn.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/dbcreator/commsdatcreator/Src/cdcprocessordn.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -145,16 +145,7 @@
break;
}
}
- if (dnId == -1)
- {
- iDestination = iCmManager->CreateDestinationL( KDefaultDestinationName );
- CLOG_WRITE( "Destinaton created without dnId.");
- }
- else
- {
- iDestination = iCmManager->CreateDestinationL( KDefaultDestinationName, dnId);
- CLOG_WRITE_FORMAT( "Destinaton created. dnId:%d", dnId);
- }
+ CreateDestination(dnId);
}
HBufC *destName( NULL );
@@ -468,4 +459,34 @@
CleanupStack::PopAndDestroy( tmp ); // Removes tmp.
}
+// ---------------------------------------------------------
+// CProcessorDN::CreateDestination
+// ---------------------------------------------------------
+//
+void CProcessorDN::CreateDestination(TInt aDnId)
+ {
+ if (aDnId == -1)
+ {
+ iDestination = iCmManager->CreateDestinationL( KDefaultDestinationName );
+ CLOG_WRITE( "Destinaton created without dnId.");
+ }
+ else
+ {
+ TRAPD( err, iDestination = iCmManager->CreateDestinationL( KDefaultDestinationName, aDnId ) );
+ switch ( err )
+ {
+ case KErrNone:
+ CLOG_WRITE_FORMAT( "Destination created. dnId:%d", aDnId);
+ break;
+ case KErrAlreadyExists:
+ CLOG_WRITE_FORMAT( "Destination already exists dnId:%d. Creation failed.", aDnId);
+ iDestination = iCmManager->DestinationL( aDnId );
+ break;
+ default:
+ CLOG_WRITE( "Destination reading failed.");
+ break;
+ }
+ }
+ }
+
// End of File.
--- a/dbcreator/commsdatcreator/Src/cdcprocessorglobal.cpp Mon Jun 21 16:06:29 2010 +0300
+++ b/dbcreator/commsdatcreator/Src/cdcprocessorglobal.cpp Thu Jul 15 19:05:04 2010 +0300
@@ -156,7 +156,7 @@
// Create General connection settings struct and set the default values
iGenConnSettings = new (ELeave) TCmGenConnSettings;
iGenConnSettings->iUsageOfWlan = ECmUsageOfWlanKnown;
- iGenConnSettings->iCellularDataUsageHome = ECmCellularDataUsageAutomatic;
+ iGenConnSettings->iCellularDataUsageHome = ECmCellularDataUsageConfirm;
iGenConnSettings->iCellularDataUsageVisitor = ECmCellularDataUsageConfirm;
CLOG_WRITE( "Initialising FeatureManager\n" )
@@ -267,10 +267,19 @@
CCDSNAPMetadataRecord* defaultRecord = new( ELeave )
CCDSNAPMetadataRecord( snapTable->TableId() );
CleanupStack::PushL( defaultRecord );
- defaultRecord->SetRecordId( KCDNewRecordRequest );
defaultRecord->iMetadata.SetL( 0 );
- defaultRecord->iIcon.SetL( icon );
- defaultRecord->StoreL( *iSession );
+
+ if ( !defaultRecord->FindL( *iSession ) )
+ {
+ defaultRecord->SetRecordId( KCDNewRecordRequest );
+ defaultRecord->iIcon.SetL( icon );
+ defaultRecord->StoreL( *iSession );
+ }
+ else
+ {
+ defaultRecord->iIcon.SetL( icon );
+ defaultRecord->ModifyL( *iSession );
+ }
CleanupStack::PopAndDestroy( defaultRecord ); // defaultRecord
CleanupStack::PopAndDestroy( snapTable ); // snapTable
Binary file dbcreator/conf/commsdatcreator.confml has changed