--- a/apengine/apsettingshandlerui/src/ApSettingsModel.cpp Fri Sep 17 08:32:43 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApSettingsModel.cpp Mon Oct 04 00:43:42 2010 +0300
@@ -81,17 +81,7 @@
TBool aIncludeEasyWlan,
TBool aNoEdit )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::NewL")
- CApSettingsModel* db =
- new( ELeave ) CApSettingsModel( aIspFilter, aBearerFilter,
- aSortType, aReqIpvType, aVariant,
- aVpnFilterType, aIncludeEasyWlan,
- aNoEdit );
- CleanupStack::PushL( db );
- db->ConstructL( NULL );
- CleanupStack::Pop(); // db
- APSETUILOGGER_LEAVEFN( EModel,"Model::NewL")
- return db;
+ return NULL;
}
@@ -108,17 +98,7 @@
TBool aIncludeEasyWlan,
TBool aNoEdit )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::NewL2")
- CApSettingsModel* db =
- new( ELeave ) CApSettingsModel( aIspFilter, aBearerFilter,
- aSortType, aReqIpvType, aVariant,
- aVpnFilterType, aIncludeEasyWlan,
- aNoEdit );
- CleanupStack::PushL( db );
- db->ConstructL( &aDb );
- CleanupStack::Pop(); // db
- APSETUILOGGER_LEAVEFN( EModel,"Model::NewL2")
- return db;
+ return NULL;
}
@@ -127,22 +107,6 @@
*/
CApSettingsModel::~CApSettingsModel( )
{
- APSETUILOGGER_ENTERFN( EModel,"~Model")
- delete iFeatureManagerWrapper;
-
- delete iApData;
- delete iUtils;
- delete iVpnApEngine;
- if ( iDbOwned )
- {
- delete iDb;
- }
- if (iop)
- {
- delete iop;
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"~Model")
}
@@ -157,24 +121,6 @@
TBool aNoEdit )
{
- APSETUILOGGER_ENTERFN( EModel,"Model")
-
- iWepUiExitReason = 0;
- iParams.iIspFilter = aIspFilter;
- iParams.iBearerFilter = aBearerFilter;
- iParams.iSortType = aSortType;
- iReqIpvType = aReqIpvType;
- iApData = NULL;
- iDb = NULL;
- iUtils = NULL;
- iDbOwned = ETrue;
- iVpnFilterType = aVpnFilterType;
- iVariant = aVariant;
- iIncludeEasyWlan = aIncludeEasyWlan;
- iNoEdit = aNoEdit;
- iInRefresh = EFalse;
- iNeedRefresh = EFalse;
- APSETUILOGGER_LEAVEFN( EModel,"Model")
}
@@ -185,30 +131,6 @@
//
void CApSettingsModel::ConstructL( CActiveApDb* aDb )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::ConstructL")
- if ( aDb )
- {
- iDbOwned = EFalse;
- iDb = aDb;
- }
- else
- {
- iDb = CActiveApDb::NewL( EDatabaseTypeIAP );
- iDbOwned = ETrue;
- }
- iApData = CApDataHandler::NewLC( *iDb->Database() );
- CleanupStack::Pop( iApData ); // as it is a member
- iUtils = CApUtils::NewLC( *iDb->Database() );
- CleanupStack::Pop( iUtils ); //
- iVpnApEngine = CVpnApEngine::NewLC( iDb->Database() );
- CleanupStack::Pop( iVpnApEngine ); //
-
- iFeatureManagerWrapper = CFeatureManagerWrapper::NewL();
- iHelpSupported = FeatureManager::FeatureSupported( KFeatureIdHelp );
- iProtectionSupported = FeatureManager::FeatureSupported(
- KFeatureIdSettingsProtection );
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::ConstructL")
}
@@ -219,8 +141,7 @@
//
CActiveApDb* CApSettingsModel::Database()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Database<->")
- return iDb;
+ return NULL;
}
@@ -235,10 +156,7 @@
TInt aIspFilter, TInt aBearerFilter,
TInt aSortType, TInt aReqIpvType )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::AllListItemDataL<->")
- return AllListItemDataL( aFailedLocked, aList, aIspFilter,
- aBearerFilter, aSortType, aReqIpvType,
- iVpnFilterType, iIncludeEasyWlan );
+ return 0;
}
@@ -258,44 +176,7 @@
TBool aIncludeEasyWlan
)
{
- APSETUILOGGER_ENTERFN( EModel,"Model::AllListItemDataL2")
- TInt retval( 0 );
- if (iInRefresh)
- {
- APSETUILOGGER_WRITE( EModel,"AllListItemData overrun->");
- iNeedRefresh = ETrue;
- }
- else
- {
- iInRefresh = ETrue;
- aFailedLocked = EFalse;
- CApSelect* apselect = CApSelect::NewLC( *iDb->Database(), aIspFilter,
- aBearerFilter, aSortType,
- aReqIpvType,
- aVpnFilterType,
- aIncludeEasyWlan );
- APSETUILOGGER_WRITE( EModel,"ApSelect::NewLC returned");
-
- retval = apselect->AllListItemDataL( aList );
-
- APSETUILOGGER_WRITE( EModel,"ApSelect::AllListItemDataL returned");
-
- CleanupStack::PopAndDestroy( apselect ); // apselect
- retval = aList.Count();
-
- iInRefresh = EFalse;
- }
- if (iNeedRefresh && !iInRefresh)
- {
- APSETUILOGGER_WRITE( EModel,"add. refresh starts");
- retval = AllListItemDataL( aFailedLocked, aList, aIspFilter,
- aBearerFilter, aSortType, aReqIpvType,
- aVpnFilterType, aIncludeEasyWlan );
- iNeedRefresh = EFalse;
- APSETUILOGGER_WRITE( EModel,"add. refresh ends");
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::AllListItemDataL2")
- return retval;
+ return 0;
}
@@ -307,12 +188,7 @@
TInt CApSettingsModel::AllListItemDataL( TBool& aFailedLocked,
CApListItemList& aList )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::AllListItemDataL ->")
- return AllListItemDataL( aFailedLocked, aList, iParams.iIspFilter,
- iParams.iBearerFilter,
- iParams.iSortType,
- iReqIpvType, iVpnFilterType,
- iIncludeEasyWlan );
+ return 0;
}
@@ -324,29 +200,6 @@
void CApSettingsModel::AccessPointDataL( TUint32 aUid,
CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::AccessPointDataL")
- TTransactionResult ownTransaction = StartTransactionLC( /*aWrite*/EFalse,
- /*aShowNote*/ETrue,
- /*aRetry*/ETrue );
- if ( ownTransaction != EFailedWithLocked )
- {
- iApData->AccessPointDataL( aUid, aApItem ); // adds normal ap
- // Load wlan data, only loads if WLAN ap.
- TRAPD( err, LoadWlanL( aApItem ) );
- if ( err != KErrUnknown)
- {
- User::LeaveIfError( err );
- }
-
- if ( ownTransaction == EOwnTransaction )
- {
- TInt err = CommitTransaction();
- User::LeaveIfError( err );
- CleanupStack::Pop(); // RollbackTransactionOnLeave
- }
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::AccessPointDataL")
}
@@ -357,43 +210,7 @@
//
TBool CApSettingsModel::UpdateAccessPointDataL( CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::UpdateAccessPointDataL")
- TBool nameChanged( EFalse );
-// It should be aWrite ETrue, but there is an error in Symbian stuff
-// causing a memory leak
-// TTransactionResult ownTransaction = StartTransactionLC( /*aWrite*/ETrue,
- TTransactionResult ownTransaction = StartTransactionLC( /*aWrite*/EFalse,
- /*aShowNote*/ETrue,
- /*aRetry*/ETrue );
- if ( ownTransaction != EFailedWithLocked )
- {
- TBool isnew(EFalse);
- if ( aApItem.BearerTypeL() == EApBearerTypeWLAN )
- { // it is WLAN...
- // check that there were no bearer-change, because if orig. bearer
- // was NOT wlan, then we shouls consider it as a new record!!!
- if ( iUtils->BearerTypeL( aApItem.WapUid() ) != EApBearerTypeWLAN )
- {
- isnew = ETrue;
- }
- }
- iApData->UpdateAccessPointDataL( aApItem, nameChanged );
- // write wlan data, only writes if WLAN ap.
- WriteWlanL( aApItem, isnew );
-
-#ifdef __WINS__
- ShowNoteL( R_APUI_VIEW_SAVED );
-#endif
- if ( ownTransaction == EOwnTransaction )
- {
- TInt err = CommitTransaction();
- User::LeaveIfError( err );
- CleanupStack::Pop(); // RollbackTransactionOnLeave
- }
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::UpdateAccessPointDataL")
- return nameChanged;
+ return EFalse;
}
@@ -405,8 +222,7 @@
//
CApDataHandler* CApSettingsModel::DataHandler()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::DataHandler <->")
- return iApData;
+ return NULL;
}
@@ -417,8 +233,7 @@
//
CApUtils* CApSettingsModel::ApUtils()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::ApUtils <->")
- return iUtils;
+ return NULL;
}
@@ -428,8 +243,6 @@
//
void CApSettingsModel::SetParams( TApSettingsParams aParams )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::SetParams <->")
- iParams = aParams;
}
@@ -439,7 +252,7 @@
//
TApSettingsParams CApSettingsModel::Params()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Params <->")
+ User::Leave( KErrNotSupported );
return iParams;
}
@@ -451,8 +264,7 @@
//
CVpnApEngine* CApSettingsModel::VpnEngine()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::VpnEngine <->")
- return iVpnApEngine;
+ return NULL;
}
@@ -462,13 +274,6 @@
//
void CApSettingsModel::LaunchHelpL()
{
-#ifdef __SERIES60_HELP
- APSETUILOGGER_ENTERFN( EModel,"Model::LaunchHelpL")
- HlpLauncher::LaunchHelpApplicationL(
- EikEnv()->WsSession(),
- EikEnv()->EikAppUi()->AppHelpContextL() );
- APSETUILOGGER_LEAVEFN( EModel,"Model::LaunchHelpL")
-#endif // __SERIES60_HELP
}
@@ -478,49 +283,6 @@
//
void CApSettingsModel::RemoveApL( TUint32 aUid )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::RemoveApL")
-// DELETE OPERATION STARTS HERE
- TBuf<KModifiableTextLength> sgd;
- iUtils->NameL( aUid, sgd );
- HBufC* temp = StringLoader::LoadLC( R_APUI_VIEW_DELETING_AP, sgd );
-
- APSETUILOGGER_WRITE( EModel,"Creating thread");
-
- if (!iop)
- {
- iop = CApSettingsDeleteOperation::NewL(
- KApWaitNote, R_APUI_VIEW_WAIT_NOTE,
- aUid, *temp
- );
- APSETUILOGGER_WRITE( EModel,"Thread created");
- }
- else
- {
- if (iop->State() != CApSettingsDeleteOperation::EProcOffDialogOff )
- {
- ShowNoteL( R_APUI_VIEW_TEXT_CANNOT_ACCESS_DB );
- User::Leave( KErrInUse );
- }
- else
- {
- iop->SetUid( aUid );
- iop->SetNoteTextL( *temp );
- }
- }
-
- TRAPD(err, iop->StartL() );
-
- APSETUILOGGER_WRITE_FORMAT( EModel, "Thread StartL returned, code:%d", err);
-
- if ( err != KErrNone )
- {
- User::Leave( err );
- }
-
- CleanupStack::PopAndDestroy( temp );
- APSETUILOGGER_LEAVEFN( EModel,"Model::RemoveApL")
-// DELETE OPERATION ENDS HERE
-
}
@@ -534,90 +296,7 @@
TBool aWrite, TBool aShowNote,
TBool aRetry, TBool aLFFSChecking /* ETrue */ )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::StartTransactionLC")
- TTransactionResult retval( EOwnTransaction );
-
- // Before attempting db modification, check if we would go below Critical
- // Level in FFS (disk). The value used for checking is an estimate.
- // Reading the db also allocates some bytes (transaction log), but
- // this is not estimated and not checked, because it should be small
- // enough, and would slow down operation. (Typical use is to read a lot
- // and write much less.)
- if ( aLFFSChecking &&
- aWrite &&
- FFSSpaceBelowCriticalLevelL
- ( /*aShowErrorNote=*/EFalse, KEstimatedFfsUsage )
- )
- {
- User::Leave( KErrDiskFull );
- }
-
- CCommsDatabase* aDb = iDb->Database();
- TInt err( KErrNone );
- if ( !aDb->InTransaction() )
- {
- TInt retriesLeft( aRetry ? KRetryCount : 1 );
- err = aDb->BeginTransaction();
- while ( ( ( err == KErrLocked ) || ( err == KErrAccessDenied ) )
- && --retriesLeft )
- {
- User::After( KRetryWait );
- err = aDb->BeginTransaction();
- if (aWrite )
- {
- TRAP(err, GetWriteLockL() );
- }
- }
- if ( err && aShowNote )
- {
- ShowNoteL( R_APUI_VIEW_TEXT_CANNOT_ACCESS_DB );
- }
- switch ( err )
- {
- case KErrNone:
- {
- CleanupStack::PushL(
- TCleanupItem( RollbackTransactionOnLeave, aDb ) );
- break;
- }
- case KErrLocked:
- case KErrAccessDenied:
- {
- retval = EFailedWithLocked;
- break;
- }
- default:
- {
- User::LeaveIfError( err );
- break;
- }
- }
- }
- else
- {
- if ( aWrite )
- {
- TRAP(err, GetWriteLockL() );
- }
- if ( err && aShowNote )
- {
- ShowNoteL( R_APUI_VIEW_TEXT_CANNOT_ACCESS_DB );
- }
- if ( err != KErrLocked )
- {
- User::LeaveIfError( err );
- }
- if ( err )
- {
- retval = EFailedWithLocked;
- }
- else
- {
- retval = EUsingAlreadyStarted;
- }
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::StartTransactionLC")
- return retval;
+ User::Leave( KErrNotSupported );
}
@@ -627,16 +306,6 @@
//
void CApSettingsModel::GetWriteLockL( )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::GetWriteLockL")
- CCommsDbTableView* v =
- iDb->Database()->OpenTableLC( TPtrC(WAP_ACCESS_POINT ) );
- TUint32 dummyUid( KApNoneUID );
- TInt err = v->InsertRecord( dummyUid );
- User::LeaveIfError( err );
- v->CancelRecordChanges();
- User::LeaveIfError( err );
- CleanupStack::PopAndDestroy( v );
- APSETUILOGGER_LEAVEFN( EModel,"Model::GetWriteLockL")
}
// ---------------------------------------------------------
@@ -645,10 +314,6 @@
//
void CApSettingsModel::RollbackTransactionOnLeave( TAny* aDb )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::RollbackTransactionOnLeave")
- CCommsDatabase* db = STATIC_CAST( CCommsDatabase*, aDb );
- db->RollbackTransaction();
- APSETUILOGGER_LEAVEFN( EModel,"Model::RollbackTransactionOnLeave")
}
@@ -659,10 +324,7 @@
//
TInt CApSettingsModel::CommitTransaction()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::CommitTransaction")
- TInt err = iDb->Database()->CommitTransaction();
- APSETUILOGGER_LEAVEFN( EModel,"Model::CommitTransaction")
- return err;
+ return KErrNotSupported;
}
@@ -674,21 +336,7 @@
TBool CApSettingsModel::FFSSpaceBelowCriticalLevelL
( TBool aShowErrorNote, TInt aBytesToWrite /*=0*/ )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::FFSSpaceBelowCriticalLevelL")
- TBool ret( EFalse );
- if ( SysUtil::FFSSpaceBelowCriticalLevelL
- ( &( EikEnv()->FsSession()), aBytesToWrite ) )
- {
- ret = ETrue;
- if ( aShowErrorNote )
- {
- CErrorUI* errorUi = CErrorUI::NewLC( *EikEnv() );
- errorUi->ShowGlobalErrorNoteL( KErrDiskFull );
- CleanupStack::PopAndDestroy(); // errorUi
- }
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::FFSSpaceBelowCriticalLevelL")
- return ret;
+ return EFalse;
}
@@ -701,30 +349,7 @@
TInt CApSettingsModel::NetWorkListDataL( TBool& aFailedLocked,
CApNetworkItemList& aList )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::NetWorkListDataL")
- TInt retval( KErrNone );
- aFailedLocked = EFalse;
- TTransactionResult ownTransaction = StartTransactionLC( /*aWrite*/EFalse,
- /*aShowNote*/EFalse,
- /*aRetry*/ETrue );
- if ( ownTransaction != EFailedWithLocked )
- {
- CApNetworks* apnet = CApNetworks::NewLC( *iDb->Database() );
- retval = apnet->AllListItemDataL( aList );
- CleanupStack::PopAndDestroy( apnet ); // apSelect
- if ( ownTransaction == EOwnTransaction )
- {
- TInt err = CommitTransaction();
- User::LeaveIfError( err );
- CleanupStack::Pop(); // RollbackTransactionOnLeave
- }
- }
- else
- {
- aFailedLocked = ETrue;
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::NetWorkListDataL")
- return retval;
+ return KErrNotSupported;
}
@@ -735,8 +360,7 @@
//
TInt CApSettingsModel::RequestedIPvType( )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::RequestedIPvType<->")
- return iReqIpvType;
+ return 0;
}
@@ -749,17 +373,7 @@
//
TBool CApSettingsModel::Need2DeleteSelect( TInt aResourceId, TInt aCount )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteSelect")
- TBool retval( EFalse );
-
- if ( ( aCount == 0 )
- &&
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) )
- {
- retval = ETrue;
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteSelect")
- return retval;
+ return EFalse;
}
@@ -771,34 +385,7 @@
TBool CApSettingsModel::Need2DeleteOpen( TInt aResourceId, TInt aCount,
TUint32 aUid, TBool aNeedsNone )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteOpen")
- TBool retval( EFalse );
- TBool noItem( EFalse );
- TBool onlyItemIsNone( EFalse );
- TBool editOnlyVPN( EFalse );
- TBool noEdit( EFalse );
-
- noItem = ( aCount == 0) &&
- ( ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) );
-
- onlyItemIsNone = ( aNeedsNone ) && ( aUid == KApNoneUID )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_ONLY ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- editOnlyVPN = ( iVariant & KApUiEditOnlyVPNs )
- && ( ( aResourceId == R_APSETTINGSUI_SELECT_ONLY_MENUBAR ) ||
- ( aResourceId == R_APSETTINGSUI_SELECT_NORMAL_MENUBAR ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
- noEdit = ( iNoEdit )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- retval = noItem || onlyItemIsNone || editOnlyVPN || noEdit;
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteOpen")
- return retval;
+ return EFalse;
}
@@ -810,59 +397,7 @@
TBool CApSettingsModel::Need2DeleteDeleteL( TInt aResourceId, TInt aCount,
TUint32 aUid, TBool aNeedsNone )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteDeleteL")
- TBool retval( EFalse );
- TBool noItem( EFalse );
- TBool onlyItemIsNone( EFalse );
- TBool editOnlyVPN( EFalse );
- TBool noEdit( EFalse );
-
- noItem = ( aCount == 0) &&
- ( ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) );
-
- onlyItemIsNone = ( aNeedsNone ) && ( aUid == KApNoneUID )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_ONLY ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- editOnlyVPN = ( iVariant & KApUiEditOnlyVPNs )
- && ( ( aResourceId == R_APSETTINGSUI_SELECT_ONLY_MENUBAR ) ||
- ( aResourceId == R_APSETTINGSUI_SELECT_NORMAL_MENUBAR ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- noEdit = ( iNoEdit )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- if ( editOnlyVPN )
- {
- // check if current item is VPN...
- if ( ( aCount != 0 ) && ( aUid != KApNoneUID ) )
- {
- retval = ! iVpnApEngine->IsVpnApL( aUid );
- }
- else
- {
- retval = ETrue;
- }
- }
- else
- {
- if ( onlyItemIsNone || noItem )
- {
- retval = ETrue;
- }
- }
- if ( !retval )
- {
- if (noEdit)
- {
- retval = ETrue;
- }
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteDeleteL")
- return retval;
+ return EFalse;
}
@@ -875,38 +410,7 @@
TInt aResourceId,
TInt aCount )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteNewUseExisting")
- TBool noEdit( EFalse );
- TBool retval( EFalse );
-
- if ( iProtectionSupported )
- {
- if ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ||
- aResourceId == R_APSETTINGSUI_MENU_NORMAL )
- {
- TRAP_IGNORE( retval = CApProtHandler::IsTableProtectedL( iDb->Database() ));
- }
- }
-
- if ( aCount == 0)
- {
- if ( ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) )
- {
- retval = ETrue;
- }
- }
-
- noEdit = ( iNoEdit )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- if (noEdit)
- {
- retval = ETrue;
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteNewUseExisting")
- return retval;
+ return EFalse;
}
@@ -917,42 +421,7 @@
//
TBool CApSettingsModel::Need2DeleteNewL( TInt aResourceId )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteNewL")
- TBool noEdit( EFalse );
- TBool retval( EFalse );
-
- if ( iProtectionSupported )
- {
- if ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ||
- aResourceId == R_APSETTINGSUI_MENU_NORMAL )
- {
- if ( CApProtHandler::IsTableProtectedL( iDb->Database() ))
- {
- retval = ETrue;
- }
- }
- }
-
- if ( iVariant & KApUiEditOnlyVPNs )
- {
- if ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL )
- )
- {
- retval = ETrue;
- }
- }
-
- noEdit = ( iNoEdit )
- && ( ( aResourceId == R_APSETTINGSUI_MENU_SELECT_NORMAL ) ||
- ( aResourceId == R_APSETTINGSUI_MENU_NORMAL ) );
-
- if (noEdit)
- {
- retval = ETrue;
- }
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteNewL")
- return retval;
+ return EFalse;
}
@@ -964,19 +433,7 @@
//
TBool CApSettingsModel::Need2DeleteHelp( TInt aResourceId )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Need2DeleteHelp")
- TBool retval( EFalse );
-
- if ( !iHelpSupported )
- {
- if ( aResourceId == R_APSETTINGSUI_MENU_NORMAL )
- {
- retval = ETrue;
- }
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::Need2DeleteHelp")
- return retval;
+ return EFalse;
}
@@ -993,35 +450,7 @@
//
HBufC* CApSettingsModel::GetLinkedVpnAccessPointLC( TUint32 aUid )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::GetLinkedVpnAccessPointLC")
- HBufC* retval = HBufC::NewLC( KCommsDbSvrMaxFieldLength );
-
- // Get iap for the above WAP, aUid
- TUint32 homeiap = iUtils->IapIdFromWapIdL( aUid );
-
- // now get ALL VPN_SERVICE entry ID where HOME_IAP == iap
- // Select * from VPN_SERVICE where HOME_IAP == homeiap
- CCommsDbTableView* t;
- t = iDb->Database()->OpenViewMatchingUintLC( TPtrC(VPN_SERVICE),
- TPtrC(VPN_SERVICE_IAP),
- homeiap );
- TInt err = t->GotoFirstRecord();
- // if not found, no such, simply exit, no change in passed array
- if ( err != KErrNotFound )
- {
- User::LeaveIfError( err );
- TPtr sgd = retval->Des();
- t->ReadTextL( TPtrC(COMMDB_NAME), sgd );
- CleanupStack::PopAndDestroy( t );//t
- }
- else
- {
- CleanupStack::PopAndDestroy( 2, retval );// retval, t
- retval = NULL;
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::GetLinkedVpnAccessPointLC")
- return retval;
+ return NULL;
}
@@ -1032,12 +461,7 @@
//
CEikonEnv* CApSettingsModel::EikEnv()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::EikEnv<->")
- if ( !iEikEnv )
- {
- iEikEnv = CEikonEnv::Static();
- }
- return iEikEnv;
+ return NULL;
}
@@ -1048,26 +472,7 @@
//
TUint32 CApSettingsModel::CreateFromDataL( CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::CreateFromDataL")
- TTransactionResult ownTransaction = StartTransactionLC( /*aWrite*/EFalse,
- /*aShowNote*/ETrue,
- /*aRetry*/ETrue );
- if ( ownTransaction != EFailedWithLocked )
- {
- iApData->CreateFromDataL( aApItem ); // adds normal ap
- // write wlan data, only writes if WLAN ap.
- WriteWlanL( aApItem, ETrue );
-
- if ( ownTransaction == EOwnTransaction )
- {
- TInt err = CommitTransaction();
- User::LeaveIfError( err );
- CleanupStack::Pop(); // RollbackTransactionOnLeave
- }
- }
-
- APSETUILOGGER_LEAVEFN( EModel,"Model::CreateFromDataL")
- return aApItem.WapUid();
+ return 0;
}
@@ -1080,8 +485,6 @@
//
TInt CApSettingsModel::ChangeWepSettingsL( CApAccessPointItem* aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::ChangeWepSettingsL - ERROR: not suported")
- aApItem = aApItem;
return KErrNotSupported;
}
@@ -1093,8 +496,6 @@
//
TInt CApSettingsModel::ChangeWpaSettingsL( CApAccessPointItem* aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::ChangeWpaSettingsL - ERROR: not suported")
- aApItem = aApItem;
return KErrNotSupported;
}
@@ -1106,8 +507,6 @@
//
TInt CApSettingsModel::Change8021xSettingsL( CApAccessPointItem* aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::Change8021xSettingsL - ERROR: not suported")
- aApItem = aApItem;
return KErrNotSupported;
}
@@ -1119,7 +518,6 @@
//
void CApSettingsModel::ClearWEPAndWPASettings()
{
- APSETUILOGGER_ENTERFN( EModel,"Model::ClearWEPAndWPASettings - ERROR: not suported")
}
@@ -1130,9 +528,6 @@
void CApSettingsModel::WriteWlanL( CApAccessPointItem& aApItem,
TBool aIsNew )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::WriteWlanL - ERROR: not supported")
- aApItem;
- aIsNew;
User::Leave( KErrNotSupported );
}
@@ -1143,8 +538,6 @@
//
void CApSettingsModel::LoadWlanL( CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::LoadWlanL - ERROR: not supported")
- aApItem;
User::Leave( KErrNotSupported );
}
@@ -1155,8 +548,6 @@
//
TBool CApSettingsModel::HasWlanSecSettingsFilledL( CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::HasWlanSecSettingsFilledL - ERROR: not supported")
- aApItem;
return EFalse;
}
@@ -1167,8 +558,6 @@
//
void CApSettingsModel::UpdateSecurityModeL( CApAccessPointItem& aApItem )
{
- APSETUILOGGER_ENTERFN( EModel,"Model::UpdateSecurityModeL - ERROR: not supported")
- aApItem;
User::Leave( KErrNotSupported );
}