FCL/sf/os/cellularsrv: comparison telephonyserverplugins/simtsy/src/CSimPhone.cpp

equal deleted inserted replaced

-:1f776524b15c
+:244d7c5f118e
 		pTable = NULL;
 		LOGPHONE2("Failed to populate %s table in simtsy", &aLookup);
 		}
 	}
+void CSimPhone::SetTestNumberAndReadConfigurationFileL()
+{
+TInt testNumber;
+User::LeaveIfError(GetTestNumber(testNumber));
+iSectionName.Format(KSectionNameFormat,testNumber);
+delete iConfigFile;
+iConfigFile = NULL;
+TRAPD(err, iConfigFile = CTestConfig::NewLC(iFs, KConfigFileDir, KConfigFilename); CleanupStack::Pop(iConfigFile));
+if( err == KErrNone && iConfigFile->Section(iSectionName) != NULL )
+{
+iConfigSection = iConfigFile->Section(iSectionName);
+}
+else
+{
+LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber);
+delete iConfigFile;
+iConfigFile = NULL;
+User::Leave(KErrNotFound);
+}
+User::LeaveIfError(SetTestNumberInUse(testNumber));
+}
 void CSimPhone::ConstructL()
 /**
 * 2 Phase Construction (Second phase)
 * Loads the WINS Physical and Logical Serial Device Drivers.  C32 loads the non-WINS
 * serial drivers, so we don't have to worry about these.
 	TInt r=User::LoadPhysicalDevice(PDD_NAME);
 	r=User::LoadLogicalDevice(LDD_NAME);
 #endif
 	LOGPHONE1("Starting to Load and Parse the Config File");
-	(void)User::LeaveIfError(iFs.Connect());
-	iConfigFile=CTestConfig::NewLC(iFs,KConfigFileDir,KConfigFilename);
+	User::LeaveIfError(iFs.Connect());
-	TInt testNumber;
+	SetTestNumberAndReadConfigurationFileL();
-	(void)User::LeaveIfError(GetTestNumber(testNumber));
-	iSectionName.Format(KSectionNameFormat,testNumber);
-	if(iConfigFile->Section(iSectionName)==NULL)
-		{
-LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber);
-		CleanupStack::Pop();
-		User::Leave(KErrNotFound);
-		}
-	else
-		{
-		(void)User::LeaveIfError(SetTestNumberInUse(testNumber));
-		}
-	CleanupStack::Pop();	// iConfigFile pointer is safely stored as a member variable
 	CSimTsyMode::InitL(this);
 	iReduceTimers = CSimReduceTimers::NewL();
 	InitPhoneStatus();
 			}
 		}
 	TPtrC8 IMSI;
 	iSubscriberId.iError = KErrNone;
-	const CTestConfigItem* item=CfgFile()->Item(KSubscriberId);
+	const CTestConfigItem* itemSubscriberId=CfgFile()->Item(KSubscriberId);
-if (item)
+if( itemSubscriberId != NULL )
 {
-TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,IMSI);
+TInt ret=CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,0,IMSI);
-if(ret!=KErrNone)
+if( ret != KErrNone )
+			{
 LOGPARSERR("IMSI",ret,0,&KSubscriberId);
+			}
 // coverity[check_return]
-CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iSubscriberId.iError);
+CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,1,iSubscriberId.iError);
 iSubscriberId.iIMSI.Copy(IMSI);
 }
 	else
+		{
 		iSubscriberId.iIMSI.Copy(KSubscriberIdDefault);
+		}
 	iNtwkMode=(RMobilePhone::TMobilePhoneNetworkMode)CfgFile()->ItemValue(KNetworkMode,KNetworkModeDefault);
 	//get phone id from config file
 	GetPhoneIdAndCaps();
 	iPhoneScEapMan = CSimSmartCardEapManager::NewL(this);
 	iNetworkModeTimer = CSimTimer::NewL(this);
 	//< Read in all network mode data
 	TInt count = CfgFile()->ItemCount(KNetworkMode);
-	item = NULL;
+	const CTestConfigItem* item = NULL;
 	for (TInt i = 0; i < count; ++i)
 		{
 		item = CfgFile()->Item(KNetworkMode,i);
 		if (!item)
 			break;
 		iNtwkMode = initialNetworkMode.iNetworkMode;		// set to new value if NetworkMode present in config.txt file
 		iTimerCallBackNetworkMode.SetHandle(this);
 		iNetworkModeTimer->Start(initialNetworkMode.iDuration, &iTimerCallBackNetworkMode);
 		}
 	// end of network mode simulation setup
+	iTestNumberObserver = CSimTestNumberObserver::NewL(*this);
 	LOGPHONE1("Completed Loading and Parsing the Config File");
 	}
 CSimReduceTimers* CSimPhone::GetReduceTimersSubject()
 	{
 		LOGPHONE2("Got system property KUidPSSimTsyCategory/KPSSimTsyTestNumber. testNumber=%d", aTestNumber);
 		}
 	else
 		{
 		aTestNumber = KDefaultTestNumber;
+		LOGPHONE2("Using the default test number. testNumber=%d", aTestNumber);
 		}
 	return KErrNone;
 	}
 	if (iSIMServiceTable != NULL)
 		delete(iSIMServiceTable);
 	if (iUSIMServiceTableV8 != NULL)
 		delete(iUSIMServiceTableV8);
+	if( iPhBkStores != NULL )
-	if(iPhBkStores)
 		{
 		TInt storeCount=iPhBkStores->Count();
 		for(TInt i=0;i<storeCount;i++)
 			{
 			iPhBkStores->At(i)->Close();
 			}
 		delete iPhBkStores;
 		}
+	if( iPhBkUSimStores != NULL )
-	if(iPhBkUSimStores)
+	    {
-	{
 		TInt storeCount=iPhBkUSimStores->Count();
 		for(TInt i=0;i<storeCount;i++)
 			{
 			iPhBkUSimStores->At(i)->Close();
 			}
 	if(iONStore)
 		{
 		iONStore->Close();
 		iONStore = NULL;
 		}
+	if( iNetworkModeArray != NULL )
-	if (iNetworkModeArray != NULL)
 		{
 		iNetworkModeArray->Delete(0,iNetworkModeArray->Count());
 		delete iNetworkModeArray;
 		}
+	if( iPacketService!= NULL )
+	    {
-	if(iPacketService)
 		iPacketService->Close();
+	    }
-	if(iSat)
+	if( iSat != NULL )
+	    {
 		iSat->Close();
-	if(iConfigFile)
+	    }
-		delete iConfigFile;
+	if( iConfigFile == NULL)
-	if(iCallBarring)
+	    {
-		delete iCallBarring;
+	    // In this case if iConfigSection exists then it is not owned
-	if (iCallForwarding)
+	    // by iConfigFile - this is cos there was no config file for
-		delete iCallForwarding;
+	    // this SIM TSY.
-	if (iCallWaiting)
+	    delete iConfigSection;
-		delete iCallWaiting;
+	    }
+	delete iConfigFile;
+delete iCallBarring;
+delete iCallForwarding;
+delete iCallWaiting;
 	if (iSetCallProcessingSuspendStateTimer)
 		{
 		iSetCallProcessingSuspendStateTimer->Cancel();
 		delete iSetCallProcessingSuspendStateTimer;
 		}
 	delete iSimPhoneInitialise;
 	delete iReduceTimers;
+	delete iTestNumberObserver;
 	CSimTsyMode::FreeMode();
 	LOGPHONE1("CSimPhone Destroyed");
 	}
 void CSimPhone::InitPhoneStatus()
 	RMobilePhone::TMobilePhoneSubscriberId& subscribe=(*subscribePckg)();
 	TInt ret = KErrNone;
 	if (iSubscriberId.iError == KErrNone)
 		{
 		if(iSubscriberId.iIMSI.Length()>RMobilePhone::KIMSISize)
+		    {
 			subscribe.Copy(iSubscriberId.iIMSI.Left(RMobilePhone::KIMSISize));
+		    }
 		else
+		    {
 			subscribe.Copy(iSubscriberId.iIMSI);
+		    }
 		}
 	else
+	    {
 		ret = iSubscriberId.iError;
+	    }
 	ReqCompleted(aReqHandle,ret);
 	return KErrNone;
 	}
 const CTestConfigSection* CSimPhone::CfgFile()
 *	Return a pointer to the Configuration File Section
 *
 * @return CTestConfigSection	pointer to the configuration file section
 */
 	{
-	return iConfigFile->Section(iSectionName);
+	return iConfigSection;
 	}
 const CTestConfigSection* CSimPhone::DefaultCfgFile()
 /**
 *	Return a pointer to the Default Configuration File Section
 *
 * @return CTestConfigSection	pointer to the default configuration file section
 */
 	{
+	if( iConfigFile == NULL )
+	    {
+	    return NULL;
+	    }
 	return iConfigFile->Section(KScriptDefaults);
 	}
 TInt CSimPhone::ValidateChangeState(CSimLine* aOriginatingLine, RMobileCall::TMobileCallStatus aState)
 /**
 	ReqCompleted(aReqHandle,KErrNone);
 	return KErrNone;
 	}
 /**
+* Callback function invoked by the observer object when test number property is changed.
+* This function is supposed to reset SIMTSY. Currently only SMS messaging part of SIMTSY
+* is re-started with the new test number.
+*/
+void CSimPhone::HandleTestNumberChangedL()
+{
+SetTestNumberAndReadConfigurationFileL();
+iSmsMessaging->ReloadConfigurationSettingsL();
+}
+TInt CSimPhone::CheckConfigFile()
+{
+TInt testNumber;
+User::LeaveIfError(GetTestNumber(testNumber));
+iSectionName.Format(KSectionNameFormat,testNumber);
+CTestConfig* configFile = NULL;
+TRAPD(err, configFile = CTestConfig::NewLC(iFs, KConfigFileDir, KConfigFilename); CleanupStack::Pop(configFile));
+if( err != KErrNone || configFile->Section(iSectionName) != NULL )
+{
+err = KErrNone;
+}
+else
+{
+err = KErrNotFound;
+}
+delete configFile;
+return err;
+}
+/**
 	Constructor for suspend call processing timer
 */
 CSimPhone::CSetCallProcessingSuspendStateTimerCallBack::CSetCallProcessingSuspendStateTimerCallBack()
 	{}
 		*(RMobilePhone::TMobilePhoneNetworkMode*)iNotifyNetworkModeChange.iNotifyData = (RMobilePhone::TMobilePhoneNetworkMode)iNtwkMode;
 		ReqCompleted(iNotifyNetworkModeChange.iNotifyHandle,KErrNone);
 		}
 	iNetworkModeTimer->Start(iNetworkModeArray->At(iNetworkModeIndex).iDuration, &iTimerCallBackNetworkMode);
-	}
-void CSimPhone::ResetTestNumber()
-	{
-	TInt testNumber;
-	GetTestNumber(testNumber);
-	iSectionName.Format(KSectionNameFormat,testNumber);
 	}
 TInt CSimPhone::CheckSimTsyVersion(RMobilePhone::TMultimodeType& aDataStruct) // overload this for other types of structures
 /**
 * Checks the version of a data structure against the (simulated) version of SIMTSY, in order
 		ret = KErrNotSupported;
 		}
 	return ret;
 	}
+////////////////////
+// CSimTestNumberObserver
+////////////////////
+CSimPhone::CSimTestNumberObserver::CSimTestNumberObserver(CSimPhone& aSimPhone)
+: CActive(CActive::EPriorityStandard),
+iSimPhone(aSimPhone)
+{
+CActiveScheduler::Add(this);
+}
+CSimPhone::CSimTestNumberObserver::~CSimTestNumberObserver()
+{
+Cancel();
+iProperty.Close();
+}
+CSimPhone::CSimTestNumberObserver* CSimPhone::CSimTestNumberObserver::NewL(CSimPhone& aSimPhone)
+{
+CSimPhone::CSimTestNumberObserver* self = new(ELeave)CSimPhone::CSimTestNumberObserver(aSimPhone);
+CleanupStack::PushL(self);
+self->ConstructL();
+CleanupStack::Pop(self);
+return self;
+}
+void CSimPhone::CSimTestNumberObserver::ConstructL()
+{
+LOGPHONE1("CSimPhone::CSimPhoneObserver::ConstructL");
+User::LeaveIfError(iProperty.Attach(KUidPSSimTsyCategory, KPSSimTsyTestNumber));
+Start();
+}
+void CSimPhone::CSimTestNumberObserver::Start()
+{
+LOGPHONE1("CSimPhone::CSimPhoneObserver::Start");
+iProperty.Subscribe(iStatus);
+SetActive();
+}
+void CSimPhone::CSimTestNumberObserver::RunL()
+{
+LOGPHONE2("CSimPhone::CSimPhoneObserver::RunL [iStatus=%d]", iStatus.Int());
+TInt err = iSimPhone.CheckConfigFile();
+if( err == KErrNone )
+{
+iSimPhone.HandleTestNumberChangedL();
+}
+Start();
+}
+void CSimPhone::CSimTestNumberObserver::DoCancel()
+{
+LOGPHONE1("CSimPhone::CSimPhoneObserver::DoCancel");
+iProperty.Cancel();
+}

changeset 20	244d7c5f118e
parent 19	1f776524b15c
child 24	6638e7f4bd8f
child 42	3adadc800673