FCL/sf/mw/phonesrv: comparison vmbx/vmbxengine/src/vmbxpbkstore.cpp

equal deleted inserted replaced

-:d7fc66ccd6fb
+:e44a8c097b15
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <cvoicemailboxentry.h>
 #include "vmbxutilities.h"
 #include "vmbxetelconnection.h"
 #include "vmbxlogger.h"
 #include "vmbxpbkstore.h"
+#include <e32property.h>
+#include <simutils.h>
+#include <startupdomainpskeys.h>
 //CONSTANTS
 // Amount of retries to be performed.
 const TInt KVmbxPhonebookBufferSize( 150 );
 // ============================ MEMBER FUNCTIONS =============================
 // ---------------------------------------------------------------------------
 //
 void CVmbxPbkStore::ConstructL()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::ConstructL =>" );
+TInt value( 0 );
+TInt res = RProperty::Get( KPSUidStartup, KPSSimStatus, value );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::ConstructL res = %d", res );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::ConstructL value = %d", value );
+if ( (ESimUsable != value && ESimReadable != value ) || KErrNone != res )
+{
+// Sim card not ready to use
+User::Leave( KErrNotReady );
+}
 // Open tel server and phone
 iETelConnection = CVmbxETelConnection::NewL();
 iWait = new( ELeave ) CActiveSchedulerWait;
 TVmbxAlsLineType alsLine = VmbxUtilities::AlsLine();
-// Supported ALS line
+// Supported ALS line,ALS line on
 if ( EVmbxAlsLineDefault != alsLine )
 {
-// open 6f17 file
+// open 6f17 file ,if not found the file, leave
 User::LeaveIfError( OpenVmbxPhonebook() );
 }
-// Not supported ALS line
+// Not supported ALS line,ALS line off
 else
 {
-// USIM exist
+// Open 6fc7 file, if not found, open 6f17 file
-if ( SimFileExistsAndReadAccess() )
+TInt result = OpenMbdnPhonebook();
-{
+if ( KErrPathNotFound == result )
-// Open 6fc7 file
+{
-User::LeaveIfError( OpenMbdnPhonebook() );
+//close 6fc7 and open 6f17 file
-}
+iPhoneBook.Close();
-// USIM not exist, open 6f17 file
+// open 6f17 file ,if not found the file, leave
+User::LeaveIfError( OpenVmbxPhonebook() );
+}
 else
 {
-VMBLOGSTRING( "VMBX: CVmbxPbkStore::ConstructL: no mbdn file\
+User::LeaveIfError( result );
-then open 6f17 file" );
-User::LeaveIfError( OpenVmbxPhonebook() );
 }
 }
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::ConstructL <=" );
 }
 result = iStatus.Int();
 VMBLOGSTRING2( "VMBX: CVmbxPbkStore::PhonebookInfo: \
 SIM Phonebook info read, status: %I", result );
 }
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::GetVmbxInfo <=" );
 return result;
 }
 // ---------------------------------------------------------------------------
 //
 TBool CVmbxPbkStore::IsWritable()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::IsWritable =>" );
 TBool result( EFalse );
-RMobilePhoneBookStore::TMobilePhoneBookInfoV1 info;
+if ( IsWriteAccess() )
-TInt temp = GetVmbxInfo( info );
+{
-if( KErrNone == temp )
+// Get current sim entry, then write the same entry
-{
+// to sim if read successufully
-result = ( info.iCaps &
+CVoiceMailboxEntry* simEntry(NULL);
-RMobilePhoneBookStore::KCapsWriteAccess ? 1 : 0 );
+TRAPD( newErr, simEntry = CVoiceMailboxEntry::NewL() );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::IsWritable newErr = %d ",
-}
+newErr );
-VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWritable: info.iCaps %I",
+if ( KErrNone == newErr )
-info.iCaps );
+{
+// get als line info
+simEntry->SetVmbxAlsLineType( VmbxUtilities::AlsLine() );
+simEntry->SetVoiceMailboxType( EVmbxVoice );
+simEntry->SetServiceId( KVmbxServiceVoice );
+TRAPD( err, SimReadL( *simEntry ) );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWritable read %I <=", err );
+if ( KErrNotFound == err )
+{
+simEntry->SetVmbxNumber( KNullDesC );
+}
+if ( KErrNone == err || KErrNotFound == err )
+{
+err = Write( *simEntry );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWritable write %I <=",
+err );
+// If write successfully, means writable
+if ( KErrNone == err )
+{
+result = ETrue;
+}
+}
+}
+delete simEntry;
+simEntry = NULL;
+}
 VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWritable result %I <=", result );
 return result;
 }
 // ---------------------------------------------------------------------------
 }
 else
 {
 pbkBuffer->Set( &pbData );
 TInt activeAlsLine = aEntry.VmbxAlsLineType();
+// Add index, const value for vmbx write.
+int entryIndex = 1;
 // New entry
 result = pbkBuffer->AddNewEntryTag();
 if ( KErrNone == result )
 {
-// Add index
 // Type of index is TUint16 in Multimode ETel and TInt in old ETel.
 result = pbkBuffer->PutTagAndValue(
-RMobilePhoneBookStore::ETagPBAdnIndex, (TUint16)activeAlsLine );
+RMobilePhoneBookStore::ETagPBAdnIndex, (TUint16)entryIndex );
-}
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::Write: ETagPBAdnIndex \
-// Add name if it existed on SIM card
+result=%I",  result );
-// Type of ETagPBText is TDes16
+// Add name if it existed on SIM card,Type of ETagPBText is TDes16
-if ( KErrNone == result && iAlphaStringFromSIM )
+if ( iAlphaStringFromSIM )
 {
 result = pbkBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBText, *iAlphaStringFromSIM );
-// Add number,Type of ETagPBNumber is TDes16
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::Write: ETagPBText\
+result=%I",  result );
+}
+TPtrC vmbxNumber( KNullDesC );
+result = aEntry.GetVmbxNumber( vmbxNumber );
 if ( KErrNone == result )
 {
-TPtrC vmbxNumber( KNullDesC );
+// Add number,Type of ETagPBNumber is TDes16
-result = aEntry.GetVmbxNumber( vmbxNumber );
+result = pbkBuffer->PutTagAndValue(
-if ( KErrNone == result )
+RMobilePhoneBookStore::ETagPBNumber, vmbxNumber );
-{
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::Write: ETagPBNumber\
-result = pbkBuffer->PutTagAndValue(
+result=%I",  result );
-RMobilePhoneBookStore::ETagPBNumber, vmbxNumber );
-}
 }
 }
 if ( KErrNone == result )
 {
 if ( iPhoneBookType == EMBDNPhoneBook )
 {
 RMobilePhone::TMobilePhoneVoicemailIdsV3 mbdnInfo;
-result = GetMbdnInfo( EVmbxAlsLine1, mbdnInfo );
+result = GetMbdnInfo( VmbxUtilities::AlsLine(), mbdnInfo );
 if ( KErrNone == result )
 {
 TInt index = mbdnInfo.iVoice;
 if( !IsActive() && !iWait->IsStarted() )
 else
 {
 if( !IsActive() && !iWait->IsStarted() )
 {
 // write vmbx number to 6f17 file
-iPhoneBook.Write( iStatus, pbData, activeAlsLine );
+iPhoneBook.Write( iStatus, pbData, entryIndex );
 iAsynType = EVmbxSimEntryWrite;
 // Wait for asynchronous call to finish
 SetActive();
 iWait->Start();
 result = iStatus.Int();
 return result;
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::PhonebookStore
-// Return Phonebook
+// Return RMobilePhoneBookStore
 // ---------------------------------------------------------------------------
 RMobilePhoneBookStore& CVmbxPbkStore::PhonebookStore()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::PhonebookStore <=>" );
 return iPhoneBook;
 else
 {
 result = iStatus.Int();
 }
-if ( EVmbxAlsLineDefault == aAlsLine && KErrNone == result )
+if ( EVmbxAlsLineDefault == aAlsLine )
 {
 aInfo.iVoice =  EVmbxAlsLine1;
 }
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: aInfo.iVoice %I",
+aInfo.iVoice );
 }
 VMBLOGSTRING2( "VMBX: CVmbxPbkStore::GetMbdnInfo: result %I<=",
 result );
 return result;
 }
 // ---------------------------------------------------------------------------
 //
 TInt CVmbxPbkStore::OpenMbdnPhonebook()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::OpenMbdnPhonebook =>" );
-// try to open mbdn-type phonebook
+//Open mbdn-type phonebook , Currently the file not exist, thr return
+// value also KErrNone
 TInt result = iPhoneBook.Open( iETelConnection->Phone(),
 KETelIccMbdnPhoneBook );
 VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenMbdnPhonebook :\
-MBDN opening result = %I", result );
+MBDN opening result = %d", result );
-if ( KErrNone == result )
-{
+TBool res = IsSimFileExisting( EMBDNPhoneBook );
-iPhoneBookType = EMBDNPhoneBook;
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenMbdnPhonebook :\
-}
+MBDN reading res = %d", res );
-VMBLOGSTRING( "VMBX: CVmbxPbkStore::OpenMbdnPhonebook <=" );
+if ( !res )
+{
+result = KErrPathNotFound;
+}
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenMbdnPhonebook res = %d<=", result );
 return result;
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::OpenVmbxPhonebook
 // ---------------------------------------------------------------------------
 //
 TInt CVmbxPbkStore::OpenVmbxPhonebook()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::OpenVmbxPhonebook =>" );
-// try to open vmbx-type phonebook
+//Open vmbx-type phonebook , Currently the file not exist, thr return
+// value also KErrNone
 TInt result = iPhoneBook.Open( iETelConnection->Phone(),
 KETelIccVoiceMailBox );
-if ( KErrNone == result )
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenVmbxPhonebook :\
-{
+Vmbx opening result = %d", result );
-iPhoneBookType = EVMBXPhoneBook;
+TBool res = IsSimFileExisting( EVMBXPhoneBook );
-}
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenVmbxPhonebook :\
-VMBLOGSTRING2( "Vmbx phonebook opening result = %I ", result );
+Vmbx reading res = %d", res );
-VMBLOGSTRING( "VMBX: CVmbxPbkStore::OpenVmbxPhonebook <=" );
+if ( !res )
+{
+result = KErrPathNotFound;
+}
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::OpenVmbxPhonebook result=%d <=", result );
 return result;
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::GetL
 // close 6fc7 and open 6f17 file
 iPhoneBook.Close();
 User::LeaveIfError( OpenVmbxPhonebook() );
 // read vmbx number from 6f17 file
 SimReadL( aEntry );
 }
 }
 else
 {
 SimReadL( aEntry );
 }
 iStatus, mbdnInfo.iVoice, numEntries, pbData );
 iAsynType = EVmbxSimEntryRead;
 // Wait for asynchronous call to finish
 SetActive();
 iWait->Start();
 }
 }
 }
 else
 {
 // Record#1 in sim is for line1 number and Record#2 in sim is for
 // line2 number so line is used to fetch
 VMBLOGSTRING( "start VMBX PhoneBook read" );
 TInt activeAlsLine = aEntry.VmbxAlsLineType();
+if ( EVmbxAlsLineDefault == activeAlsLine )
+{
+activeAlsLine = EVmbxAlsLine1;
+}
 if( !IsActive() && !iWait->IsStarted() )
 {
 result = KErrNone;
 // read vmbx number from 6f17 file
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::SimReadLactiveAlsLine = %I",
+activeAlsLine );
 iPhoneBook.Read( iStatus, activeAlsLine, numEntries, pbData );
 iAsynType = EVmbxSimEntryRead;
 // Wait for asynchronous call to finish
 SetActive();
 iWait->Start();
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::SimReadL <=" );
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::ParseDataL
-// read vmbx number from sim
+//
 // ---------------------------------------------------------------------------
 //
 void CVmbxPbkStore::ParseDataL( CVoiceMailboxEntry& aEntry, TDes8& aPbData )
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::ParseDataL =>" );
 User::LeaveIfError( result );
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::ReadPbkDataL <=" );
 }
 // ---------------------------------------------------------------------------
-// CVmbxPbkStore::IsUsimSupport
-// Checks if USim card in the phone
-// ---------------------------------------------------------------------------
-TBool CVmbxPbkStore::SimFileExistsAndReadAccess()
-{
-VMBLOGSTRING( "VMBX: CVmbxPbkStore::SimFileExistsAndReadAccess =>" );
-TBool result( EFalse );
-TUint32 capability;
-TInt err = iETelConnection->Phone().GetIccAccessCaps( capability );
-VMBLOGSTRING2( "VMBX: CVmbxSimHandler::SimFileExistsAndReadAccess:\
-Err = %I", err);
-if ( err == KErrNone &&
-// Phone has a USIM and it currently supports USIM access by clients.
-// the current sim card is 3G
-capability & RMobilePhone::KCapsUSimAccessSupported )
-{
-result = ETrue;
-}
-VMBLOGSTRING2( "VMBX: CVmbxPbkStore::SimFileExistsAndReadAccess \
-return = %d <=", result );
-return result;
-}
-// ---------------------------------------------------------------------------
 // CVmbxPbkStore::RunL
-// read vmbx number from sim
+//
 // ---------------------------------------------------------------------------
 //
 void CVmbxPbkStore::RunL()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::RunL =>" );
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::RunL <=" );
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::DoCancel
-// read vmbx number from sim
+//
 // ---------------------------------------------------------------------------
 //
 void CVmbxPbkStore::DoCancel()
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::DoCancel =>" );
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::DoCancel : EVmbxSimEntryRead" );
 iETelConnection->Phone().CancelAsyncRequest(
 EMobilePhoneStoreRead );
 break;
 }
 case EVmbxSimEntryWrite:
 {
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::DoCancel : EVmbxSimEntryWrite" );
 iETelConnection->Phone().CancelAsyncRequest(
 EMobilePhoneStoreWrite );
 break;
 }
 default:
 break;
 }
 VMBLOGSTRING( "VMBX: CVmbxPbkStore::DoCancel <=" );
 }
 // ---------------------------------------------------------------------------
 // CVmbxPbkStore::RunError
-// read vmbx number from sim
+//
 // ---------------------------------------------------------------------------
 //
 TInt CVmbxPbkStore::RunError(TInt aError)
 {
+// Avoid warning
+aError = aError;
 VMBLOGSTRING2( "VMBX: CVmbxPbkStore::RunError: %I", aError );
 return KErrNone;
 }
+// ---------------------------------------------------------------------------
+// CVmbxPbkStore::IsSimFileExisting
+// check sim file existing or not
+// ---------------------------------------------------------------------------
+//
+TBool CVmbxPbkStore::IsSimFileExisting( const TVmbxSimPhonebookType aType )
+{
+VMBLOGSTRING( "VMBX: CVmbxPbkStore::IsSimFileExisting =>" );
+iPhoneBookType = aType;
+TBool result( ETrue );
+CVoiceMailboxEntry* entry(NULL);
+TRAPD( err, entry = CVoiceMailboxEntry::NewL() );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::IsSimFileExisting err = %d ",
+err );
+if ( KErrNone != err )
+{
+result = EFalse;
+}
+else
+{
+entry->SetVoiceMailboxType( EVmbxVoice );
+TRAPD( err, SimReadL( *entry ) );
+// KErrPathNotFound means when current file path not found.
+if ( KErrPathNotFound == err )
+{
+result = EFalse;
+}
+}
+delete entry;
+entry = NULL;
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore::IsSimFileExisting result = %d <= ",
+result );
+return result;
+}
+// ---------------------------------------------------------------------------
+// CVmbxPbkStore::IsWriteAccess
+// Sim write access support
+// ---------------------------------------------------------------------------
+//
+TBool CVmbxPbkStore::IsWriteAccess()
+{
+VMBLOGSTRING( "VMBX: CVmbxPbkStore::IsWriteAccess =>" );
+TBool result( EFalse );
+RMobilePhoneBookStore::TMobilePhoneBookInfoV1 info;
+TInt temp = GetVmbxInfo( info );
+if( KErrNone == temp )
+{
+result = ( info.iCaps &
+RMobilePhoneBookStore::KCapsWriteAccess ? ETrue : EFalse );
+}
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWriteAccess: info.iCaps %X",
+info.iCaps );
+VMBLOGSTRING2( "VMBX: CVmbxPbkStore:: IsWriteAccess result %I <=", result );
+return result;
+}
 //End of file

changeset 19	e44a8c097b15
parent 12	ae8abd0db65c
child 27	7eb70891911c