FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit3g

equal deleted inserted replaced

-:fa67e03b87df
+:6295dc2169f3
 // None
 )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CMmPhoneBookOperationInit3G_adn");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_CMMPHONEBOOKOPERATIONINIT3G_ADN, "CMmPhoneBookOperationInit3G_adn::~CMmPhoneBookOperationInit3G_adn" );
 }
 // -----------------------------------------------------------------------------
 // CMmPhoneBookOperationInit3G_adn::NewL
 // Two-phased constructor.
 iPBStoreInfoData = new( ELeave ) CStorageInfoData();
 iIniPhase = 0;
 iServiceType = 0;
 iNumOfPBRRecords = 0;
-#ifdef INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
-TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler. \
-INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS is ON.");
-iMmPhoneBookStoreMessHandler->SetMaxNumOfAasEntries( 0 );
-iMmPhoneBookStoreMessHandler->SetMaxNumberOfGAS( 0 );
-#else
-TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler. \
-INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS is OFF.");
-#endif // INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
 }
 // -----------------------------------------------------------------------------
 // CMmPhoneBookOperationInit3G_adn::UICCCreateReq
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN - File Info Read Request for EF-PBR " );
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN - File Info Read Request for EF-PBR" );
 cmdParams.fileId = PB_PBR_FID;
 cmdParams.serviceType = iServiceType;
-cmdParams.record = 0;
+cmdParams.record = KStartRecord;
 break;
 }
 case EPBInitPhase_3GADN_Type1:
 {
 // read Type 1 Files File descriptor, File Data and Extension File
 //Info or File Data
 // -----------------------------------------------------------------------------
 //
 TInt CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile(
 TUiccReadLinearFixed & aparams,
-const TUint8 aFileType)
+const TUint8 aFileType )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile");
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile" );
 TInt ret( KErrNone );
 iIniPhase = EPBIniPhase_Unknown;
 iInternalInit = EFalse;
 complete = ETrue;
 return KErrNone;
-}
+}  // no else
 switch(iIniPhase)
 {
 case EPBInitPhase_3GADN_PBR:
 case EPBInitPhase_3GADN_Type1:
 phoneBookData.PackData( iPBStoreInfoData );
 if ( UICC_STATUS_OK != aStatus )
 {
 ret = CMmStaticUtility::UICCCSCauseToEpocError( aStatus );
-}
+}  // no else
 iMmPhoneBookStoreMessHandler->MessageRouter()->Complete(
 EMmTsyPhoneBookStoreInitIPC,
 &phoneBookData,
 ret );
 complete = ETrue;
-}
+}  // no else
 return complete;
 }
 // -----------------------------------------------------------------------------
 // the total no of entries in 3G ADN phonebook
 if( UICC_APPL_FILE_INFO == iServiceType )
 {
 TFci fci( aFileData );
 iNumOfPBRRecords = fci.GetNumberOfRecords();
+// Store PBR record no in internal conf list
+iMmPhoneBookStoreMessHandler->
+iPBStoreConf[EPhonebookTypeAdn].
+iPBRNoOfRecords = iNumOfPBRRecords;
 ret = KErrNone;
 iServiceType = UICC_APPL_READ_LINEAR_FIXED;
 }
 else if( UICC_APPL_READ_LINEAR_FIXED == iServiceType )
 // type 2 or type3
 ret = CheckForSameType1AndType2Files();
 iServiceType = UICC_APPL_FILE_INFO;
 iIniPhase = EPBInitPhase_3GADN_Type1;
-}
+}  // no else ...
 }
 else
 {
 iADNPbInitilized = EFalse;
-GetNextPhoneBookInitPhase(iIniPhase);
+GetNextPhoneBookInitPhase( iIniPhase );
 }
 break;
 }
 case EPBInitPhase_3GADN_Type1:
 {
 else
 {
 // Call Create request for next phase
 ret = UICCInitializeReq3GADN( aTransId );
 }
-}
+}  // no else
 return ret;
 }
 // -----------------------------------------------------------------------------
 // Check for No of records in Type 1 file
 if( UICC_EF_ADN_TAG != tagValue )
 {
 ret = CheckForNoOfRecords( noOfRecords );
-}
+}  // no else
-}
+}  // no else
 if( iCurrentArrayCounter < iType1FileArray.Count() )
 {
 if( UICC_STATUS_OK  == aStatus )
 {
 }
 case UICC_EF_ANR_TAG:
 {
 // Check for if No of records for this File is same as ADN
 // phonebook no of records
-if(KErrNone == ret)
+if( KErrNone == ret )
 {
 // Check for fixed size record length
 ret = CheckRecordSizeForFixedLength(
 1,
 UICC_EF_ANR_TAG,
 iType1ANRFiles++;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iANRNoOfRecords
 = iPBStoreInfoData->iANRNumOfEntries;
-}
+} // no else
-}
+}  // no else
 break;
 }
 case UICC_EF_EMAIL_TAG:
 {
 if( KErrNone == ret )
 iPBStoreConf[EPhonebookTypeAdn].iEmailNoOfRecords =
 iPBStoreInfoData->iEmailNumOfEntries;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iEmailStringLength =
 iPBStoreInfoData->iEmailTextLengthMax;
-}
+}  // no else
 break;
 }
 case UICC_EF_GRP_TAG:
 {
 if( KErrNone == ret )
 {
 // get the record record no from file info data
 iPBStoreInfoData->iGRPNumOfEntriesPerEntry =
 noOfRecords;
-}
+}  // no else
 break;
 }
 case UICC_EF_IAP_TAG:
 {
 // This File is mandatory only when there are Type 2 Files
 if( iType2FileArray.Count()== 0 )
 {
 ret = KErrGeneral;
-}
+}  // no else
 if( KErrNone == ret )
 {
 // Store IAP record record length in internal buffer
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iIAPRecordLength =
 recordLength;
-}
+} // no else
 break;
 }
 case UICC_EF_PBC_TAG:
 {
 if( KErrNone == ret )
 recordLength) )
 {
 // remove this entry from Array
 iType1FileArray[iCurrentArrayCounter].tagFID = 0x00;
 iType1FileArray[iCurrentArrayCounter].tagSFI = 0x00;
-iType1FileArray[iCurrentArrayCounter].tagValue =
+iType1FileArray[iCurrentArrayCounter].tagValue = 0x00;
-0x00;
+}  // no else
-}
+}  // no else
-}
 break;
 }
 case UICC_EF_SNE_TAG:
 {
 if( KErrNone == ret )
 iPBStoreConf[EPhonebookTypeAdn].iSNENoOfRecords =
 iPBStoreInfoData->iSNENumOfEntries;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iSNEStringLength =
 iPBStoreInfoData->iSNETextLengthMax;
-}
+}  // no else
 break;
 }
 case UICC_EF_UID_TAG:
 {
 break;
 // Check if error is there then remove that file ID and tag from
 // iType1FileArray
 if( KErrNone != ret )
 {
-iType1FileArray.Remove(iCurrentArrayCounter);
+iType1FileArray.Remove( iCurrentArrayCounter );
 }
 else
 {
 iCurrentArrayCounter++;
 }
 iADNPbInitilized = EFalse;
 // ADN phonebook is not valid and check for other phonebooks
 // parameters
 iIniPhase = EPBIniPhase_3GADNDone;
 return;
-}
+}  // no else
 iCurrentArrayCounter++;
 }
 // Check for next Phase
 if( iCurrentArrayCounter == iType1FileArray.Count() )
 {
 iCurrentArrayCounter = 0;
 // Change Phase to read other Files
 if( 0 != iType2FileArray.Count() )
+{
 iIniPhase = EPBInitPhase_3GADN_Type2;
+}
 else if( 0 != iType3FileArray.Count() )
 {
 iIniPhase = EPBInitPhase_3GADN_Type3;
 }
 else
 {
 iIniPhase = EPBIniPhase_3GADNDone;
 }
-}
+}  // no else
 } // End of Type 1 file array handling
 }
 // -----------------------------------------------------------------------------
 // HAndles Data for Type 2 file Response
 // -----------------------------------------------------------------------------
 //
 void CMmPhoneBookOperationInit3G_adn::HandleType2FileResp(
 const TDesC8 &aFileData,
-TInt aStatus)
+TInt aStatus )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleType2FileResp");
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE2FILERESP, "CMmPhoneBookOperationInit3G_adn::HandleType2FileResp" );
 TInt ret(KErrNone);
 TInt recordLength( 0 );
-TInt noOfRecords(0);
+TInt noOfRecords( 0 );
 if( UICC_STATUS_OK  == aStatus )
 {
 // Get the Record length for all linear fixed and circular EF's
 TFci fci( aFileData );
 recordLength = fci.GetRecordLength();
 noOfRecords = fci.GetNumberOfRecords();
-}
+}  // no else
 // Get the tag value for current File
 TUint tagValue = iType2FileArray[iCurrentArrayCounter].tagValue;
 if( iCurrentArrayCounter < iType2FileArray.Count() )
 {
 if( UICC_STATUS_OK  == aStatus )
 {
-switch(tagValue)
+switch( tagValue )
 {
 case UICC_EF_ANR_TAG:
 {
 ret = CheckRecordSizeForFixedLength(
 UICC_TYPE2_FILE,
 UICC_EF_ANR_TAG,recordLength );
-if(KErrNone == ret)
+if( KErrNone == ret )
 {
 // total no of entries in all ANR files
 iPBStoreInfoData->iANRNumOfEntries =
 noOfRecords* iNumOfPBRRecords;
 // For this need to know about the ext files
 iType2ANRFiles++;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iANRNoOfRecords =
 iPBStoreInfoData->iANRNumOfEntries;
-}
+}  // KErrNone
 break;
 }
 case UICC_EF_EMAIL_TAG:
 {
 // get the total no of entries in all EF in PBR Files
 iType2EmailFiles++;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iEmailNoOfRecords =
 iPBStoreInfoData->iEmailNumOfEntries;
+iMmPhoneBookStoreMessHandler->
+iPBStoreConf[EPhonebookTypeAdn].iEmailStringLength =
+recordLength - 2;
 break;
 }
 case UICC_EF_SNE_TAG:
 {
 iPBStoreInfoData->iSNENumOfEntries =
 iType2SNEFiles++;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iSNENoOfRecords =
 iPBStoreInfoData->iSNENumOfEntries;
+iMmPhoneBookStoreMessHandler->
+iPBStoreConf[EPhonebookTypeAdn].iSNEStringLength =
+iPBStoreInfoData->iSNETextLengthMax;
 break;
 }
 default:
 {
 break;
 // Check for next Phase
 if( iCurrentArrayCounter == iType2FileArray.Count() )
 {
 iCurrentArrayCounter = 0;
 if( 0 != iType3FileArray.Count() )
+{
 iIniPhase = EPBInitPhase_3GADN_Type3;
+}
 else
+{
 iIniPhase = EPBIniPhase_3GADNDone;
 }
-}
+}  // no else
+}  // no else
 }
 // -----------------------------------------------------------------------------
 // CmmPhonebookOperationInit::HandleType3FileResp
 if( UICC_STATUS_OK  == aStatus )
 {
 TFci fci( aFileData );
 recordLength = fci.GetRecordLength();
 noOfRecords = fci.GetNumberOfRecords();
-}
+}  // no else
 // Get the tag value for current File
 TUint tagValue ( iType3FileArray[iCurrentArrayCounter].tagValue );
 if( iCurrentArrayCounter < iType3FileArray.Count() )
 }
 case UICC_EF_EXT1_TAG:
 {
 // Check for Fixed record length
 ret = CheckRecordSizeForFixedLength(
-3,
+UICC_TYPE3_FILE,
 UICC_EF_EXT1_TAG,recordLength );
 // check for Error if Length doesn'nt match
 if( KErrNone == ret )
 {
 // Get the file file length for extension data only
 // (remove record type and Identifier 2 bytes)
 TInt fileLength ( ( recordLength - 2 ) * noOfRecords );
 iPBStoreInfoData->iADNNumberLengthMax =
-UICC_NO_EXT_MAX_NUM_LEN+(2*fileLength);
+UICC_NO_EXT_MAX_NUM_LEN+( 2*fileLength );
 // Check file is not invalid
 if( UICC_NO_EXT_MAX_NUM_LEN ==
 iPBStoreInfoData->iANRNumLengthMax )
 {
 iPBStoreInfoData->iANRNumLengthMax =
-UICC_NO_EXT_MAX_NUM_LEN+(2*fileLength);
+UICC_NO_EXT_MAX_NUM_LEN+( 2*fileLength );
-}
+}  // no else
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iNumlength =
 iPBStoreInfoData->iADNNumberLengthMax;
 iMmPhoneBookStoreMessHandler->
 iPBStoreConf[EPhonebookTypeAdn].iExtNoOfRec =
 ( noOfRecords * iNumOfPBRRecords );
-}
+}  // no else
 break;
 }
 case UICC_EF_GAS_TAG:
 {
 break;
 default:
 {
 break;
 }
 }
-}
+}  // no else
 if( KErrNone != ret )
 {
 // remove from teh Array
-iType3FileArray.Remove(iCurrentArrayCounter);
+iType3FileArray.Remove( iCurrentArrayCounter );
 }
 else
 {
 iCurrentArrayCounter++;
 }
 // Check for next Phase
 if( iCurrentArrayCounter == iType3FileArray.Count() )
 {
 iCurrentArrayCounter = 0;
 iIniPhase = EPBIniPhase_3GADNDone;
-}
+}  // no else
-}
+}  // no else
 }
 // -----------------------------------------------------------------------------
 // Check for Type1 File Id's with all Type1, Type2 and Type3 file Id's
 for( TInt j=0; j < iType1FileArray.Count(); j++ )
 {
 // Check for Type 1 files
-for( TInt i = (j+1); i< (iType1FileArray.Count()-j); i++ )
+for( TInt i = ( j+1 ); i< ( iType1FileArray.Count()-j ); i++ )
 {
 if( iType1FileArray[i].tagFID == iType1FileArray[j].tagFID )
 {
 // Check if it is a ADN EF then it will be a failure case
 if( iType1FileArray[i].tagValue == UICC_ADN_PRIM_TAG )
-ret = KErrGeneral;
+{
+ret = KErrGeneral;
+}
 else
 {
 // remove Entry
 iType1FileArray.Remove(i);
 iType1FileArray.Remove(j);
 }
-}
+}  // no else
 }
 // Check for Type2 file id's
 for(TInt i=0; i<iType2FileArray.Count(); i++)
 {
 if( iType2FileArray[i].tagFID == iType1FileArray[j].tagFID )
 {
 // remove thise Entries
 iType1FileArray.Remove(j);
 iType2FileArray.Remove(i);
 }
-}
+}  // no else
 }
 // Check for Type 3 File Id's
 for( TInt i=0; i<iType3FileArray.Count(); i++ )
 {
 if( iType3FileArray[i].tagFID == iType1FileArray[j].tagFID )
+{
 // Check for ADN file
 if( iType1FileArray[j].tagValue == UICC_ADN_PRIM_TAG )
+{
 ret = KErrGeneral;
+}
 else
 {
 // remove those entries
-iType1FileArray.Remove(j);
+iType1FileArray.Remove( j );
-iType3FileArray.Remove(i);
+iType3FileArray.Remove( i );
 }
-}
+}  // no else
 }
+}
-// Check for Type2 File Id's with all Type2 and Type3 file Id's
-for( TInt j=0; j< iType2FileArray.Count(); j++ )
+// Check for Type2 File Id's with all Type2 and Type3 file Id's
-{
+for( TInt j=0; j< iType2FileArray.Count(); j++ )
-// Check for Type 2 files
+{
-for( TInt i = (j+1); i< ( iType2FileArray.Count()-j ); i++ )
+// Check for Type 2 files
-{
+for( TInt i = (j+1); i< ( iType2FileArray.Count()-j ); i++ )
-if( iType2FileArray[i].tagFID == iType2FileArray[j].tagFID)
+{
-{
+if( iType2FileArray[i].tagFID == iType2FileArray[j].tagFID )
-iType2FileArray.Remove(j);
+{
-iType2FileArray.Remove(i);
+iType2FileArray.Remove( j );
-}
+iType2FileArray.Remove( i );
-}
+}  // no else
-// Check for Type 3 File Id's
+}
-for( TInt i=0; i<iType3FileArray.Count(); i++ )
+// Check for Type 3 File Id's
-{
+for( TInt i=0; i<iType3FileArray.Count(); i++ )
-if( iType3FileArray[i].tagFID == iType2FileArray[j].tagFID )
+{
-{
+if( iType3FileArray[i].tagFID == iType2FileArray[j].tagFID )
-iType2FileArray.Remove(j);
+{
-iType3FileArray.Remove(i);
+iType2FileArray.Remove( j  );
-}
+iType3FileArray.Remove( i );
-}
+}  // no else
 }
+}
-//Check for Type3 File Id's with all other Type3 file Id's
-for( TInt j=0; j< iType3FileArray.Count(); j++ )
+//Check for Type3 File Id's with all other Type3 file Id's
-{
+for( TInt j=0; j< iType3FileArray.Count(); j++ )
-// Check for Type 2 files
+{
-for( TInt i = (j+1); i< (iType3FileArray.Count()-j); i++ )
+// Check for Type 2 files
-{
+for( TInt i = ( j+1 ); i< ( iType3FileArray.Count()-j ); i++ )
-if( iType3FileArray[i].tagFID == iType3FileArray[j].tagFID )
+{
-{
+if( iType3FileArray[i].tagFID == iType3FileArray[j].tagFID )
-iType3FileArray.Remove(j);
+{
-iType3FileArray.Remove(i);
+iType3FileArray.Remove( j );
-}
+iType3FileArray.Remove( i );
-}
+}  // no else
 }
+}
 return ret;
 }
 // -----------------------------------------------------------------------------
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords" );
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORNOOFRECORDS, "CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords" );
 TInt ret( KErrNone );
-if( iPBStoreInfoData->iADNNumOfEntries != aNoOfRecord )
+// get the no of records in one ADN Ef
+TInt maxNoOfRecInOneAdnEf =  ( ( iMmPhoneBookStoreMessHandler->
+iPBStoreConf[EPhonebookTypeAdn].iNoOfRecords ) /
+( iMmPhoneBookStoreMessHandler->
+iPBStoreConf[EPhonebookTypeAdn].iPBRNoOfRecords ) );
+if( maxNoOfRecInOneAdnEf != aNoOfRecord )
 {
 ret = KErrGeneral;
-}
+}  // no else
 return ret;
 }
 // -----------------------------------------------------------------------------
 {
 ret = KErrGeneral;
 }
 else
 {
-iType1FileArray.Remove(i);
+iType1FileArray.Remove( i );
-iType2FileArray.Remove(j);
+iType2FileArray.Remove( j );
 }
-}
+}  // no else
 }
 }
 return ret;
 }
 else
 {
 if( ( 2== aFileType )&& ( 17!=aRecordLength ) )
 {
 ret =KErrNone;
-}
+}  // no else
 }
 break;
 }
 case UICC_EF_PBC_TAG:
 {
 if( 2!=aRecordLength )
 {
 ret = KErrGeneral;
-}
+}  // no else
 break;
 }
 case UICC_EF_UID_TAG:
 {
 if( 2!= aRecordLength )
 {
 ret = KErrGeneral;
-}
+}  // no else
 break;
 }
 case UICC_EF_EXT1_TAG:
 {
 if( 13 != aRecordLength )
 {
 ret = KErrGeneral;
-}
+}  // no else
 break;
 }
 }
 return ret;
 }

changeset 8	6295dc2169f3
parent 7	fa67e03b87df
child 9	8486d82aef45