Change-Id: Ic802f320dbf41b59ee9811a6c308fc50aacaa508
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>
result
DialAppForm::OnTerminating(void)
{
result
DialAppForm::OnTerminating(void)
{
+ SetFormBackEventListener(null);
{
String contactNo = pEditField->GetText();
contactNo.Replace(L"-",L"");
{
String contactNo = pEditField->GetText();
contactNo.Replace(L"-",L"");
- String phoneNumberPattern(L"#$");
+ // Regular expression to check the beginning is with Pause/Wait
+ String phoneNumberPattern(L"^(,|;)");
RegularExpression checkPhoneNumber;
checkPhoneNumber.Construct(phoneNumberPattern);
RegularExpression checkPhoneNumber;
checkPhoneNumber.Construct(phoneNumberPattern);
- //If phone number ends with # then show an error popup
- /* bool resultMatch = checkPhoneNumber.Match(contactNo,false);
+ //If phone number starts with , or ; then show an error popup
+ bool resultMatch = checkPhoneNumber.Match(contactNo,false);
if(resultMatch == true)
{
if(resultMatch == true)
{
- MessageBox numberEndsWithHash;
+ MessageBox numberStartsWithPW;
String msg(L"Phone number ");
msg.Append(contactNo);
String msg(L"Phone number ");
msg.Append(contactNo);
- msg.Append(L" ends with # ");
- numberEndsWithHash.Construct(L"GPRS is not supported", msg, MSGBOX_STYLE_NONE,3000);
+ msg.Append(L" is Invalid");
+ numberStartsWithPW.Construct(L"Invalid Number", msg, MSGBOX_STYLE_NONE,3000);
- numberEndsWithHash.ShowAndWait(modalResult);
+ numberStartsWithPW.ShowAndWait(modalResult);
if (DialOutgoingCall(contactNo) == true)
{
__pDialPresentationModel->ClearSearchResults();
if (DialOutgoingCall(contactNo) == true)
{
__pDialPresentationModel->ClearSearchResults();