FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy

equal deleted inserted replaced

-:fa67e03b87df
+:6295dc2169f3
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <pn_const.h>
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
 #include "tsylogger.h"
 #include "cmmmessagerouter.h"
 #include "cmmphonebookoperationdelete.h"
-#include "osttracedefinitions.h"
+#include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cmmphonebookoperationdeletetraces.h"
 #endif
 // EXTERNAL DATA STRUCTURES
 TInt ret( KErrNotSupported );
 iIpc = aIpc;
 iTransId = aTransId;
 // Convert phone book name to file id
-iFileId = ConvertToPBfileId( iPhoneBookTypeName, iFileIdExt, iMmUiccMessHandler->GetCardType() );
+iFileId = ConvertToPBfileId(
+iPhoneBookTypeName,
+iFileIdExt,
+iMmUiccMessHandler->GetCardType() );
 // Find location from internal array
 iArrayIndex = ConvertToConfArrayIndex( iFileId );
 const CPhoneBookDataPackage* phoneBookData(
 static_cast<const CPhoneBookDataPackage*>( aDataPackage ) );
 switch( aIpc )
 {
 case EMmTsyPhoneBookStoreDeleteIPC:
+case EMmTsyONStoreDeleteIPC:
 {
 phoneBookData->UnPackData( iIndex );
 if( PB_MBDN_FID == iFileId )
 {
 // Store MBI Profile
 iMBIProfileType = iIndex;
 // For MBDN PhoneBook first read MBI file
 // Check if the mailbox inidcation type is correct
 if( iIndex < iMmPhoneBookStoreMessHandler->
 iPBStoreConf[iArrayIndex].iMbiRecLen )
 {
 iCurrentDeletePhase = EPBDeletePhase_Read_MBI_profile;
 ret = UiccPbReqDelete();
 }
 break;
 }
 case EMmTsyPhoneBookStoreDeleteAllIPC:
+case EMmTsyONStoreDeleteAllIPC:
 {
 if( PB_MBDN_FID != iFileId)
 {
 iNumOfEntries = iMmPhoneBookStoreMessHandler->
 iPBStoreConf[iArrayIndex].iNoOfRecords;
 else
 {
 // For first Profile Type Read
 iMBIProfileType = 0;
 iIndex = iMBIProfileType;
 // For MBDN PhoneBook first read MBI file
 // Check if the mailbox inidcation type is correct
 if( iMBIProfileType < iMmPhoneBookStoreMessHandler->
 iPBStoreConf[iArrayIndex].iMbiRecLen )
 {
 iCurrentDeletePhase = EPBDeletePhase_Read_MBI_profile;
 else
 {
 ret = KErrArgument;
 }
 }
 break;
 }
-#ifdef INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
-case ECustomDeleteAlphaStringIPC:
-{
-break;
-}
-#endif // INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
 default:
 {
 TFLOGSTRING2("TSY: CMmPhoneBookOperationDelete::CreateReq - Unknown IPC: %d", aIpc);
 OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONDELETE_CREATEREQ, "CMmPhoneBookOperationDelete::CreateReq;aIpc=%d", aIpc );
 break;
 {
 case PB_ADN_FID:
 case PB_FDN_FID:
 case PB_MBDN_FID:
 case PB_VMBX_FID:
+case PB_MSISDN_FID:
 {
 // Check if the location to be deleted is valid
-if( iIndex <= iMmPhoneBookStoreMessHandler->
+if( ( iIndex <= iMmPhoneBookStoreMessHandler->
-iPBStoreConf[iArrayIndex].iNoOfRecords )
+iPBStoreConf[iArrayIndex].iNoOfRecords ) &&
+( 0 < iIndex ) )
 {
 // Check if entry can be found in list
 if( iMmPhoneBookStoreMessHandler->IndexCheckInPBList(
 iIndex,
 iArrayIndex,
 static_cast<MUiccOperationBase*>( iMmPhoneBookStoreMessHandler );
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 ) );
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE ) );
 cmdParams.filePath.Append( APPL_FILE_ID >> 8 );
 cmdParams.filePath.Append( APPL_FILE_ID );
-if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() )
+if( ( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) &&
+( PB_MSISDN_FID != iFileId ) )
 {
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK ));
 }
 // File Data
 TBuf8<KExtensionDataBytes>extFileData;
 extFileData.Append( 0x00 ); // Type of record ( 0x00 == unknown )
 // Rest of data is set by 'FF'
 extFileData.AppendFill( 0xFF, ( KExtensionDataBytes - 1 ) );
 cmdParams.fileData.Append( extFileData );
 return iMmPhoneBookStoreMessHandler->UiccMessHandler()->
 CreateUiccApplCmdReq( cmdParams );
 }
 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() )
 {
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK ));
 }
 cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
 cmdParams.fileId = iFileId;
 cmdParams.trId = static_cast<TUiccTrId>( iTransId );
 cmdParams.record = iIndex;
 return iMmPhoneBookStoreMessHandler->UiccMessHandler()->
 CreateUiccApplCmdReq( cmdParams );
 }
 // ---------------------------------------------------------------------------
 // CMmPhoneBookOperationDelete::UiccPbReqReadMBI
 // Constructs an ISI-message to Read MBI profile from first record
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookOperationDelete::UiccPbReqReadMBI( )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPbReqReadMBI");
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADMBI, "CMmPhoneBookOperationDelete::UiccPbReqReadMBI" );
 TInt ret ( KErrNone );
 TUiccReadLinearFixed cmdParams;
 cmdParams.messHandlerPtr  = static_cast<MUiccOperationBase*>
 ( iMmPhoneBookStoreMessHandler );
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE ));
 cmdParams.filePath.Append( APPL_FILE_ID>>8);
 cmdParams.filePath.Append( APPL_FILE_ID);
 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() )
 {
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK ));
 }
 cmdParams.fileId = PB_MBI_FID;
 cmdParams.serviceType =  UICC_APPL_READ_LINEAR_FIXED ;
 cmdParams.dataAmount = 1;
 cmdParams.dataOffset = iMBIProfileType;
 cmdParams.record = 1;   // only first profile number is supported
 if( KErrNone == ret )
 {
 ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()->
 CreateUiccApplCmdReq( cmdParams );
 }
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPBReqWriteMBIProfile");
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQDELETEMBIPROFILE, "CMmPhoneBookOperationDelete::UiccPBReqDeleteMBIProfile" );
 TInt ret ( KErrNone );
 TUiccWriteLinearFixed cmdParams;
 cmdParams.messHandlerPtr  = static_cast<MUiccOperationBase*>
 ( iMmPhoneBookStoreMessHandler );
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE ));
 cmdParams.filePath.Append( APPL_FILE_ID>>8);
 cmdParams.filePath.Append( APPL_FILE_ID);
 cmdParams.dataOffset = iMBIProfileType;
 cmdParams.record = 1;   // only first profile number is supported
 // Append FileData needs to be write
 cmdParams.fileData.Append( 0 );
 if( KErrNone == ret )
 {
 ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()->
 CreateUiccApplCmdReq( cmdParams );
 }
 return ret;
 }
 // ---------------------------------------------------------------------------
 // CMmPhoneBookOperationDelete::HandleReadEntryResp
 // Handles phonebook entry data
 }
 }
 return ret;
 }
+// ---------------------------------------------------------------------------
+// CMmPhoneBookOperationDelete::HandleDeleteEntryResp
+// Handles phonebook Entry Delete
+// ---------------------------------------------------------------------------
+//
+TInt CMmPhoneBookOperationDelete::HandleDeleteEntryResp(
+TBool &aComplete,
+TInt &aLocation )
+{
+TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleDeleteEntryResp");
+OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEENTRYRESP, "CMmPhoneBookOperationDelete::HandleDeleteEntryResp" );
+TInt ret ( KErrNone );
+if ( iLocationFoundInPbList ) // Entry already in list, reset
+{
+iMmPhoneBookStoreMessHandler->ResetEntryInPhoneBookList(
+iArrayIndex,
+iIndex );
+}
+else
+{
+// This location has not been read earlier, add it to list
+TPBEntry* storeEntry = new ( ELeave ) TPBEntry();
+storeEntry->iEntryPresent = EFalse;
+storeEntry->iEntryIndex = iIndex;
+storeEntry->PBEntryExtRecord.Reset();
+iMmPhoneBookStoreMessHandler->StoreEntryToPhoneBookList(
+storeEntry,
+iArrayIndex );
+}
+// If it is MBDN Phone Book then update MBI File also
+if( PB_MBDN_FID == iFileId)
+{
+// Start Writing MBI file
+iCurrentDeletePhase = EPBDeletePhase_delete_MBI_profile;
+ret = UiccPBReqDeleteMBIProfile();
+}
+else
+{
+// Ready for complete
+aComplete = ETrue;
+if ( EMmTsyPhoneBookStoreDeleteAllIPC == iIpc &&
+iNumOfEntries )
+{
+// Continue deleting entries
+iIndex = iNumOfEntries;
+ret = UiccPbReqDelete();
+iNumOfEntries--;
+}
+else
+{
+// Ready for complete
+aComplete = ETrue;
+// In case of delete all location is 0
+if ( EMmTsyPhoneBookStoreDeleteIPC == iIpc )
+{
+aLocation = iIndex;
+}
+}
+}
+return ret;
+}
+// ---------------------------------------------------------------------------
+// CMmPhoneBookOperationDelete::HandleReadExtResp
+// Handles phonebook Ext data Read
+// ---------------------------------------------------------------------------
+//
+TInt CMmPhoneBookOperationDelete::HandleDeleteExtResp()
+{
+TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleDeleteExtResp");
+OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEEXTRESP, "CMmPhoneBookOperationDelete::HandleDeleteExtResp" );
+TInt ret ( KErrNone );
+// Entry was read earlier and extension records saved
+if ( iLocationFoundInPbList )
+{
+// Check if there are extensions left, in that case
+// continue deleting extensions
+if ( iNumOfExtensions )
+{
+ret = UiccPbReqDeleteExt(
+iEntry.PBEntryExtRecord[iNumOfExtensions-1] );
+iNumOfExtensions--;
+}
+// All extensions were deleted, next delete the main entry
+else
+{
+iCurrentDeletePhase = EPBDeletePhaseDeleteEntry;
+ret = UiccPbReqDeleteEntry();
+}
+}
+// Extensions were read from SIM and saved to internal buffer
+else
+{
+iNumOfExtensions = iExtRecordArrayToBeDelete.Count();
+if ( iNumOfExtensions )
+{
+ret = UiccPbReqDeleteExt(
+iExtRecordArrayToBeDelete[iNumOfExtensions - 1] );
+iExtRecordArrayToBeDelete.Remove(
+iNumOfExtensions - 1 );
+iExtRecordArrayToBeDelete.Compress();
+}
+else // It is time to delete the main entry
+{
+iCurrentDeletePhase = EPBDeletePhaseDeleteEntry;
+ret = UiccPbReqDeleteEntry();
+}
+}
+return ret;
+}
 // ---------------------------------------------------------------------------
 // CMmPhoneBookOperationDelete::UiccPbReqDeleteExt
 // Constructs an ISI-message to delete extension record
 // ---------------------------------------------------------------------------
 }
 // ---------------------------------------------------------------------------
 // TBool CMmPhoneBookOperationDelete::HandleWriteMBIReadResp
-// Handle write response for MBI profile read
+// Handle response for MBI profile read
 // ---------------------------------------------------------------------------
 //
-TInt CMmPhoneBookOperationDelete::HandleWriteMBIReadResp(
+TInt CMmPhoneBookOperationDelete::HandleMBIReadResp(
 TInt aStatus,
 TUint8 aDetails,
 TBool &aComplete,
 const TDesC8 &aFileData )
 {
 TInt ret ( KErrNone );
-TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleWriteMBIReadResp");
+TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleMBIReadResp");
-OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEWRITEMBIREADRESP, "CMmPhoneBookOperationDelete::HandleWriteMBIReadResp" );
+OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEMBIREADRESP, "CMmPhoneBookOperationDelete::HandleMBIReadResp" );
 if( UICC_STATUS_OK  == aStatus )
 {
 iIndex = aFileData[0];
 if( ( 0 != iIndex ) && ( iIndex <= iMmPhoneBookStoreMessHandler->
 ret = HandleReadEntryResp( aFileData );
 break;
 }
 case EPBDeletePhaseDeleteExtension:
 {
-// Entry was read earlier and extension records saved
+ret = HandleDeleteExtResp();
-if ( iLocationFoundInPbList )
-{
-// Check if there are extensions left, in that case
-// continue deleting extensions
-if ( iNumOfExtensions )
-{
-ret = UiccPbReqDeleteExt(
-iEntry.PBEntryExtRecord[iNumOfExtensions-1] );
-iNumOfExtensions--;
-}
-// All extensions were deleted, next delete the main entry
-else
-{
-iCurrentDeletePhase = EPBDeletePhaseDeleteEntry;
-ret = UiccPbReqDeleteEntry();
-}
-}
-// Extensions were read from SIM and saved to internal buffer
-else
-{
-iNumOfExtensions = iExtRecordArrayToBeDelete.Count();
-if ( iNumOfExtensions )
-{
-ret = UiccPbReqDeleteExt(
-iExtRecordArrayToBeDelete[iNumOfExtensions - 1] );
-iExtRecordArrayToBeDelete.Remove(
-iNumOfExtensions - 1 );
-iExtRecordArrayToBeDelete.Compress();
-}
-else // It is time to delete the main entry
-{
-iCurrentDeletePhase = EPBDeletePhaseDeleteEntry;
-ret = UiccPbReqDeleteEntry();
-}
-}
 break;
 }
 case EPBDeletePhaseDeleteEntry:
 {
-if ( iLocationFoundInPbList ) // Entry already in list, reset
+ret = HandleDeleteEntryResp( complete, location );
-{
-iMmPhoneBookStoreMessHandler->ResetEntryInPhoneBookList(
-iArrayIndex,
-iIndex );
-}
-else
-{
-// This location has not been read earlier, add it to list
-TPBEntry* storeEntry = new ( ELeave ) TPBEntry();
-storeEntry->iEntryPresent = EFalse;
-storeEntry->iEntryIndex = iIndex;
-storeEntry->PBEntryExtRecord.Reset();
-iMmPhoneBookStoreMessHandler->StoreEntryToPhoneBookList(
-storeEntry,
-iArrayIndex );
-}
-// If it is MBDN Phone Book then update MBI File also
-if( PB_MBDN_FID == iFileId)
-{
-// Start Writing MBI file
-iCurrentDeletePhase = EPBDeletePhase_delete_MBI_profile;
-ret = UiccPBReqDeleteMBIProfile();
-}
-else
-{
-// Ready for complete
-complete = ETrue;
-if ( EMmTsyPhoneBookStoreDeleteAllIPC == iIpc &&
-iNumOfEntries )
-{
-// Continue deleting entries
-iIndex = iNumOfEntries;
-ret = UiccPbReqDelete();
-iNumOfEntries--;
-}
-else
-{
-// Ready for complete
-complete = ETrue;
-// In case of delete all location is 0
-if ( EMmTsyPhoneBookStoreDeleteIPC == iIpc )
-{
-location = iIndex;
-}
-}
-}
 break;
 }
 case EPBDeletePhase_Read_MBI_profile:
 {
-ret = HandleWriteMBIReadResp( aStatus, aDetails, complete, aFileData );
+ret = HandleMBIReadResp( aStatus, aDetails, complete, aFileData );
 break;
 }
 case EPBDeletePhase_delete_MBI_profile:
 {
 if( UICC_STATUS_OK  != aStatus )
 else
 {
 // Continue deleting entries
 // increment iMBIProfileType to read next profile
 iMBIProfileType++;
 if ( EMmTsyPhoneBookStoreDeleteAllIPC == iIpc &&
 ( iMBIProfileType < iMmPhoneBookStoreMessHandler->
 iPBStoreConf[iArrayIndex].iMbiRecLen ) )
 {
 iCurrentDeletePhase = EPBDeletePhase_Read_MBI_profile;
 }
 if ( complete )
 {
 TPBEntryInfo pbEntryInfo;
-pbEntryInfo.iMaxNumLength = iMmPhoneBookStoreMessHandler->
+pbEntryInfo.iLocation = 0;
-iPBStoreConf[iArrayIndex].iNumlength;
+pbEntryInfo.iMaxNumLength = 0;
-pbEntryInfo.iLocation = location;
+if( KErrNone == ret )
+{
+pbEntryInfo.iMaxNumLength = iMmPhoneBookStoreMessHandler->
+iPBStoreConf[iArrayIndex].iNumlength;
+if( iIpc == EMmTsyPhoneBookStoreDeleteIPC )
+{
+pbEntryInfo.iLocation = location;
+}
+}
 CPhoneBookDataPackage phoneBookData;
 phoneBookData.SetPhoneBookName( iPhoneBookTypeName );
 phoneBookData.PackData( &pbEntryInfo );

changeset 8	6295dc2169f3
parent 7	fa67e03b87df
child 9	8486d82aef45