--- a/bearermanagement/mpm/src/mpmconfirmdlg.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconfirmdlg.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -86,7 +86,8 @@
// OR
// if ConfirmDlgResponse is not accepted by the iConfirmDlgUser.
//
- if ( !aDlg || !iConfirmDlgUser.ConfirmDlgResponse( &((CMPMConfirmDlg*)aDlg)->iConfirmDlgUser ) )
+ if ( !aDlg || !iConfirmDlgUser.ConfirmDlgResponse(
+ &((CMPMConfirmDlg*)aDlg)->iConfirmDlgUser ) )
{
MPMLOGSTRING3( "CMPMConfirmDlg::Start Display dialog: SNAP %d, IAP %d",
iSnapId, iIAP )
@@ -95,7 +96,7 @@
{
case EConfirmDlgHomeNetwork:
{
- MPMLOGSTRING( " normal confirm dialog" )
+ MPMLOGSTRING( " Show home network confirm dialog" )
iUtils->ConfirmMethodUsageQuery( iResult,
true,
iStatus);
@@ -104,7 +105,7 @@
case EConfirmDlgVisitorNetwork:
{
- MPMLOGSTRING( " normal confirm dialog" )
+ MPMLOGSTRING( " Show visitor network confirm dialog" )
iUtils->ConfirmMethodUsageQuery( iResult,
false,
iStatus);
--- a/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -193,8 +193,6 @@
//
void CMPMConfirmDlgStarting::UserSelectedCancel( const TInt aError )
{
- MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedCancel",
- iConnId )
MPMLOGSTRING3( "CMPMConfirmDlgStarting<0x%x>::UserSelectedCancel:\
Complete %d", iConnId, aError )
iIapSelection.ChooseIapComplete( aError, NULL );
--- a/bearermanagement/mpm/src/mpmiapselection.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/bearermanagement/mpm/src/mpmiapselection.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -131,8 +131,8 @@
iChooseIapPref.SetSnapId( 0 );
}
- MPMLOGSTRING2( "CMPMIapSelection::ChooseIapL: IapID: %i",
- iChooseIapPref.IapId() )
+ MPMLOGSTRING3( "CMPMIapSelection::ChooseIapL: IapID: %i SnapId: %i",
+ iChooseIapPref.IapId(), iChooseIapPref.SnapId() )
// Update WLAN only information and whether new WLAN network usage is allowed.
TBool wlanOnly = iSession->IsWlanOnlyL( iNewWlansAllowed );
@@ -482,7 +482,10 @@
// Check if any suitable IAP's were found, if not then complete selection with error code
if ( validateIapId == 0 )
{
- if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault )
+ if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault ||
+ ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeExplicit &&
+ !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) &&
+ iCommsDatAccess->IsInternetSnapL( 0, snap ) ) )
{
ImplicitConnectionL();
}
--- a/bearermanagement/mpm/src/mpmserver.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/bearermanagement/mpm/src/mpmserver.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -433,6 +433,7 @@
connInfo.iSnap = aSnap;
connInfo.iIapId = aIapId;
connInfo.iState = aState;
+ connInfo.iAppUid = aSession.AppUid();
// Package into TActiveBMConn //TODO Redundant.. remove the other one.
//
@@ -1109,13 +1110,19 @@
// found blacklisted Connection Id
TMPMBlackListConnId connIdInfo = iBlackListIdList[i];
iBlackListIdList.Remove( i ); // remove from the list
+
+ MPMLOGSTRING2( "CMPMServer::HandleServerUnblackListIap - \
+connIdInfo count: %d", connIdInfo.Count() )
if ( aIapId == 0 )
{ // 0 will reset Connection Id blacklisted iap list
+ MPMLOGSTRING( "CMPMServer::HandleServerUnblackListIap - \
+reset Connection Id blacklisted iap list" )
+
connIdInfo.Close();
return KErrNone;
}
-
+
found = EFalse;
for (TInt j = 0; j < connIdInfo.Count(); j++)
{
@@ -1123,6 +1130,9 @@
{
// found and remove blacklisted iap
connIdInfo.Remove( j );
+ MPMLOGSTRING2( "CMPMServer::HandleServerUnblackListIap - \
+removed blacklisted iap in index = %d", j )
+
if ( connIdInfo.Count() == 0 )
{
return KErrNone;
@@ -1140,6 +1150,8 @@
}
else
{
+ MPMLOGSTRING( "CMPMServer::HandleServerUnblackListIap - \
+not found blacklisted Connection Id" )
return KErrNotFound;
}
}
@@ -1151,8 +1163,9 @@
void CMPMServer::HandleServerUnblackListIap(
TBlacklistCategory aCategory )
{
- MPMLOGSTRING2( "CMPMServer::HandleServerUnblackListIap -\
- aCategory = %i", aCategory )
+ MPMLOGSTRING3( "CMPMServer::HandleServerUnblackListIap -\
+aCategory = %i blacklisted Id count = %d",
+ aCategory, iBlackListIdList.Count() )
for( TInt i( 0 ); i < iBlackListIdList.Count(); i++ )
{
@@ -1160,11 +1173,17 @@
TMPMBlackListConnId connIdInfo = iBlackListIdList[i];
iBlackListIdList.Remove( i ); // remove from the list
+ MPMLOGSTRING3( "CMPMServer::HandleServerUnblackListIap - \
+aConnId = 0x%x, blacklisted IapId count = %d", connIdInfo.iConnId,
+ connIdInfo.Count() )
+
for (TInt j = 0; j < connIdInfo.Count(); j++)
{
if ( connIdInfo.Category( j ) == aCategory )
{
// found and remove blacklisted iap
+ MPMLOGSTRING3( "CMPMServer::HandleServerUnblackListIap - \
+removed blacklisted iap id %i in index: %d", connIdInfo.Iap( j ), j )
connIdInfo.Remove( j );
}
}
@@ -1173,6 +1192,7 @@
//
if( connIdInfo.Count() > 0 )
{
+ MPMLOGSTRING( "reinsert connIdInfo to reflect activeness" )
iBlackListIdList.Insert( connIdInfo, 0 );
}
}
--- a/bearermanagement/mpm/src/mpmserversession.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/bearermanagement/mpm/src/mpmserversession.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -2342,6 +2342,39 @@
ResolveConnType( aMpmConnPref );
MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+BearerSet = %d", aMpmConnPref.BearerSet());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+ConnSelectionDialog = %d", aMpmConnPref.ConnSelectionDialog());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+ConnType = %d", aMpmConnPref.ConnType());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+DisconnectDialog = %d", aMpmConnPref.DisconnectDialog());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+ForcedRoaming = %d", aMpmConnPref.ForcedRoaming() );
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+IapId = %d", aMpmConnPref.IapId());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+MandateIap = %d", aMpmConnPref.MandateIap());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+NetId = %d", aMpmConnPref.NetId());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+NoteBehaviour = %d", aMpmConnPref.NoteBehaviour());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+SnapId = %d", aMpmConnPref.SnapId());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
+SnapPurpose = %d", aMpmConnPref.SnapPurpose());
+
+ MPMLOGSTRING2( "CMPMServerSession::ExtractConnPref - \
Error code in the end: %d", error )
return error;
}
--- a/cmmanager/cmmgr/Framework/Src/cmdlg.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/cmmanager/cmmgr/Framework/Src/cmdlg.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -1658,7 +1658,10 @@
CleanupStack::PopAndDestroy( &cmIds );
iCmManager->CommitTransactionL( KErrNone );
-
+
+ // Fix for the added IAP not showing in the list.
+ iListbox->HandleItemAdditionL();
+
iListbox->DrawNow();
iListbox->UpdateScrollBarsL();
--- a/cmmanager/cmmgr/Plugins/cmpluginwlan/group/cmpluginwlan.mmp Wed Apr 14 16:22:04 2010 +0300
+++ b/cmmanager/cmmgr/Plugins/cmpluginwlan/group/cmpluginwlan.mmp Tue Apr 27 17:03:25 2010 +0300
@@ -94,4 +94,5 @@
LIBRARY aknnotify.lib
LIBRARY wifiprotplugin.lib
+LIBRARY charconv.lib
--- a/cmmanager/cmmgr/Plugins/cmpluginwlan/inc/cmpwlansettingsdlg.h Wed Apr 14 16:22:04 2010 +0300
+++ b/cmmanager/cmmgr/Plugins/cmpluginwlan/inc/cmpwlansettingsdlg.h Tue Apr 27 17:03:25 2010 +0300
@@ -133,7 +133,7 @@
*
* @since S60 5.0
*/
- virtual void GetHelpContext( TCoeHelpContext& aContext ) const;
+ virtual void GetHelpContext( TCoeHelpContext& aContext ) const;
private: // New functions
--- a/cmmanager/cmmgr/Plugins/cmpluginwlan/src/cmpluginwlan.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/cmmanager/cmmgr/Plugins/cmpluginwlan/src/cmpluginwlan.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -53,6 +53,7 @@
#include "cmpwlanactivewaiter.h"
#include <wifiprotuiinprocess.h>
+#include <utf.h>
using namespace CMManager;
@@ -1654,9 +1655,19 @@
// We have to convert the 8-bit SSID to 16-bit for CommsDat.
HBufC* ssid16 = HBufC::NewLC( ssid.Length() );
TPtr ssid16Ptr( ssid16->Des() );
- ssid16Ptr.Copy( ssid );
-
+
+ // save iap name as unicode
+ TInt error = CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr, ssid );
+ if ( error )
+ {
+ ssid16Ptr.Copy( ssid );
+ }
SetStringAttributeL( ECmName, *ssid16 );
+
+ // save ssid as UTF8
+ ssid16Ptr.Zero();
+ ssid16Ptr.FillZ();
+ ssid16Ptr.Copy( ssid );
SetStringAttributeL( EWlanSSID, *ssid16 );
// ConvertWLANConnectionStatesL( )converts WLAN connection state
// (TWlanConnectionMode) into EInfra or EAdhoc (TWlanNetMode)
@@ -1763,9 +1774,21 @@
// no Wlan network found, continuing process...
HBufC* ssid16 = HBufC::NewLC( ssid.Length() );
TPtr ssid16Ptr( ssid16->Des() );
- ssid16Ptr.Copy( ssid );
- // write ssid and go on...
+
+ // save iap name as unicode
+ TInt error = CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr, ssid );
+ if ( error )
+ {
+ ssid16Ptr.Copy( ssid );
+ }
SetStringAttributeL( ECmName, *ssid16 );
+
+ // save ssid as UTF8
+ ssid16Ptr.Zero();
+ ssid16Ptr.FillZ();
+ ssid16Ptr.Copy( ssid );
+
+ // write ssid and go on...
SetStringAttributeL( EWlanSSID, *ssid16 );
CleanupStack::PopAndDestroy( ssid16 );
retval = ProceedWithManualL( ETrue ); // revert to fully manual...
@@ -2006,9 +2029,18 @@
aNwName );
if ( retVal )
{
+ // save iap name as unicode
SetStringAttributeL( ECmName, aNwName );
+
+ // save ssid as UTF8
+ TWlanSsid ssid;
+ TInt err = CnvUtfConverter::ConvertFromUnicodeToUtf8( ssid, aNwName );
+ if ( err == KErrNone )
+ {
+ aNwName.Copy( ssid );
+ }
SetStringAttributeL( EWlanSSID, aNwName );
-
+
retVal = ETrue;
}
return retVal;
--- a/connectionmonitoring/connectionmonitorui/inc/ConnectionMonitorUiContainer.h Wed Apr 14 16:22:04 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/inc/ConnectionMonitorUiContainer.h Tue Apr 27 17:03:25 2010 +0300
@@ -205,6 +205,11 @@
* Connection count
*/
TInt iOldConnectionCount;
+
+ /**
+ * Set when main view list comes to focus
+ */
+ TBool iFocusChanged;
};
#endif // CONNECTIONMONITORUICONTAINER_H
--- a/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiContainer.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/connectionmonitoring/connectionmonitorui/src/ConnectionMonitorUiContainer.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -76,7 +76,8 @@
iMonitor( aMonitor ),
iConnectionArray( aConnectionArray ),
isWlanSupported( EFalse ),
- iActiveWrapper( aActiveWrapper )
+ iActiveWrapper( aActiveWrapper ),
+ iFocusChanged( EFalse )
{
}
@@ -231,15 +232,6 @@
case EConnMonDeleteConnection:
{
CMUILOGGER_WRITE( "OnEventL EConnMonDeleteConnection" );
- CMUILOGGER_WRITE_F( "validIndex: %b", validIndex );
-
- if ( validIndex )
- {
- TBool current
- ( aIndex == ( TUint )iListBox->CurrentItemIndex() );
- AknListBoxUtils::HandleItemRemovalAndPositionHighlightL(
- iListBox, aIndex, ETrue );
- }
iListBox->UpdateScrollBarsL();
break;
}
@@ -273,12 +265,19 @@
void CConnectionMonitorUiContainer::OnTimerEventL()
{
iListBox->DrawNow();
- //Update the scrollbar only if connection count has changed
+ TInt iNewConnectionCount = iConnectionArray->MdcaCount();
+ if ( iOldConnectionCount > iNewConnectionCount )
+ {
+ iListBox->HandleItemRemovalL();
+ }
+
+ //Update the scrollbar only if lisbox focus
+ //has changed
//
- TInt iNewConnectionCount = iConnectionArray->MdcaCount();
- if ( iOldConnectionCount != iNewConnectionCount )
+ if ( iFocusChanged )
{
iListBox->UpdateScrollBarsL();
+ iFocusChanged = EFalse;
}
iOldConnectionCount = iNewConnectionCount;
PushAndRefreshNaviPaneL();
@@ -744,7 +743,8 @@
void CConnectionMonitorUiContainer::FocusChanged( TDrawNow aDrawNow )
{
CMUILOGGER_ENTERFN( "CConnectionMonitorUiContainer::FocusChanged" );
- CCoeControl::FocusChanged( aDrawNow );
+ CCoeControl::FocusChanged( aDrawNow );
+ iFocusChanged = ETrue;
if ( iListBox )
{
iListBox->SetFocus( IsFocused() );
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/SelectWLANDlg.cpp Wed Apr 14 16:22:04 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/SelectWLANDlg.cpp Tue Apr 27 17:03:25 2010 +0300
@@ -210,7 +210,12 @@
TWlanConnectionSecurityMode sMode;
TWlanConnectionExtentedSecurityMode sExtMode;
- sSID.Copy( buff->Des() );
+ //sSID.Copy( buff->Des() );
+ TInt err = CnvUtfConverter::ConvertFromUnicodeToUtf8( sSID, buff->Des() );
+ if ( err )
+ {
+ sSID.Copy( buff->Des() );
+ }
CleanupStack::PopAndDestroy( buff );
iPlugin->SetEasyWlanToHiddenL( ETrue );
--- a/ipcm_pub/connection_settings_ui_api/inc/cmapplicationsettingsui.h Wed Apr 14 16:22:04 2010 +0300
+++ b/ipcm_pub/connection_settings_ui_api/inc/cmapplicationsettingsui.h Tue Apr 27 17:03:25 2010 +0300
@@ -18,6 +18,9 @@
#ifndef C_CMAPPLICATIONSETTINGSUI_H
#define C_CMAPPLICATIONSETTINGSUI_H
+// Deprecation warning
+#warning This header file is deprecated and will be fully removed in Symbian^4. See Polonium CRs #533 and #532 for details.
+
#include <e32def.h>
#include <e32base.h>