FCL/sf/mw/phonesrv: comparison satui/satapp/src/csatuiobserver.cpp

equal deleted inserted replaced

-:e32024264ebb
+:d7fc66ccd6fb
 #include    <ProfileEngineSDKCRKeys.h>
 #include    <centralrepository.h>
 #include    <settingsinternalcrkeys.h>
 #include    <gulicon.h> //for itemsicon
 #include    <fbs.h>
+#include    <HbGlobal>
 #include    "csatuiobserver.h"
 #include    "msatuiactionimplementer.h"
 #include    "csatuiiconhandler.h"
 #include    "tflogger.h"
 // ----------------------------------------------------------------------------
 //
 void CSatUiObserver::ConstructL()
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::ConstructL called")
-//Register to Server as subsession
-//If Server is not up, this function call may take time
-iSatSession.ConnectL();
-iSat.RegisterL(iSatSession, this);
-iAdapter = iSat.Adapter();
-if (!iAdapter)
-{
-User::Leave(KErrNotFound);
-}
-// create icon handler
-//iIconHandler = CSatUiIconHandler::NewL();
-//Item icons
-//iItemIcons = new (ELeave) CAknIconArray(1);
 TFLOGSTRING("SATAPP: CSatUiObserver::ConstructL exit")
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::NewL
 // ----------------------------------------------------------------------------
 //
 CSatUiObserver::~CSatUiObserver()
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::~CSatUiObserver() called")
-iSat.Close();
-iSatSession.Close();
-//    if (iItemIcons)
-//        {
-//        iItemIcons->ResetAndDestroy();
-//        delete iItemIcons;
-//        }
-// delete icon handler
-//    delete iIconHandler;
-//    iIconHandler = NULL;
 iActionImplementer = NULL;
 iAdapter = NULL;
 TFLOGSTRING("SATAPP: CSatUiObserver::~CSatUiObserver() exit")
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::SetImplementer
 response = iActionImplementer->DisplayTextL(aText, aSimApplicationName,
 iconBitmapDisplayText, selfExplanatoryIcon,
 aSustainedText, aDuration, aWaitUserToClear);
 );
-if (err != KErrNone)
+if ( KErrNone != err )
 {
 response = ESatFailure;
 aRequestedIconDisplayed = EFalse;
 }
-if (iActionImplementer->GetEndKey())
+if ( iActionImplementer->GetEndKey() )
 {
 response = ESatSessionTerminatedByUser;
-iActionImplementer->SetEndKey(EFalse);
+iActionImplementer->SetEndKey( EFalse );
 }
-iActionImplementer->SetCommandPending(EFalse);
+iActionImplementer->SetCommandPending( EFalse );
 TFLOGSTRING2("SATAPP: CSatUiObserver::DisplayText exit, return: %d", \
 response)
 return response;
 }
 if (aInput.IsAssigned())
 {
 input.Fill(aInput, 1);
 }
-if ((aCharacterSet == ESatYesNo) && (aText.Length() == 0))
+if ( ( ESatYesNo == aCharacterSet ) && (aText.Length() == 0) )
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::GetInkey return ESatFailure")
 return ESatFailure;
 }
 TFLOGSTRING("SATAPP: CSatUiObserver::GetInkey other conditions")
 response = iActionImplementer->GetInputL(
 aText, aCharacterSet, input, 1, 1, EFalse, ETrue,
 iconBitmapGetInkey, selfExplanatory, aDuration);
-if (ESatSuccess == response)
+if ( ESatSuccess == response && input.Length() )
 {
-if (input.Length())
+aInput = input[0];
-{
-aInput = input[0];
-}
 }
 }
 );
-if (err != KErrNone)
+if ( KErrNone != err )
 {
 response = ESatFailure;
 }
 if (iActionImplementer->GetEndKey())
 aText, aCharacterSet, aInput, aMinLength, aMaxLength,
 aHideInput, EFalse, iconBitmapGetInput, selfExplanatory,
 duration);
 );
-if (err != KErrNone)
+if ( KErrNone != err )
 {
 TFLOGSTRING2("SATAPP: CSatUiObserver::GetInput err:%d", err)
 response = ESatFailure;
 aRequestedIconDisplayed = EFalse;
 }
 iconTitleBitmap = FetchIcon(aIconId.iIdentifier,
 EIconSetUpMenuContext);
 GetScalableBitmap(iconTitleBitmap, EIconSetUpMenuContext);
 }
-//    iItemIcons->ResetAndDestroy();
 TInt iconCount(0);
 if (aMenuIcons)
 {
 iconCount = aMenuIcons->Count();
 aMenuIcons->operator[](count)));
 CFbsBitmap* iconItemBitmap = NULL;
 iconItemBitmap = FetchIcon(itemIconId, EIconSetUpMenuItems);
 if (!iconItemBitmap &&
-(aIconListQualifier == ESatSelfExplanatory))
+(ESatSelfExplanatory == aIconListQualifier))
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::SetUpMenu \
 SelfExplanatory ")
 CleanupStack::PopAndDestroy(gulIcon); // gulIcon
-//                iItemIcons->ResetAndDestroy();
 continueLoop = EFalse;
 }
 else
 {
 if (!iconItemBitmap &&
-(aIconListQualifier == ESatNotSelfExplanatory))
+(ESatNotSelfExplanatory == aIconListQualifier))
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::SetUpMenu \
 not SelfExplanatory ")
 iconItemBitmap = new(ELeave)CFbsBitmap();
 }
 other conditions ")
 GetScalableBitmap(iconItemBitmap, EIconSetUpMenuItems);
 }
 gulIcon->SetBitmap(iconItemBitmap);
-//                iItemIcons->AppendL(gulIcon);
 CleanupStack::Pop(gulIcon);
 }
 }
 TFLOGSTRING2("SATAPP: CSatUiObserver::SetUpMenu count: %d", count)
 }
 EIconSetUpMenuContext);
 GetScalableBitmap(iconTitleBitmap, EIconSetUpMenuContext,
 aRequestedIconDisplayed);
 }
-//iItemIcons->ResetAndDestroy();
 TInt iconCount(0);
 if (aMenuIcons)
 {
 iconCount = aMenuIcons->Count();
 TFLOGSTRING2("SATAPP: CSatUiObserver::SelectItem iconCount:%d", iconCount)
 //if icons are available for item list
 if ((aMenuItems.MdcaCount() == iconCount) &&
-((aIconListQualifier == ESatSelfExplanatory) ||
+((ESatSelfExplanatory == aIconListQualifier) ||
-(aIconListQualifier == ESatNotSelfExplanatory)) &&
+(ESatNotSelfExplanatory == aIconListQualifier)) &&
 (iIconSupport))
 {
 TFLOGSTRING(
 "SATAPP: CSatUiObserver::SelectItem icon available for item list")
-if (aIconListQualifier == ESatSelfExplanatory)
+if (ESatSelfExplanatory == aIconListQualifier)
 {
 selfExplanatoryItems = ETrue;
 }
 TBool continueLoop(ETrue);
 if (!iconItemBitmap &&
 (aIconListQualifier == ESatSelfExplanatory))
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::SelectItem \
 SelfExplanatory ")
-CleanupStack::PopAndDestroy(gulIcon); // gulIcon
-//iItemIcons->ResetAndDestroy();
 continueLoop = EFalse;
 aRequestedIconDisplayed = EFalse;
 }
 else
 {
 // when icon can't be received and is set to not self
 // explanatory, we replace it with empty icon
 if (!iconItemBitmap &&
-(aIconListQualifier == ESatNotSelfExplanatory))
+(ESatNotSelfExplanatory == aIconListQualifier))
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::SelectItem \
 not SelfExplanatory ")
 iconItemBitmap = new(ELeave)CFbsBitmap();
 aRequestedIconDisplayed = EFalse;
 aRequestIconDisplayed false ")
 GetScalableBitmap(iconItemBitmap, EIconSetUpMenuItems);
 }
 gulIcon->SetBitmap(iconItemBitmap);
-//iItemIcons->AppendL(gulIcon);
 CleanupStack::Pop(gulIcon);
 }
 }
 TFLOGSTRING2("SATAPP: CSatUiObserver::SelectItem count: %d", count)
 }
 response = iActionImplementer->SelectItemL(aText, aMenuItems,
 aMenuItemNextActions, aDefaultItem, aSelection, iconTitleBitmap,
 /*iItemIcons,*/ selfExplanatoryItems, aHelpIsAvailable);
 );
-if (err != KErrNone)
+if (KErrNone != err)
 {
 response = ESatFailure;
 aRequestedIconDisplayed = EFalse;
 }
 // Check quering command
 switch (aCommandId)
 {
 case ESatOpenChannelQuery:
 {
-TFLOGSTRING(" Quering OpenChannel")
+TFLOGSTRING("Quering OpenChannel")
-//TRAP(error, iActionImplementer->ConfirmOpenChannelL(
+TRAP(error, iActionImplementer->ConfirmOpenChannelL(
-//    aText, aActionAccepted, iconBitmap, selfExplanatory));
+aText, aActionAccepted, iconBitmap, selfExplanatory));
 break;
 }
 case ESatSRefreshQuery:
 {
-TFLOGSTRING(" Quering Refresh")
+TFLOGSTRING("Quering Refresh")
 //TRAP(error, iActionImplementer->ConfirmRefreshL(aActionAccepted));
 break;
 }
 case ESatSLaunchBrowserQuery:
 {
-TFLOGSTRING(" Quering LaunchBrowser")
+TFLOGSTRING("Quering LaunchBrowser")
 HBufC* textHolder = NULL;
 TRAP(error,
 if (ESatAlphaIdNull != aAlphaIdStatus)
 {
-TFLOGSTRING(" CSatUiObserver::ConfirmCommand AlphaId \
+TFLOGSTRING("CSatUiObserver::ConfirmCommand AlphaId \
 isn't null")
 if (ESatAlphaIdNotProvided == aAlphaIdStatus)
 {
-TFLOGSTRING(" CSatUiObserver::ConfirmCommand \
+TFLOGSTRING("CSatUiObserver::ConfirmCommand \
 AlphaId not provided")
 // ToDo: replace the resouce with qt.
 //textHolder = StringLoader::LoadLC(
 //    R_QTN_SAT_CONF_LAUNCH_BROW,
 //    iActionImplementer->CoeEnv());
 }
 else
 {
-TFLOGSTRING(" CSatUiObserver::ConfirmCommand \
+TFLOGSTRING("CSatUiObserver::ConfirmCommand \
 AlphaId provided")
 textHolder = HBufC::NewLC(aText.Length());
 TPtr ptr = textHolder->Des();
 ptr.Append(aText);
 }
 break;
 }
 case ESatSSendSmQuery:
 {
-TFLOGSTRING( " Quering SendSm" )
+TFLOGSTRING( "Quering SendSm" )
 TRAP( error, iActionImplementer->ConfirmSendL( aText,
 aActionAccepted, ESatUiConfirmSendSms ) );
 break;
 }
 case ESatSSendSsQuery:
 {
 TFLOGSTRING(" Quering SendSs")
-//TRAP(error, iActionImplementer->ConfirmSendL(aText,
+TRAP(error, iActionImplementer->ConfirmSendL(aText,
-//      aActionAccepted, ESatUiConfirmSendSs));
+aActionAccepted, ESatUiConfirmSendSs));
 break;
 }
 case ESatSSendUssdQuery:
 {
 TFLOGSTRING(" Quering SendUssd")
-//TRAP(error, iActionImplementer->ConfirmSendL(aText,
+TRAP(error, iActionImplementer->ConfirmSendL(aText,
-//      aActionAccepted, ESatUiConfirmSendUssd));
+aActionAccepted, ESatUiConfirmSendUssd));
 break;
 }
 case ESatSSetUpCallQuery:
 {
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::ConfirmCommand press endkey")
 aTerminatedByUser = ETrue;
 aActionAccepted = EFalse;
 iActionImplementer->SetEndKey(EFalse);
-}
-else
-{
-// Meaningless else
 }
 iActionImplementer->SetCommandPending(EFalse);
 TFLOGSTRING("SATAPP: CSatUiObserver::ConfirmCommand exiting")
 }
 const TSatIconId& aIconId,
 TBool& aRequestedIconDisplayed,
 const TSatControlResult aControlResult)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification calling")
+TFLOGSTRING2("SATAPP: CSatUiObserver::Notification str=%S", &aText)
 TSatUiResponse response = ESatSuccess;
 TInt error(KErrNone);
 aRequestedIconDisplayed = EFalse;
 iActionImplementer->SetCommandPending(ETrue);
 HBufC* textHolder = NULL;
+QString resource;
 // In case where command id is SendDtmf and alphaID is not provided,
 // DTMF string to be sent is shown in dialog along with default text.
 if ((ESatSSendDtmfNotify == aCommandId) &&
-(ESatAlphaIdNotProvided == aAlphaIdStatus))
+(ESatAlphaIdNotProvided == aAlphaIdStatus)) {
-{
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification SendDtmf")
-TRAP(error,
+DefaultAlphaId(aCommandId, aControlResult,resource);
-TInt resource = DefaultAlphaIdL(aCommandId, aControlResult);
+if ( resource.length()>0)
+{
-// Todo:
+TFLOGSTRING("SATAPP: CSatUiObserver::Notification SendDtmf resource")
-// Now that resource is defined, get default text
+TRAP(error, textHolder = HBufC::NewL(resource.length()));
-//textHolder = StringLoader::LoadL(
+if (KErrNone == error)
-//    resource, aText)
+{
-);
+textHolder->Des().Copy(reinterpret_cast<const TUint16*>
+(resource.utf16()));
+}
+}
 }
 // Get default text, if alpha not provided or it is NULL
 else if (aText.Length() == 0 && ESatAlphaIdNotNull != aAlphaIdStatus)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification alpha is null")
-TRAP(error,
+DefaultAlphaId(aCommandId, aControlResult,resource);
-TInt resource = DefaultAlphaIdL(aCommandId, aControlResult);
+if ( resource.length()>0)
-// Todo:
+{
-// Now that resource is defined, get default text
+TFLOGSTRING("SATAPP: CSatUiObserver::Notification alpha null resource")
-//textHolder = StringLoader::LoadL(
+TRAP( error, textHolder = HBufC::NewL(resource.length()) );
-//    resource, iActionImplementer->CoeEnv())
+if (KErrNone == error)
-);
+{
+textHolder->Des().Copy(reinterpret_cast<const TUint16*>
+(resource.utf16()));
+}
+}
+TFLOGSTRING("SATAPP: CSatUiObserver::Notification alpha is null out")
 }
 // else use given text
 else
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification alpha is provided")
 textHolder = HBufC::NewL(aText.Length());
 TPtr ptr = textHolder->Des();
 ptr.Copy(aText);
 );
 }
 if (!textHolder)
 {
+TFLOGSTRING("SATAPP: CSatUiObserver::Notification textHolder 0")
 TRAP(error, textHolder = HBufC::NewL(0));
 }
 // No need to add textHolder into CleanupStack, since this is
 // not a leaving function
-if ((KErrNone == error || KErrArgument == error) && textHolder)
+if ((KErrNone == error) && textHolder)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification none error ")
 CFbsBitmap* iconBitmap = NULL;
 TBool selfExplanatoryIcon(EFalse);
 // Fetch icon
 (ESatSReceiveDataNotify != aCommandId))) &&
 (iIconSupport))
 {
 iconBitmap = FetchIcon(aIconId.iIdentifier,
 EIconNotification);
-//GetScalableBitmap(iconBitmap, EIconNotification,
-//    aRequestedIconDisplayed);
 }
 if (ESatSelfExplanatory == aIconId.iIconQualifier)
 {
 selfExplanatoryIcon = ETrue;
 case ESatSCallControlNotify:
 {
 TFLOGSTRING(" Notifying CallControl")
 iActionImplementer->DispatchTimer(iWait);
 TRAP(error,
 iActionImplementer->CallControlL(
 *textHolder, aAlphaIdStatus)
 );
 iActionImplementer->SetCommandPending(EFalse);
 break;
 }
 case ESatSSendUssdNotify:   // fall through
 case ESatSSendSsNotify:
 // Show Sms wait note
 TRAP(error,
 iActionImplementer->ShowSmsWaitNoteL(*textHolder,
 iconBitmap, selfExplanatoryIcon));
 }
 break;
 }
 default:
 {
 TFLOGSTRING(" Unkown notification")
 else
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::Notification success")
 response = ESatSuccess;
 }
 TFLOGSTRING2("SATAPP: CSatUiObserver::Notification exiting, return: %d", \
 response)
 return response;
 }
 TFLOGSTRING("SATAPP: CSatUiObserver::EventNotification exiting")
 }
 // ----------------------------------------------------------------------------
-// CSatUiObserver::DefaultAlphaIdL
+// CSatUiObserver::DefaultAlphaId
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-TInt CSatUiObserver::DefaultAlphaIdL(
+void CSatUiObserver::DefaultAlphaId(
 const TSatSNotifyCommand aCommandId,
-const TSatControlResult aControlResult) const
+const TSatControlResult aControlResult, QString &resource) const
 {
-TFLOGSTRING("SATAPP: CSatUiObserver::DefaultAlphaIdL calling")
+TFLOGSTRING("SATAPP: CSatUiObserver::DefaultAlphaId calling")
-TInt resource(0);
 switch (aCommandId)
 {
 case ESatSSendDataNotify: // SendData
 {
-TFLOGSTRING(" SendData default")
+TFLOGSTRING("SendData default")
-//resource = R_QTN_SAT_CONF_SEND_DATA_BIP;
+resource = hbTrId("txt_sat_conf_send_data_bip");
 break;
 }
 case ESatSReceiveDataNotify: // ReceiveData
 {
-TFLOGSTRING(" ReceiveData default")
+TFLOGSTRING("ReceiveData default")
-//resource = R_QTN_SAT_CONF_RECEIVE_DATA_BIP;
+resource = hbTrId("txt_sat_conf_receive_data_bip");
 break;
 }
 case ESatSCloseChannelNotify: // CloseChannel
 {
-TFLOGSTRING(" CloseChannel default")
+TFLOGSTRING("CloseChannel default")
-//resource = R_QTN_SAT_CONF_CLOSE_CHANNEL_BIP;
+resource = hbTrId("txt_sat_conf_close_channel_bip");
 break;
 }
 case ESatSMoSmControlNotify: // MoSmControl
 {
 if (ESatNotAllowed == aControlResult)
 {
 TFLOGSTRING(" MoSmcontrol Not allowed default")
-//resource = R_QTN_SAT_MOSM_NOT_ALLOWED;
+resource = hbTrId("txt_sat_mosm_not_allowed");
 }
 else if (ESatAllowedWithModifications == aControlResult)
 {
 TFLOGSTRING(" MoSmcontrol Modified default")
-//resource = R_QTN_SAT_MOSM_MODIFIED;
+resource = hbTrId("txt_sat_request_modified");
 }
 else
 {
 TFLOGSTRING(" MoSmcontrol No default")
-resource = 0; // Allowed, default alpha -> no info
+resource = hbTrId(""); // Allowed, default alpha -> no info
 }
 break;
 }
 case ESatSCallControlNotify: // CallControl
 {
 if (ESatNotAllowed == aControlResult)
 {
-TFLOGSTRING(" CallControl Not allowed default")
+TFLOGSTRING("CallControl Not allowed default")
-//resource = R_QTN_SAT_CC_NOT_ALLOWED;
+resource = hbTrId("txt_sat_cc_not_allowed");
 }
 else if (ESatAllowedWithModifications == aControlResult)
 {
-TFLOGSTRING(" CallControl Modified default")
+TFLOGSTRING("CallControl Modified default")
-//resource = R_QTN_SAT_CC_MODIFIED;
+resource = hbTrId("txt_sat_cc_modified");
 }
 else
 {
-TFLOGSTRING(" CallControl No default")
+TFLOGSTRING("CallControl No default")
-resource = 0; // Allowed, default alpha -> no info
+resource = hbTrId(""); // Allowed, default alpha -> no info
 }
 break;
 }
 case ESatSSendSmsNotify: // SendSm
 {
 TFLOGSTRING(" SendSms default")
-//resource = R_QTN_SAT_SENDING_SMS;
+resource = hbTrId("txt_sat_sending_sms");
 break;
 }
 case ESatSSendDtmfNotify: // SendDtmf
 {
 TFLOGSTRING(" SendDTMF default")
-//resource = R_QTN_SAT_NOTE_SENDING_DTMF_TEMPLATE;
+resource = hbTrId("txt_sat_note_sending_dtmf_template");
 break;
 }
 default:
 {
 TFLOGSTRING2(" Unknown command id: %i", aCommandId)
-User::Leave(KErrArgument);
+break;
 }
 }
-TFLOGSTRING2("SATAPP: CSatUiObserver::DefaultAlphaIdL exiting, resource: \
+TFLOGSTRING("SATAPP: CSatUiObserver::DefaultAlphaId exiting")
-%d", resource)
-return resource;
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::FetchIcon
 // Fetch the icon information.
 const enum TIconCommand /*aIconCommand*/)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::FetchIcon called")
 CFbsBitmap* iconBitmap = NULL;
-/*
-TSize layoutSize(0, 0);
-// Set icon max size according the command
-if (GetPopUpWindowIconSize(layoutSize, aIconCommand))
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::FetchIcon max size")
-// Comment out icon related code, add qt icon support future
-TRAPD(err, iconBitmap = iIconHandler->FetchIconL(iSatSession,
-aIconId, layoutSize.iWidth, layoutSize.iHeight, iIconSupport));
-if (err != KErrNone)
-{
-#if defined _DEBUG
-_LIT(KFetchIcon, "SATAPP: CSatUiObserver::FetchIcon");
-User::Panic(KFetchIcon, err);
-#endif
-}
-}
-else
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::FetchIcon not supported")
-}
-*/
 TFLOGSTRING("SATAPP: CSatUiObserver::FetchIcon exit")
 return iconBitmap;
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::GetPopUpWindowIconSize
 // Get size for the icon in popup window.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-TBool CSatUiObserver::GetPopUpWindowIconSize(TSize& aSize,
+TBool CSatUiObserver::GetPopUpWindowIconSize(TSize& /*aSize*/,
 const TIconCommand /*aIconCommand*/)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::GetPopUpWindowIconSize called")
+return ETrue;
-TRect rect(TSize(0, 0));
-TBool supported(ETrue);
-// Comment out this code for no icon support in current qt satapp
-/*    TAknLayoutRect opLogoLayout;
-TFLOGSTRING2("SATAPP: CSatUiObserver::GetPopUpWindowIconSize, \
-aIconCommand: %i", aIconCommand)
-// depending on the command, get correct layout and
-// Calculate rectangle based on LAF specification.
-switch (aIconCommand)
-{
-case EIconSetUpMenuContext:
-{
-opLogoLayout.LayoutRect(rect,
-AknLayoutScalable_Avkon::context_pane_g1().LayoutLine());
-break;
-}
-case EIconSetUpMenuItems:
-{
-opLogoLayout.LayoutRect(rect,
-AknLayout::List_pane_elements__single_graphic__Line_1());
-break;
-}
-case EIconDisplayText:
-{
-// layout borrowed from video
-opLogoLayout.LayoutRect(rect, AknLayoutScalable_Avkon::
-popup_query_sat_info_window(0).LayoutLine());
-break;
-}
-case EIconPlayTone:
-{
-opLogoLayout.LayoutRect(rect, AknLayoutScalable_Avkon::
-popup_note_window_g1(0).LayoutLine());
-break;
-}
-case EIconConfirmCommand:   // fall through
-case EIconGetInput:         // fall through
-case EIconGetYesNo:         // fall through
-case EIconGetInkey:
-{
-opLogoLayout.LayoutRect(rect, AknLayout::Icon(0));
-break;
-}
-case EIconNotification:
-{
-opLogoLayout.LayoutRect(rect, AknLayout::
-Wait_or_progress_note_pop_up_window_elements_Line_1());
-break;
-}
-default:
-{
-TFLOGSTRING(
-"SATAPP: CSatUiObserver::GetPopUpWindowIconSize not supported")
-supported = EFalse;
-break;
-}
-}
-aSize = opLogoLayout.Rect().Size();
-// Layout for title icon gives incorrect width
-// but since it is square height can be set to width
-if (EIconSetUpMenuContext == aIconCommand)
-{
-aSize.iWidth = aSize.iHeight;
-}
-*/
-TFLOGSTRING3("SATAPP: CSatUiObserver::GetPopUpWindowIconSize %dx%d exit",
-aSize.iWidth, aSize.iHeight)
-return supported;
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::GetScalableBitmap
 // Creates scalable bitmap
 void CSatUiObserver::GetScalableBitmapL(
 CFbsBitmap*& /*aBitMapToConvert*/,
 const TIconCommand  /*aIconCommand*/)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap called")
-/*
-TSize layoutSize(0, 0);
-CFbsBitmap* bitmap = NULL;
-// If scalable icon is supported in current layout then
-// makes the scalable icon.
-if (GetPopUpWindowIconSize(layoutSize, aIconCommand))
-{
-bitmap = new (ELeave) CFbsBitmap;
-CleanupStack::PushL(bitmap);
-// CAknIcon takes ownership of bitmaps.
-CFbsBitmap* dupMain = new (ELeave) CFbsBitmap;
-CleanupStack::PushL(dupMain);
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap duplicate original")
-User::LeaveIfError(
-dupMain->Duplicate(aBitMapToConvert->Handle()));
-//CAknIcon* bitmapIcon = CAknIcon::NewL();
-// Mask is not set because skins are not used.
-// Ownership is transferred.
-bitmapIcon->SetBitmap(dupMain);
-CleanupStack::Pop(dupMain);
-CleanupStack::PushL(bitmapIcon);
-CAknIcon* scalableIcon = AknIconUtils::CreateIconL(bitmapIcon);
-CleanupStack::Pop(bitmapIcon);
-CleanupStack::PushL(scalableIcon);
-// fetch the size of icon
-TSize iconSize = dupMain->SizeInPixels();
-// At first we assume that width is scaled to layout maximum and
-// thus height is set so that the ratio of the image remains correct
-TInt newHeight =
-(layoutSize.iWidth * iconSize.iHeight) / iconSize.iWidth;
-// If the new height is larger than the height of the layout
-// we scale height to maximum and set the width so that the ratio of
-// the image remains correct
-if (newHeight > layoutSize.iHeight)
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap \
-larger than layout height")
-layoutSize.iWidth =
-(layoutSize.iHeight * iconSize.iWidth) / iconSize.iHeight;
-}
-// If the new height is smaller or the same as the height of the
-// layout, the image is scaled according to it
-else
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap \
-smaller than layout height")
-layoutSize.iHeight = newHeight;
-}
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap resize scaled icon")
-AknIconUtils::SetSize(scalableIcon->Bitmap(), layoutSize);
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap duplicate scaled")
-User::LeaveIfError(bitmap->Duplicate(
-scalableIcon->Bitmap()->Handle()));
-CleanupStack::PopAndDestroy(scalableIcon);
-// Uses scaled icon if scalable bitmap is supported.
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap Show Scaled")
-delete aBitMapToConvert;
-aBitMapToConvert = bitmap;
-CleanupStack::Pop(bitmap);
-}
-*/
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap exit")
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::GetScalableBitmap
 CFbsBitmap*& /*aBitMapToConvert*/,
 const TIconCommand  /*aIconCommand*/,
 TBool& /*aRequestedIconDisplayed*/)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap called")
-/*
-if (aBitMapToConvert)
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap bitmap \
-to convert")
-// Scale icon
-TRAPD(err, GetScalableBitmapL(aBitMapToConvert, aIconCommand););
-if (KErrNoMemory == err)
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap memory \
-low")
-// Memory low, command is done without icon
-delete aBitMapToConvert;
-aBitMapToConvert = NULL;
-aRequestedIconDisplayed = EFalse;
-}
-else
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap have \
-memory")
-aRequestedIconDisplayed = ETrue;
-}
-}
-else
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap  no bitmap")
-// Icon not received
-aRequestedIconDisplayed = EFalse;
-}
-*/
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap exit")
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::GetScalableBitmap
 void CSatUiObserver::GetScalableBitmap(
 CFbsBitmap*& /*aBitMapToConvert*/,
 const TIconCommand /*aIconCommand*/)
 {
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap called")
-/*
-if (aBitMapToConvert)
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap bitmap \
-to convert")
-// Scale icon
-TRAPD(err, GetScalableBitmapL(aBitMapToConvert, aIconCommand););
-if (KErrNoMemory == err)
-{
-TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap memory \
-low")
-// Memory low, command is done without icon
-delete aBitMapToConvert;
-aBitMapToConvert = NULL;
-}
-}
-*/
 TFLOGSTRING("SATAPP: CSatUiObserver::GetScalableBitmap exit")
 }
 // ----------------------------------------------------------------------------
 // CSatUiObserver::ProfileState
 profileId)
 return profileId;
 }
+// ----------------------------------------------------------------------------
+// CSatUiObserver::ConnectRSatSessionL
+//
+// (other items were commented in a header).
+// ----------------------------------------------------------------------------
+//
+void CSatUiObserver::ConnectRSatSessionL()
+{
+TFLOGSTRING("SATAPP: CSatUiObserver::ConnectRSatSessionL called")
+//Register to Server as subsession
+//If Server is not up, this function call may take time
+iSatSession.ConnectL();
+iSat.RegisterL(iSatSession, this);
+iAdapter = iSat.Adapter();
+if (!iAdapter)
+{
+User::Leave(KErrNotFound);
+}
+TFLOGSTRING("SATAPP: CSatUiObserver::ConnectRSatSessionL exit")
+}
+// ----------------------------------------------------------------------------
+// CSatUiObserver::DisconnectRSatSession
+// Get the profile status
+// (other items were commented in a header).
+// ----------------------------------------------------------------------------
+//
+void CSatUiObserver::DisconnectRSatSession()
+{
+TFLOGSTRING("SATAPP: CSatUiObserver::DisconnectRSatSession called")
+iSat.Close();
+iSatSession.Close();
+TFLOGSTRING("SATAPP: CSatUiObserver::DisconnectRSatSession exit")
+}
 //  End of File

changeset 15	d7fc66ccd6fb
parent 12	ae8abd0db65c
child 27	7eb70891911c