15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
18 |
18 |
19 // INCLUDE FILES |
19 // INCLUDE FILES |
20 #include <psui.rsg> |
20 #include <Psui.rsg> |
21 #include <psuicontainer.h> |
21 #include <PsuiContainer.h> |
22 #include <etelsat.h> |
22 #include <etelsat.h> |
23 |
23 |
24 #include "psuiinternalconstants.h" |
24 #include "PsuiInternalConstants.h" |
25 #include "psuinotecontroller.h" |
25 #include "PsuiNoteController.h" |
26 #include "psuivariationproxy.h" |
26 #include "PsuiVariationProxy.h" |
27 |
27 |
28 // MEMBER FUNCTIONS |
28 // MEMBER FUNCTIONS |
29 // --------------------------------------------------------------------------- |
29 // --------------------------------------------------------------------------- |
30 // Symbian OS two-phased Constructor. |
30 // Symbian OS two-phased Constructor. |
31 // --------------------------------------------------------------------------- |
31 // --------------------------------------------------------------------------- |
108 void CPsuiWaitingObs::HandleCallWaitingGetStatusL( |
108 void CPsuiWaitingObs::HandleCallWaitingGetStatusL( |
109 const MPsetCallWaiting::TGetCallWaitingStatus aStatus, |
109 const MPsetCallWaiting::TGetCallWaitingStatus aStatus, |
110 TUint8 aBsc[KPSUIMaxBscNumber] ) |
110 TUint8 aBsc[KPSUIMaxBscNumber] ) |
111 { |
111 { |
112 |
112 |
113 if ( iCallWaitingDistinguishEnabled && aStatus == MPsetCallWaiting::EStatusNotProvisioned ) |
113 if ( iCallWaitingDistinguishEnabled && aStatus == MPsetCallWaiting::EStatusNotProvisioned ) |
114 { |
114 { |
115 CPsuiNoteController::InstanceL()->ShowNoteL( |
115 CPsuiNoteController::InstanceL()->ShowNoteL( |
116 EPsuiConfirmationNote, R_CW_NOT_PROVISIONED_NOTE ); |
116 EPsuiConfirmationNote, R_CW_NOT_PROVISIONED_NOTE ); |
117 } |
117 } |
118 else if ( aStatus != MPsetCallWaiting::EStatusActive ) |
118 else if ( aStatus != MPsetCallWaiting::EStatusActive ) |
121 EPsuiConfirmationNote, R_CW_NOT_ACTIVE_NOTE ); |
121 EPsuiConfirmationNote, R_CW_NOT_ACTIVE_NOTE ); |
122 } |
122 } |
123 else |
123 else |
124 { |
124 { |
125 if( iCallWaitingDistinguishEnabled ) |
125 if( iCallWaitingDistinguishEnabled ) |
126 { |
126 { |
127 |
127 |
128 //show only "CW active" even if the bsc list is present. |
128 //show only "CW active" even if the bsc list is present. |
129 //This change is to fix the error ENYI-6DYFKZ |
129 //This change is to fix the error ENYI-6DYFKZ |
130 CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, |
130 CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, |
131 R_CW_ACTIVE_NO_BSC_NOTE ); |
131 R_CW_ACTIVE_NO_BSC_NOTE ); |
132 } |
132 } |
133 else |
133 else |
134 { |
134 { |
135 |
135 |
136 //if no bsc-list present, show only "CW active" |
136 //if no bsc-list present, show only "CW active" |
137 if ( aBsc[0] == KPSUINoBscGroup ) |
137 if ( aBsc[0] == KPSUINoBscGroup ) |
138 { |
138 { |
139 CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, |
139 CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote, |
140 R_CW_ACTIVE_NO_BSC_NOTE ); |
140 R_CW_ACTIVE_NO_BSC_NOTE ); |
141 } |
141 } |
142 else |
142 else |
143 { |
143 { |
144 |
144 |
145 CPsuiNoteController::InstanceL()->ShowBscListL( |
145 CPsuiNoteController::InstanceL()->ShowBscListL( |
146 R_CW_STATUS_HEADING, |
146 R_CW_STATUS_HEADING, |
147 aBsc ); |
147 aBsc ); |
148 } |
148 } |
149 } |
149 } |
150 } |
150 } |
151 } |
151 } |
152 |
152 |
153 // --------------------------------------------------------------------------- |
153 // --------------------------------------------------------------------------- |
154 // This function handles errors in call waiting requests. |
154 // This function handles errors in call waiting requests. |