--- a/cbs/cbsui/UiInc/CCbsUiAddFromIndexDialog.h Tue Apr 27 17:13:17 2010 +0300
+++ b/cbs/cbsui/UiInc/CCbsUiAddFromIndexDialog.h Tue May 11 16:43:51 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
@@ -23,7 +23,7 @@
#define __CCBSADDFROMINDEXDIALOG_H
// INCLUDES
-#include <eikdialg.h>
+#include <akndialog.h>
#include <CbsCommon.h>
#include "CbsUiConstants.h"
@@ -41,7 +41,7 @@
* Class CCbsUiAddFromIndexDialog is used to add topics. Topics
* are shown in listbox. User can select topics which will be added.
*/
-class CCbsUiAddFromIndexDialog: public CEikDialog
+class CCbsUiAddFromIndexDialog: public CAknDialog
{
public: // Constructors and destructor
--- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Tue Apr 27 17:13:17 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Tue May 11 16:43:51 2010 +0300
@@ -127,11 +127,10 @@
//
void CPhSrvEmergencyRequestManager::EmergencyDialCancel()
{
- // Clear pending request status
- iIsRequestPending = EFalse;
-
if ( !iPendingRequestPointer.IsNull() )
{
+ // Clear pending request status
+ iIsRequestPending = EFalse;
iPendingRequestPointer.Complete( KErrCancel );
}
}
--- a/satengine/SatServer/Commands/SendUSSDCmd/group/SendUssdCmd.mmp Tue Apr 27 17:13:17 2010 +0300
+++ b/satengine/SatServer/Commands/SendUSSDCmd/group/SendUssdCmd.mmp Tue May 11 16:43:51 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -47,6 +47,7 @@
LIBRARY etelsat.lib
LIBRARY SatEngine.lib
LIBRARY phoneclient.lib // Ussd sender
+LIBRARY aknnotify.lib
#ifdef ENABLE_SAT_LOGGING
LIBRARY flogger.lib
--- a/satengine/SatServer/Commands/SendUSSDCmd/inc/CSendUssdHandler.h Tue Apr 27 17:13:17 2010 +0300
+++ b/satengine/SatServer/Commands/SendUSSDCmd/inc/CSendUssdHandler.h Tue May 11 16:43:51 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -140,6 +140,13 @@
TUint8& aReceivedDcs );
/**
+ * Show the ussd response note.
+ *
+ * @param aText The USSD response string to be shown.
+ */
+ void ShowUssdResponseNoteL( const TDesC& aText );
+
+ /**
* Handles the result of Ussd sending
*
* @param aError Result of Ussd sending
--- a/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Tue Apr 27 17:13:17 2010 +0300
+++ b/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Tue May 11 16:43:51 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -17,8 +17,10 @@
#include <CPhCltUssdSatClient.h>
-#include <CPhCltUssd.h>
+#include <CPhCltUssd.h>
+#include <AknGlobalNote.h>
#include <exterror.h>
+#include <avkon.rsg>
#include "MSatSystemState.h"
#include "MSatApi.h"
@@ -257,6 +259,9 @@
// Allow next terminal response to be sent
iTerminalRespSent = EFalse;
+
+ iSendUssdRsp.iUssdString.iUssdString.FillZ();
+ iSendUssdRsp.iUssdString.iDcs = 0;
RMobilePhone::TMobilePhoneRegistrationStatus registrationStatus(
iUtils->SystemState().GetNetworkRegistrationStatus() );
@@ -592,6 +597,14 @@
iSendUssdRsp.iUssdString.iUssdString.Copy( receiveMessage );
+ if ( RSat::EAlphaIdProvided != iSendUssdData.iAlphaId.iStatus )
+ {
+ // if no Alpha ID provided, show the text note.
+ LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString Show Note" )
+ TRAP_IGNORE(
+ ShowUssdResponseNoteL( iSendUssdRsp.iUssdString.iUssdString ) );
+ }
+
HandleSendUssdResult( error );
LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString exiting" )
@@ -668,6 +681,23 @@
}
// -----------------------------------------------------------------------------
+// Show the ussd response note.
+// -----------------------------------------------------------------------------
+//
+void CSendUssdHandler::ShowUssdResponseNoteL( const TDesC& aText )
+ {
+ LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL calling" )
+
+ CAknGlobalNote* note = CAknGlobalNote::NewLC();
+ note->SetSoftkeys( R_AVKON_SOFTKEYS_OK_EMPTY );
+ note->ShowNoteL( EAknGlobalConfirmationNote,
+ iSendUssdRsp.iUssdString.iUssdString );
+ CleanupStack::PopAndDestroy( note );
+
+ LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL exiting" )
+ }
+
+// -----------------------------------------------------------------------------
// Handles the result of Ussd sending.
// -----------------------------------------------------------------------------
//
@@ -887,6 +917,11 @@
LOG( SIMPLE,
"SENDUSSD: CSendUssdHandler::SendTerminalResponse iTerminalRespSent \
false" )
+
+ LOG3(SIMPLE, "SENDUSSD: CSendUssdHandler::SendTerminalResponse \
+ iDcs=%d,iUssdString=%s", iSendUssdRsp.iUssdString.iDcs,
+ &iSendUssdRsp.iUssdString.iUssdString);
+
iTerminalRespSent = ETrue;
iSendUssdRsp.SetPCmdNumber( iSendUssdData.PCmdNumber() );
TerminalRsp( RSat::ESendUssd, iSendUssdRspPckg );