FCL/sf/app/organizer: comparison alarmui/src/AlmAlarmControl.cpp

equal deleted inserted replaced

-:12af337248b1
+:bd7edf625bdd
 // INCLUDE FILES
 #include "AlmAlarmControl.h"
 #include "pim_trace.h"
 #include "alarmutils.h"
-// #include <secondarydisplay/alarmuiSecondaryDisplay.h>
+#include <secondarydisplay/alarmuiSecondaryDisplay.h>
 #include <bautils.h>
 #include <StringLoader.h>
 #include <pathinfo.h>
 #include <featmgr.h>
 #include <aknnotewrappers.h>
 #include <coreapplicationuisdomainpskeys.h>
-// #include <alarmuidomainpskeys.h>
+#include <alarmuidomainpskeys.h>
 #include <data_caging_path_literals.hrh>
 #include <AlmAlert.rsg>
 #include "AlmAlert.hrh"
 #include "AlmAlert.pan"
 #include <aknnotewrappers.h>
 #include <AknMediatorFacade.h>
-#include "alarmalertwrapper.h"
+#include <missedalarm.h>
-// #include <missedalarm.h>
 _LIT( KResourceFile, "AlmAlert.rsc" );
 const TInt KAlarmPriority( 3095 );  // Priority for global note queue
 * (try to prevent accidental key presses from going through the key or security lock)
 */
 iAlarmUtils->StartKeyBlocker();
 // reset the key guard
-//iAlarmUtils->SetKeyGuard( ETrue );
+iAlarmUtils->SetKeyGuard( ETrue );
 }
 break;
 }
 iAlarmUtils->CancelAutoSnooze();
 // Allow auto-snooze only while waiting user input
 if( IsState( EStateWaitingInput ) )
 {
 SetState( EStateAfterInput );
-iAlarmUtils->TryToSnoozeActiveAlarm();
+	 StopOrSnoozeAlarm();
-DoCancelDialog();
+	 DoCancelDialog();
 }
 TRACE_EXIT_POINT;
 }
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 //
 void CAlmAlarmControl::DoCancelDialog()
 {
 TRACE_ENTRY_POINT;
-/*if( iGlobalNoteId != KErrNotFound )
+if( iGlobalNoteId != KErrNotFound )
 {
-// iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
+iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
-// iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );
+iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );
-iAlarmUtils->NotifierDialogController()->dismissAlarmAlert();
+}
-}*/
-iAlarmUtils->NotifierDialogController()->dismissAlarmAlert();
 iAlarmUtils->StopAlarmSound();
 iAlarmUtils->CancelAutoSnooze();
 TRACE_EXIT_POINT;
 }
 TRACE_ENTRY_POINT;
 iAskWakeup = EFalse;
 ASSERT( IsState( EStateBeforeAskingWakeup ) );
 if( IsState( EStateBeforeAskingWakeup ) )
 {
-// HBufC* label = NULL;
+HBufC* label = NULL;
-// TBuf<1> time;
+TBuf<1> time;
-// iAlarmUtils->GetWakeupLabelL( label );
+iAlarmUtils->GetWakeupLabelL( label );
-// CleanupStack::PushL( label );
+CleanupStack::PushL( label );
-/*		if(!IsVisible())
+		if(!IsVisible())
 		{
 			MakeVisible(ETrue);
-		}*/
+		}
-// iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
+iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
-// iGlobalNoteId = iAlarmUtils->NotifierDialogController()->DisplayAlarmL( EAskWakeUp, *label, time/*not used*/ );
+iGlobalNoteId = iAlarmUtils->NotifierDialogController()->DisplayAlarmL( EAskWakeUp, *label, time/*not used*/ );
-SAlarmInfo* alarmInfo = iAlarmUtils->GetAlarmInfo();
-		iAlarmUtils->NotifierDialogController()->showAlarmAlert( alarmInfo );
+CleanupStack::PopAndDestroy( label );
-// CleanupStack::PopAndDestroy( label );
 // shutdown automatically if user doesn't react within one minute
 iAlarmUtils->StartShutdownTimer( KAlarmAutoShutdown );
 }
 TRACE_EXIT_POINT;
 //
 void CAlmAlarmControl::StoreMissedAlarmDataL()
 {
 	//Get the Calendar instance values and
 	//Store it in the missed alarm repository
-	/*
 	RPointerArray<CMissedAlarm> missedAlarmList;
 	TCalLocalUid localUid = iAlarmUtils->AlarmData().iLocalUid;
 	TCalTime instanceTime = iAlarmUtils->AlarmData().iInstanceTime;
 	TTime startTime = instanceTime.TimeLocalL();
 	CMissedAlarm* missedAlarm = CMissedAlarm::NewL( localUid, startTime,
 	missedAlarmStore->AddL(missedAlarmList);
 	CleanupStack::PopAndDestroy( missedAlarmStore );
 	CleanupStack::Pop( missedAlarm );
 	missedAlarmList.ResetAndDestroy();
-	*/
+}
-}
+// ---------------------------------------------------------
+// Checks for calendar type alarm needed to be stored as missed alarm
+// Stops the alarm and enters to missed alarm table. If the calendar type
+// is clock, then snoozes the alarm.
+// ---------------------------------------------------------
+//
+void CAlmAlarmControl::StopOrSnoozeAlarm()
+	{
+	TRACE_ENTRY_POINT;
+	if( iAlarmUtils->IsCalendarAlarm() )
+		{
+		if( iAlarmUtils->IsCalendarAlarmViewer() )
+			{
+			iAlarmUtils->SetCalendarAlarmViewer(EFalse);
+			}
+		else
+			{
+			TRAP_IGNORE( StoreMissedAlarmDataL() );
+			}
+		iAlarmUtils->DoStopAlarm();
+		}
+	else
+		{
+		iAlarmUtils->TryToSnoozeActiveAlarm();
+		}
+	TRACE_EXIT_POINT;
+	}
 // ===========================================================
 // ================ INHERITED FUNCTIONS ======================
 // ---------------------------------------------------------
 // Symbian 2nd phase constructor
 BaflUtils::NearestLanguageFile( iEikonEnv->FsSession(), resFile );
 iResOffset = iEikonEnv->AddResourceFileL( resFile );
-/*iEikonEnv->EikAppUi()->AddToStackL(
+iEikonEnv->EikAppUi()->AddToStackL(
 this,
 ECoeStackPriorityAlert,
 ECoeStackFlagRefusesFocus );
-*/
-	// MakeVisible(EFalse);
+	MakeVisible(EFalse);
 	SetStopFromContext(EFalse);
 iAlarmUtils = CAlarmUtils::NewL( this, aSupervisor );
 // observe "hide alarm" commands (i.e. powerkey presses)
 iPropertyHideAlarm = CPropertyObserver::NewL( *this, KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm );
 // observe system state changes
 iPropertySWStateValue = CPropertyObserver::NewL( *this, KPSUidStartup, KPSGlobalSystemState );
 //For Plasma accessory handling
-// _LIT_SECURITY_POLICY_PASS( KGeneralReadPolicy );
+_LIT_SECURITY_POLICY_PASS( KGeneralReadPolicy );
-	// _LIT_SECURITY_POLICY_C1( KProtectedWritePolicy, ECapabilityWriteDeviceData );
+	_LIT_SECURITY_POLICY_C1( KProtectedWritePolicy, ECapabilityWriteDeviceData );
-	/*
 	RProperty::Define( KPSUidAlarmExtCntl, KAlarmStopKey, RProperty::EInt, KGeneralReadPolicy, KProtectedWritePolicy );
 RProperty::Define( KPSUidAlarmExtCntl, KAlarmSnoozeKey, RProperty::EInt, KGeneralReadPolicy, KProtectedWritePolicy );
 //observe Plasma accessory stop key changes
 iPropertyStopAlarm = CPropertyObserver::NewL(*this, KPSUidAlarmExtCntl, KAlarmStopKey);
 //observe Plasma accessory snooze key changes
 iPropertySnoozeAlarm = CPropertyObserver::NewL(*this, KPSUidAlarmExtCntl, KAlarmSnoozeKey);
-	*/
 //observe SysAp backlight setting PS Key
 	iPropertyBacklight = CPropertyObserver::NewL(*this, KPSUidCoreApplicationUIs, KLightsAlarmLightActive);
 TRACE_EXIT_POINT;
 }
 // Only call this within ShowAlarm to prevent updating data too early/late.
 // (e.g. updating snooze time before showing the snooze info note)
 TRAPD( err, iAlarmUtils->InitialiseAlarmDataL(); )
-// Get the alarm information
+HBufC* text = NULL;
-SAlarmInfo* alarmInfo = iAlarmUtils->GetAlarmInfo();
-// Get the ringing type
+if( !err )
-alarmInfo->iIsSilent = iAlarmUtils->IsRingingTypeSilent() || iAlarmUtils->IsOffTone();
+{
-// Check if the alarm can be snoozed
+TRAP( err, iAlarmUtils->GetAlarmLabelL( text ); )
-alarmInfo->iCanSnooze = iAlarmUtils->CanSnooze();
+}
+	// cleanup (release global data)
-// cleanup (release global data)
+	iAlarmUtils->UninitialiseAlarmData();
-iAlarmUtils->UninitialiseAlarmData();
+if( !err )
-/*if(!IsVisible())
+{
-{
+	if(!IsVisible())
-MakeVisible(ETrue);
+	{
-}
+		MakeVisible(ETrue);
-iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
+	}
+iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
-// setup CBA for the global note
-TUint cba(0);  // See AknDialogController.h
+// setup CBA for the global note
-// alarm type - no silence key for clock alarms, unknown alarms are handled as calendar alarms
+TUint cba(0);  // See AknDialogController.h
-cba |= iAlarmUtils->IsClockAlarm() ? EClockAlarm | ENoSilence : ECalendarAlarm;
+// alarm type - no silence key for clock alarms, unknown alarms are handled as calendar alarms
-// disable silence key when ringing type is set to "silent" or if alarm sounds is set off
+cba |= iAlarmUtils->IsClockAlarm() ? EClockAlarm | ENoSilence : ECalendarAlarm;
-cba |= iAlarmUtils->IsRingingTypeSilent() || iAlarmUtils->IsOffTone() ? ENoSilence : 0;
+// disable silence key when ringing type is set to "silent" or if alarm sounds is set off
-// disable silence and snooze key if alarm can't be snoozed anymore
+cba |= iAlarmUtils->IsRingingTypeSilent() || iAlarmUtils->IsOffTone() ? ENoSilence : 0;
-cba |= iAlarmUtils->CanSnooze() ? 0 : EHideSnooze | ENoSilence;
+// disable silence and snooze key if alarm can't be snoozed anymore
-// show "Open" MSK for calendar alarms if the security lock is not active
+cba |= iAlarmUtils->CanSnooze() ? 0 : EHideSnooze | ENoSilence;
-cba |= iAlarmUtils->IsCalendarAlarm() && !iAlarmUtils->IsSecurityLockActive() ? EMskOpen : 0;
+// show "Open" MSK for calendar alarms if the security lock is not active
+cba |= iAlarmUtils->IsCalendarAlarm() && !iAlarmUtils->IsSecurityLockActive() ? EMskOpen : 0;
-// request alarm dialog
-TBuf<1> time;
+// request alarm dialog
-TRAP( err, iGlobalNoteId = iAlarmUtils->NotifierDialogController()->DisplayAlarmL( cba, *text, timenot used ) );
+TBuf<1> time;
-delete text; // only delete if GetAlarmLabelL call was successfull
+TRAP( err, iGlobalNoteId = iAlarmUtils->NotifierDialogController()->DisplayAlarmL( cba, *text, time/*not used*/ ) );
-ASSERT( !err ); */
+delete text; // only delete if GetAlarmLabelL call was successfull
-iAlarmUtils->NotifierDialogController()->showAlarmAlert(alarmInfo);
+ASSERT( !err );
-//iAlarmUtils->StartAutoSnoozeTimer();
+}
-//iAlarmUtils->PlayAlarmSound();
-//SetState( EStateWaitingInput );
 if( err ) // failed to fetch alarm data or show the notification
 {
 // this happens if user has deleted calendar entry with a snoozed alarm or removed alarm from a snoozed calendar entry.
 // (or if the DisplayAlarmL call fails)
 // -> stop and ignore the alarm
 HandleInterruptAlarm( EReasonKSysApHideAlarm );
 }
-delete alarmInfo->iLocation;
-delete alarmInfo->iSubject;
 }
 }
 break;
 default:
 if( noPowerKey ) // end key as power key >> snooze
 {
 // cancel the alarm
 if( iGlobalNoteId != KErrNotFound )
 {
-// iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
+iAlarmUtils->NotifierDialogController()->SetNoteObserver( this );
-// iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );
+iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );
-iAlarmUtils->NotifierDialogController()->dismissAlarmAlert();
 }
 }
 else // stop
 {
 HandleInterruptAlarm( EReasonKSysApHideAlarm );
 {
 ShowAlarm();
 }
 }
-	/*
 //For plasma support
 else if( aCategory == KPSUidAlarmExtCntl && aKey == KAlarmStopKey && aValue == EAlarmUIStopAlarm )
 {
 //Set the P&S to an uninitialized value
 	TAlarmUIStopAlarm extStopAlarm = EAlarmUIStopAlarmUninitialized;
 	TAlarmUISnoozeAlarm extSnoozeAlarm = EAlarmUISnoozeAlarmUninitialized;
 	PIM_ASSERT( RProperty::Set( KPSUidAlarmExtCntl, KAlarmSnoozeKey, static_cast<TInt>(extSnoozeAlarm)); )
 	ExternalSnoozeAlarm();
 }
-	*/
 	else if( aCategory == KPSUidCoreApplicationUIs && aKey == KLightsAlarmLightActive)
 	{
 		if(IsState(EStateWaitingInput) && aValue ==  ELightsBlinkingUninitialized )
 		{
 			iAlarmUtils->SetBackLight(ETrue);
 {
 if( iAlarmUtils->IsCalendarAlarm() && !iAlarmUtils->IsSecurityLockActive() )
 	                    {
 // Do not leave if calendar launch fails. Just continue as normally
 iAlarmUtils->StopAlarmSound();
-// PIM_TRAPD_ASSERT( iAlarmUtils->StartCalendarL(); )
+PIM_TRAPD_ASSERT( iAlarmUtils->StartCalendarL(); )
 iAlarmUtils->StartAutoSnoozeTimer();  // restart auto-snooze timer
 	                    }
 }
 break;
 {
 case EStateWaitingDisplayRequest:
 {
 iAlarmUtils->StartAutoSnoozeTimer();
 iAlarmUtils->PlayAlarmSound();
-//iAlarmUtils->SetKeyGuard( EFalse );
+iAlarmUtils->SetKeyGuard( EFalse );
 SetState( EStateWaitingInput );
 iAlarmUtils->StartKeyBlocker();  // block all input for 0.5 seconds
 }
 break;
 case EStateWaitingShowRequest:
 case EStateWaitingDisplayRequest:
 case EStateWaitingInput:
 {
 SetState( EStateIdle );
-DoCancelDialog();
+	          DoCancelDialog();
-iAlarmUtils->TryToSnoozeActiveAlarm();
+StopOrSnoozeAlarm();
 }
 break;
 case EStateBeforeAskingWakeup:
 case EStateAskingWakeup:
 case EKeyPhoneEnd: // (scan code EStdKeyNo)
 {
 // Normally pressing End Call key generates CancelDialog callback, but
 // when we have an active call we don't get the CancelDialog...
-// iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );  // Cancel alarm....will snooze...
+iAlarmUtils->NotifierDialogController()->CancelNote( iGlobalNoteId );  // Cancel alarm....will snooze...
 TRACE_EXIT_POINT;
 return EKeyWasNotConsumed;
 }
 case EKeyVolumeUp:   // (scan code EStdKeyIncVolume)
 // ---------------------------------------------------------
 //
 void CAlmAlarmControl::ShowSnoozeInfoNoteL()
 {
 TRACE_ENTRY_POINT;
-/*
 //Changes for MPIN-73VCR2
 HBufC* stringHolder = NULL;
 CAknInformationNote* note = new (ELeave) CAknInformationNote();
 TAlarmSecondaryDisplayNote alarmSecDispNote = EAlarmNoNote;
 }
 else
 {
 SetState( EStateIdle );
 }
-	*/
 TRACE_EXIT_POINT;
 }
 // ---------------------------------------------------------
 // Stops an active alarm.
 //
 TBool CAlmAlarmControl::IsStopFromContext()
 {
 	return iStopFromContextFw;
 }
+CAlarmUtils* CAlmAlarmControl::AlarmUtils() const
+{
+return iAlarmUtils;
+}
+// End of File
-void CAlmAlarmControl::alertCompleted(AlarmCommand command)
-{
-//iAlarmUtils->CancelShutdown();
-iAlarmUtils->StopAlarmSound();
-switch( iState )
-{
-/**
-* EStateWaitingInput: normal case
-* EStateWaitingDisplayRequest:
-*     This happens only if the global note got handled before we got the DisplayDialogL call.
-*     (e.g. note is dismissed if the cover is closed at the same time when alarm expires)
-**/
-case EStateWaitingInput:
-case EStateWaitingDisplayRequest:
-{
-switch( command )
-{
-case AlarmStop:
-{
-SetState( EStateAfterInput );
-					 // cancel timers
-					 iAlarmUtils->CancelAutoSnooze();
-iAskWakeup = ETrue; // ask wakeup after all the alarms are handled
-iAlarmUtils->DoStopAlarm();  // stop
-break;
-}
-case AlarmSnooze:
-{
-// cancel timers
-					 iAlarmUtils->CancelAutoSnooze();
-					 SetState( EStateAfterInput );
-SetState( EStateShowingSnoozeInfo );
-iAlarmUtils->TryToSnoozeActiveAlarm();
-if( IsState( EStateWaitingShowRequest ) )
-{
-ShowAlarm();
-}
-else
-{
-SetState( EStateIdle );
-}
-}
-}
-}
-break;
-}
-TRACE_EXIT_POINT;
-}
-void CAlmAlarmControl::alertDisplayed(AlarmCommand /*command*/)
-{
-TRACE_ENTRY_POINT;
-switch( iState )
-{
-case EStateWaitingDisplayRequest:
-{
-iAlarmUtils->StartAutoSnoozeTimer();
-iAlarmUtils->PlayAlarmSound();
-//iAlarmUtils->SetKeyGuard( EFalse );
-SetState( EStateWaitingInput );
-iAlarmUtils->StartKeyBlocker();  // block all input for 0.5 seconds
-}
-break;
-case EStateBeforeAskingWakeup:
-{
-SetState( EStateAskingWakeup );
-}
-break;
-default:
-{
-// panic - invalid state!
-Panic( EAlarmUIInvalidState | EAlarmUIDisplayDialog );
-}
-}
-}
-void CAlmAlarmControl::alertCancelled(AlarmCommand /*command*/)
-{
-iAlarmUtils->StopAlarmSound();
-iAlarmUtils->CancelAutoSnooze();
-}
-// End of File

branch	RCL_3
changeset 66	bd7edf625bdd
parent 65	12af337248b1
child 86	ed599363c2d7