MCL/sf/mw/web: comparison widgets/widgetapp/src/WidgetUiWindow.cpp

equal deleted inserted replaced

-:e1bea15f9a39
+:79859ed3eea9
 #include "WidgetUiWindow.h"
 #include "WidgetUiWindowView.h"
 #include "WidgetUiWindowContainer.h"
 #include "WidgetUiWindowManager.h"
 #include "WidgetUiDialogsProviderProxy.h"
-#include <widgetregistryconstants.h>
+#include "WidgetRegistryConstants.h"
-#include "browser_platform_variant.hrh"
+#include "Browser_platform_variant.hrh"
 #ifdef BRDO_WRT_HS_FF
 #include "cpspublisher.h"
 #endif
 #include <AknUtils.h>
-#include <ImageConversion.h>
+#include <imageconversion.h>
 #include <WidgetUi.rsg>
-#include <browserdialogsprovider.h>
-#include <schemehandler.h>
+#include <SchemeHandler.h>
-#include <internetconnectionmanager.h>
+#include <InternetConnectionManager.h>
 #include "WidgetInstallerInternalCRKeys.h"
-#include <browseruisdkcrkeys.h>
+#include <BrowserUiSDKCRKeys.h>
 #include <StringLoader.h>
 #include <centralrepository.h>
 #include <ApUtils.h>
 #include <AiwGenericParam.h>
 #include <ActiveApDb.h>
-#include <aknsdrawutils.h>
+#include <AknsDrawUtils.h>
 #include "SWInstWidgetUid.h"
-#ifdef RD_SCALABLE_UI_V2
-#include <centralrepository.h>
-#include <SensorPluginDomainCrKeys.h>
-#endif //RD_SCALABLE_UI_V2
 // EXTERNAL DATA STRUCTURES
 // EXTERNAL FUNCTION PROTOTYPES
 // CONSTANTS
 static const TUint32 KDummyCommand = 0;
 const TUint KWmlNoDefaultAccessPoint = KMaxTUint; // see cenrep setting default -1 as int, here as uint
 const TUint KWmlNoDefaultSnapId = KMaxTUint; // see cenrep setting default -1 as int, here as uint
 // MACROS
 // LOCAL CONSTANTS AND MACROS
 //
 CWidgetUiWindow::CWidgetUiWindow( CWidgetUiWindowManager& aWindowManager, CCpsPublisher* aCpsPublisher )
 : iWindowManager( aWindowManager ), iCpsPublisher( aCpsPublisher ), iNetworkAccessGrant(EInvalid),
 iPreferredOrientation(TBrCtlDefs::EOrientationUndefined),
 iIsCurrent(EFalse), iShowSoftkeys(EFalse), iWidgetLoaded(EFalse),
-iSchemeProcessing (EFalse), iNetworkState(ENetworkNotAllowed), iUserPermission(ETrue),
+iSchemeProcessing (EFalse),iClickCount(0), iWidgetLoadStarted(EFalse),
-iClickCount(0), iWidgetLoadStarted(EFalse), iSapiPromptCleared(ETrue),iNeedToIgnoreSapiNtfn(0),
+iNetworkState(ENetworkNotAllowed), iUserPermission(ETrue)
-iNeedToIgnoreSapiClearNtfn(0)
 {
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::ConstructL()
 // -----------------------------------------------------------------------------
 //
 void CWidgetUiWindow::ConstructL( const TUid& aUid )
 {
 iUid = aUid;
-iDialogsProvider = CBrowserDialogsProvider::NewL( NULL );
 iPenEnabled = AknLayoutUtils::PenEnabled();
 iShowSoftkeys = iPenEnabled;
 CWidgetUiWindowView* view = iWindowManager.View();
 // view->ShowActivatedObject(EFalse);
 TRect rect;
 RWidgetRegistryClientSession clientSession = iWindowManager.WidgetUIClientSession();
 iUrl = GetUlrL( clientSession, aUid );
 iWidgetUiObserver = CWidgetUiObserver::NewL( *this );
-iWidgetUiDialogsProviderProxy = CWidgetUiDialogsProviderProxy::NewL(*iDialogsProvider, NULL, *this);
+iWidgetUiDialogsProviderProxy = CWidgetUiDialogsProviderProxy::NewL(*(iWindowManager.DialogsProvider()), NULL, *this);
 #ifdef BRDO_WRT_HS_FF
 iNetworkModeWait = new(ELeave) CActiveSchedulerWait();
 #endif
 SetWindowStateMiniViewL( EMiniViewNotEnabled );
 }
 iDlId = 0;
-iNeedToNotifyNetworkState = EFalse;
 // determine initial widget online/offline network state
 DetermineNetworkState();
-iAsyncCallBack = new (ELeave) CAsyncCallBack(TCallBack(DeleteItself,this),CActive::EPriorityLow);
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::~CWidgetUiWindow()
 // Destructor
 //
 // -----------------------------------------------------------------------------
 //
 CWidgetUiWindow::~CWidgetUiWindow()
 {
-if( iDialogsProvider)
-{
-iDialogsProvider->CancelAll();
-}
 if (iEngine && iWidgetUiObserver)
 {
 iEngine->RemoveLoadEventObserver( iWidgetUiObserver );
 iEngine->RemoveStateChangeObserver( iWindowManager.View() );
 }
 delete iWidgetBundleId;
 delete iRightSoftKeyLabel;
 delete iLeftSoftKeyLabel;
 delete iWidgetUiDialogsProviderProxy;
 delete iSchemeHandler;
+delete iMiniviewBitmap;
-iActiveMiniviewBitmap = 0;
-iMiniviewBitmap1.Reset();
-iMiniviewBitmap2.Reset();
 #ifdef BRDO_WRT_HS_FF
 delete iNetworkModeWait;
 #endif
-if(iAsyncCallBack)
-{
-iAsyncCallBack->Cancel();
-}
-delete iAsyncCallBack;
-iAsyncCallBack=NULL;
-delete iDialogsProvider;
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::CbaGroup()
 // returns cba group
 // -----------------------------------------------------------------------------
 //
 TBool CWidgetUiWindow::DialogMimeFileSelectLC(HBufC*& aSelectedFileName,
 const TDesC& aMimeType)
 {
-return iDialogsProvider->DialogMimeFileSelectLC(aSelectedFileName, aMimeType);
+return iWindowManager.DialogsProvider()->DialogMimeFileSelectLC(aSelectedFileName, aMimeType);
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::SetSoftkeysVisible()
 // -----------------------------------------------------------------------------
 CleanupStack::PopAndDestroy(3);// filename,bitmap,mask
 }
 // -----------------------------------------------------------------------------
-// CWidgetUiWindow::RelayoutL( TInt aType )
+// CWidgetUiWindow::Relayout()
 // switch the display orientation based on preferred setting
 //
 // -----------------------------------------------------------------------------
 //
-void CWidgetUiWindow::RelayoutL( TInt aType )
+void CWidgetUiWindow::Relayout( )
 {
 if (iIsCurrent)
 {
-#ifdef RD_SCALABLE_UI_V2
-if(aType == KEikDynamicLayoutVariantSwitch)
-{
-CRepository* iSensor = CRepository::NewLC(KCRUidSensorSettings);
-TInt sensorOn = 0;
-//get sensor is on/off from general settings
-iSensor->Get(KSenSettingsSensorsOn, sensorOn);
-if(sensorOn == 0)
-{
-TRect rec = iWindowManager.View()->Container()->Rect();
-if( rec.Height() < rec.Width())
-iPreferredOrientation = TBrCtlDefs::EOrientationLandscape;
-else
-iPreferredOrientation = TBrCtlDefs::EOrientationPortrait;
-}
-CleanupStack::PopAndDestroy();
-}
-#endif // RD_SCALABLE_UI_V2
 SetDisplayMode(iPreferredOrientation);
 SetSoftkeysVisible(iShowSoftkeys);
 //iWindowManager.View()->Container()->SizeChanged();
 }
 }
 if (aCurrent)
 {
 UpdateCba();
 Engine()->MakeVisible( iWidgetLoaded );
 // redraw incase the orientation changed while in the background
-RelayoutL(KEikDynamicLayoutVariantSwitch);
+Relayout();
 }
 else
 {
 // close the menu
 iWindowManager.View()->StopDisplayingMenuBar();
 else
 {
 // reset the Right Softkey
 TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyRight,KNullDesC,KDummyCommand,EChangeReasonLoad));
 }
-if (iLeftSoftKeyLabel)
-{
-// restore the Left Softkey
-TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyLeft,*iLeftSoftKeyLabel,KDummyCommand,EChangeReasonLoad));
-}
-else
-{
-// reset the Left Softkey
-TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyLeft,KNullDesC,KDummyCommand,EChangeReasonLoad));
-}
 // restore state
 if ( !showSoftkeys )
 {
 CbaGroup()->MakeVisible( EFalse );
 }
 if (iWidgetLoaded && iIsCurrent && fullView )
 {
 Engine()->MakeVisible( ETrue );
 }
-PublishSnapShot();
-if(iWidgetLoaded && iNeedToNotifyNetworkState)
-DetermineNetworkState();
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::PublishSnapShot()
 // pubish offscreen bitmap to CPSpublisger
 {
 if( iWidgetLoaded && (WidgetMiniViewState() == EPublishStart ) )
 {
 #ifdef BRDO_WRT_HS_FF
-if ( iCpsPublisher)
+if ( !iMiniviewBitmap )
 {
-// Swap bitmaps
+iMiniviewBitmap = new CFbsBitmap();
-if(iActiveMiniviewBitmap == &iMiniviewBitmap1)
+}
-	iActiveMiniviewBitmap = &iMiniviewBitmap2;
-else
+if ( iMiniviewBitmap && iCpsPublisher)
-	iActiveMiniviewBitmap = &iMiniviewBitmap1;
+{
-// Take snapshot and publish
 TRAP_IGNORE(
-(iEngine->TakeSnapshotL( *iActiveMiniviewBitmap ));
+(iEngine->TakeSnapshotL( *iMiniviewBitmap ));
-iCpsPublisher->PublishBitmapL( *iActiveMiniviewBitmap, *iWidgetBundleId );
+iCpsPublisher->PublishBitmapL( *iMiniviewBitmap, *iWidgetBundleId );
 );
 }
 #endif
 }
 }
 = iWindowManager.WidgetUIClientSession();
 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowNetworkAccess );
 TInt networkAccess = *propValue;
 delete propValue;
 propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowFullAccess );
 TInt fullAccess = *propValue;
 delete propValue;
 if ( !( networkAccess || fullAccess ) )
 delete rep;
 }
 if ( prompt )
 {
+CBrowserDialogsProvider* dialogProvider
+= iWindowManager.DialogsProvider();
 TBool grant = EFalse;
 HBufC* message = StringLoader::LoadLC( R_WIDGETUI_NETWORK_ACCESS );
 HBufC* yes = StringLoader::LoadLC( R_WIDGETUI_SOFTKEY_YES );
 HBufC* no = StringLoader::LoadLC( R_WIDGETUI_SOFTKEY_NO );
-grant = iDialogsProvider->DialogConfirmL( _L(""), *message, *yes, *no );
+grant = dialogProvider->DialogConfirmL( _L(""), *message, *yes, *no );
 CleanupStack::PopAndDestroy( 3 );
 // save prompt result for session
 SetNetworkAccessGrant( grant? EAllow : EDeny );
 CheckUserPermissionChanged( grant );
 // 2.1. deal with access point settings
 TInt ask( 1 );
 TInt wmlId( KWmlNoDefaultAccessPoint );
 TInt snapId( KWmlNoDefaultSnapId );
-#ifndef BRDO_OCC_ENABLED_FF
 CRepository* rep( NULL );
 TRAPD( cenrepError, rep = CRepository::NewL( KCRUidBrowser ) );
 if ( KErrNone == cenrepError )
 {
 (void)rep->Get( KBrowserAccessPointSelectionMode, ask );
 (void)rep->Get( KBrowserDefaultAccessPoint, wmlId );
 (void)rep->Get( KBrowserNGDefaultSnapId, snapId );
 }
 delete rep;
-#endif
 if ( ask == EBrowserCenRepApSelModeDestination &&
 ( snapId != KWmlNoDefaultSnapId) )
 {
 iWindowManager.GetConnection()->SetRequestedSnap( snapId );
 iWindowManager.GetConnection()->SetConnectionType( CMManager::EDestination );
 TUint32 iap = apUtils->IapIdFromWapIdL( wmlId );
 CleanupStack::PopAndDestroy();
 iWindowManager.GetConnection()->SetRequestedAP( iap );
 );
 }
-if ( EBrowserCenRepApSelModeAlwaysAsk == ask )
-{
-//Always ask case
-TUint32 ap( 0 );
-iWindowManager.GetConnection()->SetRequestedAP( ap );
-#ifdef BRDO_OCC_ENABLED_FF
-TUint32 snapId = 0; //Defaults connects to Internet snap
-iWindowManager.GetConnection()->SetConnectionType(CMManager::EDestination);
-iWindowManager.GetConnection()->SetRequestedSnap(snapId);
-#endif
-}
 }
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::StartNetworkConnection()
 {
 *aNewConn = EFalse;
 if ( !iWindowManager.GetConnection()->Connected() )
 {
 // 2.2. make a connection
-iConnecting=ETrue;
+TInt connFailure = iWindowManager.GetConnection()->StartConnectionL( ETrue );
-TInt connFailure = 0;
-TRAPD(err, connFailure=iWindowManager.GetConnection()->StartConnectionL( ETrue ));
-iConnecting=EFalse;
-User::LeaveIfError(err);
-if(iDeleteItself)
-iAsyncCallBack->CallBack();
 if (KErrCancel == connFailure)
 {
 #ifdef BRDO_WRT_HS_FF
-if(! (EMiniViewEnabled == WidgetMiniViewState() ||
+iCpsPublisher->NetworkConnectionCancelledL();
-EMiniViewNotEnabled == WidgetMiniViewState()) )
-{
-iCpsPublisher->NetworkConnectionCancelledL();
-iNetworkModeWait->Start();
-}
 #endif
 User::Leave( connFailure );
 }
 else if ( KErrNone != connFailure )
 {
 // or hit cancel altogether in which case the KErrCancel block above
 // kicks in and sets a EDeny.
 User::Leave( connFailure );
 }
 *aNewConn = ETrue;
-if(iWindowManager.GetNetworkMode() == EOfflineMode)
-	{
-iWindowManager.GetConnection()->CancelConnection();
-iWindowManager.GetConnection()->StopConnectionL();
-User::Leave( KErrAccessDenied );
-	}
-#ifdef BRDO_OCC_ENABLED_FF
-		else
-	TRAP_IGNORE(iWindowManager.ConnNeededStatusL(KErrNone));
-#endif
 }
 }
 // -----------------------------------------------------------------------------
 // CWidgetUiWindow::NetworkConnectionNeededL()
 TInt* aSockSvrHandle,
 TBool* aNewConn,
 TApBearerType* aBearerType )
 {
-#ifdef BRDO_OCC_ENABLED_FF
-TBool retryFlag = iWindowManager.GetRetryFlag();
-if( retryFlag )
-{
-return;
-}
-#endif
 // default in case connection setup fails
 *aConnectionPtr = 0;
 if( EMiniViewEnabled == WidgetMiniViewState() ||
 EMiniViewNotEnabled == WidgetMiniViewState())
 EParamTransactionId,
 aTypeArray,
 aDesArray,
 paramFound );
-if ( paramFound )
+TLex lex(dlId);
-{
+User::LeaveIfError(lex.Val(iDlId));
-TLex lex(dlId);
-User::LeaveIfError(lex.Val(iDlId));
-}
 TDataType dataType( *contentType8 );
 CAiwGenericParamList* genericParamList =
 BrCtlParamList2GenericParamListL( aTypeArray, aDesArray );
 CleanupStack::PushL( genericParamList );
 //
 void CWidgetUiWindow::DetermineNetworkState()
 {
 TNetworkState currNetState;
 RWidgetRegistryClientSession& widgetRegistry = iWindowManager.WidgetUIClientSession();
-TInt inMiniView = !(WidgetMiniViewState()==EMiniViewEnabled || WidgetMiniViewState()==EMiniViewNotEnabled);//widgetRegistry.IsWidgetInMiniView( iUid);
+TInt inMiniView = widgetRegistry.IsWidgetInMiniView( iUid);
 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL( iUid, EAllowNetworkAccess );
-TInt netAccessWdgtProp = propValue && *propValue;    // AllowNetworkAccess in the info.plist file
+TInt netAccessWdgtProp = *propValue;    // AllowNetworkAccess in the info.plist file
-delete propValue;
 if ( netAccessWdgtProp && ((inMiniView && (iWindowManager.GetNetworkMode() == (TInt)EOnlineMode))
 || (!inMiniView && iUserPermission)) )
 {
 if ( iWindowManager.GetNetworkConn() )
 // status pane always off unless in text box
 iWindowManager.View()->UpdateStatusPane(EFalse);
 }
 }
 }
-// -----------------------------------------------------------------------------
-// CWidgetUiWindow::NeedToNotifyNetworkState()
-// -----------------------------------------------------------------------------
-//
-void CWidgetUiWindow::NeedToNotifyNetworkState(TBool aNetworkState)
-{
-iNeedToNotifyNetworkState = aNetworkState;
-}
-// -----------------------------------------------------------------------------
-// CWidgetUiWindow::CanBeDeleted()
-// -----------------------------------------------------------------------------
-//
-TBool CWidgetUiWindow::CanBeDeleted()
-{
-iDeleteItself = iConnecting;
-return !iConnecting;
-}
-void CWidgetUiWindow::DeleteItself()
-	{
-	iAsyncCallBack->CallBack();
-	}
-// -----------------------------------------------------------------------------
-// CWidgetUiWindow::DeleteItself()
-// -----------------------------------------------------------------------------
-//
-TInt CWidgetUiWindow::DeleteItself(TAny* aPtr)
-{
-CWidgetUiWindow* self = (CWidgetUiWindow*)aPtr;
-CWidgetUiWindowManager* p = &self->iWindowManager;
-//if sync request start another event loop
-if(self->Engine()->IsSynchRequestPending())
-	{
-	self->DeleteItself();
-	return KErrNone;
-	}
-delete self;
-//The Correct fix is to call AppUI::Exit()
-//But that is leaving
-if(p->WindowListCount() == 0)
-User::Exit(KErrNone);
-return 0;
-}
-#ifdef BRDO_OCC_ENABLED_FF
-void CWidgetUiWindow::CancelAllDialogs()
-{
-if( iDialogsProvider)
-{
-iDialogsProvider->CancelAll();
-}
-}
-TBool CWidgetUiWindow::IsDialogsLaunched()
-{
-return (iDialogsProvider && iDialogsProvider->IsDialogLaunched() );
-}
-#endif
 // End of file

branch	RCL_3
changeset 48	79859ed3eea9
parent 47	e1bea15f9a39
child 49	919f36ff910f