MCL/sf/mw/homescreensrv: comparison idlefw/plugins/sapidataplugin/src/sapidataplugin.cpp

equal deleted inserted replaced

-:b276298d5729
+:edd621764147
 // ---------------------------------------------------------------------------
 // Default constructor
 // ---------------------------------------------------------------------------
 //
 CSapiDataPlugin::CSapiDataPlugin()
-: iNetworkStatus( EUnknown ), iPluginState( ENone )
+: iNetworkStatus( EUnknown ), iPluginState( EStopped )
 {
 }
 // ---------------------------------------------------------------------------
 // Symbian 2nd phase constructor can leave
 }
 iIconArray.Reset();
 iRfs.Close();
 }
 // ---------------------------------------------------------------------------
 // Publishes widget's texts and images
 // ---------------------------------------------------------------------------
 //
 			 }
 		}
 	return id;
 	}
 // ---------------------------------------------------------------------------
 // Gets type of a content
 // ---------------------------------------------------------------------------
 //
 const TDesC& CSapiDataPlugin::GetTypeL(TDesC& aObjectId )
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::Start( TStartReason aReason )
 {
-if( aReason == ESystemStartup )
+iPluginState = EStarted;
-{
-TRAP_IGNORE( PublishL() );
+TRAP_IGNORE( StartL( aReason ) );
-TRAP_IGNORE( iData->SetStartupReasonL( KSystemStartup ));
+}
-}
-else if( aReason == EPageStartup )
+// ----------------------------------------------------------------------------
-{
+// CSapiDataPlugin::StartL
-TRAP_IGNORE( iData->SetStartupReasonL( KPageStartup ));
+//
-}
+// ----------------------------------------------------------------------------
-else if( aReason == EPluginStartup )
+//
-{
+void CSapiDataPlugin::StartL( TStartReason aReason )
-TRAP_IGNORE( PublishL() );
+{
-TRAP_IGNORE( iData->SetStartupReasonL( KPluginStartup));
+// Activate the publisher
-}
+iData->ChangePublisherStatusL( KActive );
-// Listen for publisher registration to resend the events
+if ( aReason == ESystemStartup )
-TRAP_IGNORE( iData->RegisterPublisherObserverL() );
+{
+PublishL();
+iData->SetStartupReasonL( KSystemStartup );
+}
+else if ( aReason == EPageStartup )
+{
+iData->SetStartupReasonL( KPageStartup );
+}
+else if ( aReason == EPluginStartup )
+{
+PublishL();
+iData->SetStartupReasonL( KPluginStartup );
+}
+if ( !iPubObsRegistered )
+{
+// Listen for publisher registration to resend the events
+iData->RegisterPublisherObserverL() ;
+// Execute the active trigger
+iData->TriggerActiveL();
+iPubObsRegistered = ETrue;
+}
 }
 // ----------------------------------------------------------------------------
 // CSapiDataPlugin::Stop
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::Stop( TStopReason aReason )
 {
-if( aReason == ESystemShutdown )
+TRAP_IGNORE( StopL( aReason ) );
-{
-TRAP_IGNORE( iData->ChangePublisherStatusL( KSystemShutdown ));
+iPluginState = EStopped;
 }
-else if( aReason == EPageShutdown )
-{
+// ----------------------------------------------------------------------------
-TRAP_IGNORE( iData->ChangePublisherStatusL( KPageShutdown ));
+// CSapiDataPlugin::StopL
-}
+//
-else if( aReason == EPluginShutdown )
+// ----------------------------------------------------------------------------
-{
+//
-TRAP_IGNORE( iData->ChangePublisherStatusL( KPluginShutdown ));
+void CSapiDataPlugin::StopL( TStopReason aReason )
+{
+if ( aReason == ESystemShutdown )
+{
+iData->ChangePublisherStatusL( KSystemShutdown );
+}
+else if ( aReason == EPageShutdown )
+{
+iData->ChangePublisherStatusL( KPageShutdown );
+}
+else if ( aReason == EPluginShutdown )
+{
+iData->ChangePublisherStatusL( KPluginShutdown );
 }
 if ( iData )
 {
-TRAP_IGNORE( iData->ChangePublisherStatusL( KDeActive ));
+iData->ChangePublisherStatusL( KDeActive );
 }
 }
 // ----------------------------------------------------------------------------
 // CSapiDataPlugin::Resume
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::Resume( TResumeReason aReason )
 {
-if ( aReason == EForeground )
+if ( aReason == EForeground && iPluginState != EStopped )
 {
 iPluginState = EResume;
 TRAP_IGNORE( iData->ChangePublisherStatusL( KResume ));
 }
 }
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::Suspend( TSuspendReason aReason )
 {
-if ( aReason == EBackground )
+if ( aReason == EBackground && iPluginState != EStopped )
 {
 iPluginState = ESuspend;
 TRAP_IGNORE( iData->ChangePublisherStatusL( KSuspend ));
 }
 }
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::SetOnline()
 {
-if ( iNetworkStatus != EOnline )
+if ( iNetworkStatus != EOnline && iPluginState != EStopped )
 {
 iNetworkStatus = EOnline;
 TRAP_IGNORE( iData->ChangePublisherStatusL( KOnLine ));
 }
 }
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::SetOffline()
 {
-if ( iNetworkStatus != EOffline )
+if ( iNetworkStatus != EOffline && iPluginState != EStopped )
 {
 iNetworkStatus = EOffline;
 TRAP_IGNORE( iData->ChangePublisherStatusL( KOffLine ));
 }
 }
 iData->SetContentIdL( PublisherInfo().Namespace() );
 // Configurations
 iData->ConfigureL( configurationItemsArr );
-iPluginState = ESuspend;
 // Listen the publisher content update
 iData->RegisterContentObserverL();
-// Activate the publisher
-iData->ChangePublisherStatusL( KActive );
-// Execute the active trigger
-iData->TriggerActiveL();
 }
 contentItemsArr.Reset();
 configurationItemsArr.Reset();
 //
 // ----------------------------------------------------------------------------
 //
 void CSapiDataPlugin::SetProperty( TProperty aProperty, TAny* aAny )
 {
-if (aProperty == ECpsCmdBuffer )
+if ( aProperty == ECpsCmdBuffer )
 {
 iData->SetCommandBuffer( aAny );
 }
 }
 // ----------------------------------------------------------------------------

branch	RCL_3
changeset 19	edd621764147
parent 15	a0713522ab97
child 23	ace62b58f4b2