equal
deleted
inserted
replaced
228 |
228 |
229 iSystemShutdown = EFalse; |
229 iSystemShutdown = EFalse; |
230 iWidgetUIListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetUIState ); |
230 iWidgetUIListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetUIState ); |
231 iWidgetRegListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetRegAltered ); |
231 iWidgetRegListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetRegAltered ); |
232 iWidgetSystemShutdownListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetSystemShutdown ); |
232 iWidgetSystemShutdownListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetSystemShutdown ); |
|
233 iMsModeListener = CWrtHarvesterPSNotifier::NewL( this, EWidgetMassStorageMode ); |
233 |
234 |
234 User::LeaveIfError( iFs.Connect() ); |
235 User::LeaveIfError( iFs.Connect() ); |
235 iWidgetUsbListener = CWrtUsbHandler::NewL( this, iFs ); |
236 |
236 |
|
237 iWidgetUsbListener->Start(); |
|
238 SetMSMode(0); |
237 SetMSMode(0); |
239 |
238 |
240 iCanAccessRegistry = ETrue; |
239 iCanAccessRegistry = ETrue; |
241 iReinstallingWidget = EFalse; |
240 iReinstallingWidget = EFalse; |
242 |
241 |
284 CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset ); |
283 CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset ); |
285 } |
284 } |
286 iObservers.ResetAll(); |
285 iObservers.ResetAll(); |
287 iWidgetInfo.ResetAll(); |
286 iWidgetInfo.ResetAll(); |
288 iWidgetStateArray.ResetAll(); |
287 iWidgetStateArray.ResetAll(); |
|
288 |
289 delete iWidgetUIListener; |
289 delete iWidgetUIListener; |
290 delete iWidgetRegListener; |
290 delete iWidgetRegListener; |
291 delete iWidgetMMCListener; |
291 delete iMsModeListener; |
292 delete iWidgetUsbListener; |
|
293 delete iWidgetSystemShutdownListener; |
292 delete iWidgetSystemShutdownListener; |
|
293 |
294 if(iAsyncCallBack) |
294 if(iAsyncCallBack) |
295 { |
295 { |
296 iAsyncCallBack->Cancel(); |
296 iAsyncCallBack->Cancel(); |
297 } |
297 } |
298 delete iAsyncCallBack; |
298 delete iAsyncCallBack; |
325 |
325 |
326 if(iSystemShutdown && aTrigger == KDeActive ) |
326 if(iSystemShutdown && aTrigger == KDeActive ) |
327 { |
327 { |
328 return ; |
328 return ; |
329 } |
329 } |
330 if( IsInMSMode() == 1 && aTrigger == KDeActive) |
330 if( IsInMSMode() == 1 ) |
331 { |
331 { |
332 RemovePublisherAndObserverL(aContentId); |
332 if( aTrigger == KDeActive && !iSystemShutdown ) |
333 |
|
334 if(!iSystemShutdown) |
|
335 { |
333 { |
|
334 RemovePublisherAndObserverL(aContentId); |
336 RWidgetRegistryClientSession session; |
335 RWidgetRegistryClientSession session; |
337 CleanupClosePushL( session ); |
336 CleanupClosePushL( session ); |
338 User::LeaveIfError( session.Connect() ); |
337 User::LeaveIfError( session.Connect() ); |
339 session.SetBlanketPermissionL( uid, EBlanketUnknown ); |
338 session.SetBlanketPermissionL( uid, EBlanketUnknown ); |
340 CleanupStack::PopAndDestroy( &session ); |
339 CleanupStack::PopAndDestroy( &session ); |
888 void CWrtHarvester::QueueResumeL( TUid& aUid ) |
887 void CWrtHarvester::QueueResumeL( TUid& aUid ) |
889 { |
888 { |
890 RWidgetRegistryClientSession session; |
889 RWidgetRegistryClientSession session; |
891 CleanupClosePushL( session ); |
890 CleanupClosePushL( session ); |
892 User::LeaveIfError( session.Connect() ); |
891 User::LeaveIfError( session.Connect() ); |
893 TBool preInstalled = *(session.GetWidgetPropertyValueL( aUid, EPreInstalled ) ); |
892 |
894 |
893 CWidgetPropertyValue* property = session.GetWidgetPropertyValueL( aUid, EPreInstalled ); |
|
894 TBool preInstalled = property && *(property); |
|
895 delete property; |
|
896 |
895 // Set blanket permission to true for pre-installed widgets |
897 // Set blanket permission to true for pre-installed widgets |
896 if ( preInstalled ) |
898 if ( preInstalled ) |
897 { |
899 { |
898 session.SetBlanketPermissionL( aUid, EBlanketTrue ); |
900 session.SetBlanketPermissionL( aUid, EBlanketTrue ); |
899 } |
901 } |
980 TBool CWrtHarvester::CheckNetworkAccessL( TUid& aUid ) |
982 TBool CWrtHarvester::CheckNetworkAccessL( TUid& aUid ) |
981 { |
983 { |
982 RWidgetRegistryClientSession session; |
984 RWidgetRegistryClientSession session; |
983 CleanupClosePushL( session ); |
985 CleanupClosePushL( session ); |
984 User::LeaveIfError( session.Connect() ); |
986 User::LeaveIfError( session.Connect() ); |
985 TBool networkAccess = *(session.GetWidgetPropertyValueL( aUid, EAllowNetworkAccess ) ); |
987 |
|
988 CWidgetPropertyValue* value = session.GetWidgetPropertyValueL( aUid, EAllowNetworkAccess ); |
|
989 TBool networkAccess = value && *(value); |
|
990 delete value; |
|
991 |
986 CleanupStack::PopAndDestroy( &session ); |
992 CleanupStack::PopAndDestroy( &session ); |
987 |
993 |
988 return networkAccess; |
994 return networkAccess; |
989 } |
995 } |
990 // ---------------------------------------------------------------------------- |
996 // ---------------------------------------------------------------------------- |