MCL/sf/os/cellularsrv: comparison telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp

equal deleted inserted replaced

-:962e6306d9d2
+:7ef16719d8cb
 RMobileONStore::TMobileONEntryV1Pckg* entryPckg =
 REINTERPRET_CAST
 ( RMobileONStore::TMobileONEntryV1Pckg*, aEntry );
 RMobileONStore::TMobileONEntryV1& entry = ( *entryPckg )();
-// Save entry pointer
+// Check index
-iReadONStoreEntryPtr = aEntry;
+if ( (-1) <= entry.iIndex )
+{
 // Forward request to GSM Extension
 ret = iMmONStoreExtInterface->ReadL( EMmTsyONStoreReadIPC, entry.iIndex );
+}
 if ( KErrNone == ret )
 {
+// Save entry pointer
+iReadONStoreEntryPtr = aEntry;
 // Save tsy req handle type
 iReqHandleType = EMultimodeONStoreRead;
 }
 	  	}
 TInt CMmONStoreTsy::WriteL(
 const TTsyReqHandle aTsyReqHandle,
 TDesC8* aEntry )
 {
 TFLOGSTRING("TSY: CMmONStoreTsy::WriteL");
-// Save tsy req handle type
-iReqHandleType = EMultimodeONStoreWrite;
 // Unpack entry param to get the location
 RMobileONStore::TMobileONEntryV1Pckg* entryPckg =
 REINTERPRET_CAST
 ( RMobileONStore::TMobileONEntryV1Pckg*, aEntry );
 RMobileONStore::TMobileONEntryV1& entry = ( *entryPckg )();
+// Return value
+TInt ret( KErrArgument );
+// Check Parameters
+if( (-1) > entry.iIndex || sizeof( RMobileONStore::TMobileONEntryV1 ) != aEntry->Size() )
+{
+return ret;
+}
+// Save tsy req handle type
+iReqHandleType = EMultimodeONStoreWrite;
 iWriteONStoreEntryPtr = aEntry;
 iWriteIndexToReturn = entry.iIndex;
 // It is not possible to cancel write request anymore...
 iIsWriteCancellingPossible = EFalse;
-// Return value
-TInt ret( KErrNone );
 ret = iMmONStoreExtInterface->
 WriteL(
 EMmTsyONStoreWriteIPC,
 aEntry );
 {
 TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL");
 TInt ret( KErrNone );
+TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
+EMultimodeONStoreGetInfo );
+if(reqHandle != EMultimodeONStoreReqHandleUnknown)
+{
+ReqCompleted( aTsyReqHandle, KErrServerBusy );
+return ret;
+}
 // if aInfo is not correct type, send KErrArgument to client and return
 if( RMobilePhoneStore::KETelMobileONStoreV1 != aInfo->ExtensionId() )
 {
 ReqCompleted( aTsyReqHandle, KErrArgument );
 return ret;
 }
 	// Don't send request if pb init is still ongoing
-	// instead send KErrNotReady to client
+	// instead create an ADN book store and wait for it to initilize
-	TBool done ( ETrue );
 TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects());
+CMmPhoneBookStoreTsy* pbStore = NULL;
-	for( TInt i = 0; i < iMmPhone->PBList()->GetNumberOfObjects(); i++ )
+	for( TInt i = 0; (i < iMmPhone->PBList()->GetNumberOfObjects()) && (NULL == pbStore) ; i++ )
 	    {
-	    CMmPhoneBookStoreTsy* pbStore = iMmPhone->PBList()->
+	    pbStore = iMmPhone->PBList()->GetMmPBByIndex( i );
-	        GetMmPBByIndex( i );
 TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL index = %d", i);
+if( (pbStore->GetPhonebookType() != KADNPhoneBook) && (pbStore->GetPhonebookType() != KFDNPhoneBook ) )
-		if ( !pbStore->IsPBInitDone()
+{
-			  && ( pbStore->GetPhonebookType() == KADNPhoneBook
+pbStore = NULL;
-		      || pbStore->GetPhonebookType() == KFDNPhoneBook )  )
+}
-		    {
+else
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - ADN or FDN init not done");
+{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - in !pbStore->IsPBInitDone()");
-			// init still ongoing
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store");
-			done = EFalse;
 			}
 		}
+	if(NULL == pbStore)
-// Check if some PB is not initialized, if so send KErrNotReady to client
+	    {
-	if ( !done )
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN");
-		{
+pbStore = CMmPhoneBookStoreTsy::NewL( iMmPhone, KETelIccAdnPhoneBook );
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - PBInit not done, return KErrNotReady");
+TInt addPBSucceeded = iMmPhone->PBList()->AddObject( pbStore );
-		ReqCompleted( aTsyReqHandle, KErrNotReady );
+if(addPBSucceeded != KErrNone)
-		}
+{
+delete pbStore;
-	else
+ReqCompleted( aTsyReqHandle, addPBSucceeded );
-		{
+return KErrNone;
+}
+	    }
+	// Set get info internal pointer
+iONStoreInfoChanged = aInfo;
+	if ( !pbStore->IsPBInitDone())
+	    {
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized");
+// Save tsy req handle type
+iReqHandleType = EMultimodeONStoreGetInfo;
+return KErrNone;
+	    }
 TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete");
-// Set get info internal pointer
-iONStoreInfoChanged = aInfo;
 // Request to GSM extension, get used entries,
 // -1 as a index param-> specified location param not needed
-ret = iMmONStoreExtInterface->ReadL( EMmTsyONStoreGetInfoIPC, -1 );
+ret = iMmONStoreExtInterface->ReadL(EMmTsyONStoreGetInfoIPC, -1);
-if ( KErrNone != ret )   // Message sending failed
+if (KErrNone != ret) // Message sending failed
 {
-ReqCompleted( aTsyReqHandle, ret );
+ReqCompleted(aTsyReqHandle, ret);
 }
 else
 {
-iIsGetInfoActive = ETrue;
+// Save tsy req handle type
-// Save tsy req handle type
+iReqHandleType = EMultimodeONStoreGetInfo;
-iReqHandleType = EMultimodeONStoreGetInfo;
+}
-}
-		}
 return KErrNone;
 }
 // ---------------------------------------------------------------------------
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
 TFLOGSTRING2("TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult );
-// The number of used entries
-TServiceType serviceType;
-//unpack data
-aDataPackage->UnPackData( serviceType );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodeONStoreGetInfo );
 if ( EMultimodeONStoreReqHandleUnknown != reqHandle )
 // If request was not cancelled or no error from SIM
 // give info to client
 if ( KErrNone == aResult )
 {
+// The number of used entries
+TServiceType serviceType;
+//unpack data
+aDataPackage->UnPackData( serviceType );
 iONStoreInfo.iTotalEntries = serviceType.iNumOfEntries;
 iONStoreInfo.iUsedEntries = serviceType.iUsedEntries;
 iONStoreInfo.iNumberLen = serviceType.iNumLen;
 iONStoreInfo.iTextLen = serviceType.iNameLen;
 TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen );
 }
 // NULL the pointer to info supplied to TSY from the client
 iONStoreInfoChanged = NULL;
-iIsGetInfoActive = EFalse;
 // Complete with error
 ReqCompleted( reqHandle, aResult );
 }
 }
 }
 }
 #endif
+// ---------------------------------------------------------------------------
+// CMmONStoreTsy::PhoneBookStoreInitCompleteL
+// Phone book store initilization was complete
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+void CMmONStoreTsy::PhoneBookStoreInitCompleteL(TInt aError)
+{
+TFLOGSTRING("TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL ");
+TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo );
+if( EMultimodeONStoreReqHandleUnknown != reqHandle )
+{
+if( KErrNone != aError )
+{
+ReqCompleted(reqHandle, aError);
+return;
+}
+iReqHandleType = EMultimodeONStoreReqHandleUnknown;
+TInt ret = GetInfoL(reqHandle, iONStoreInfoChanged);
+if (ret == KErrNone)
+{
+if (iReqHandleType != EMultimodeONStoreReqHandleUnknown)
+{
+#ifdef REQHANDLE_TIMER
+SetTypeOfResponse(iReqHandleType, reqHandle);
+#else // REQHANDLE_TIMER
+iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, reqHandle );
+#endif // REQHANDLE_TIMER
+}
+}
+else
+{
+ReqCompleted(reqHandle, ret);
+}
+}
+}
 //  End of File

branch	RCL_3
changeset 5	7ef16719d8cb
parent 0	3553901f7fa8
child 18	17af172ffa5f