equal
deleted
inserted
replaced
134 { |
134 { |
135 switch ( iRequest ) |
135 switch ( iRequest ) |
136 { |
136 { |
137 case ENSU: |
137 case ENSU: |
138 { |
138 { |
139 /*HBufC* text1 = StringLoader::LoadLC( R_IAUPDATE_INFO_NSU_1 ); |
139 |
140 HBufC* text2 = StringLoader::LoadLC( R_IAUPDATE_INFO_NSU_2 ); |
|
141 |
|
142 HBufC* text = HBufC::NewLC( text1->Length() + |
|
143 text2->Length() ); |
|
144 |
|
145 text->Des() += *text1; |
|
146 text->Des() += *text2; |
|
147 |
|
148 HBufC* heading = StringLoader::LoadLC( R_IAUPDATE_NEW_SW_TITLE ); |
|
149 |
|
150 ShowDialogL( *text, *heading ); |
|
151 |
|
152 CleanupStack::PopAndDestroy( heading ); //text, heading |
|
153 CleanupStack::PopAndDestroy( text ); |
|
154 CleanupStack::PopAndDestroy( text2 ); |
|
155 CleanupStack::PopAndDestroy( text1 );*/ |
|
156 |
|
157 break; |
140 break; |
158 } |
141 } |
159 case EFOTA: |
142 case EFOTA: |
160 { |
143 { |
161 //check whether FOTA engine is available at the moment |
144 //check whether FOTA engine is available at the moment |
170 //if status is downloadcomplete or startingupdate |
153 //if status is downloadcomplete or startingupdate |
171 //still allow user to continue |
154 //still allow user to continue |
172 if ( ( fotamodelstate != RFotaEngineSession::EDownloadComplete ) && ( fotamodelstate != RFotaEngineSession::EStartingUpdate ) ) |
155 if ( ( fotamodelstate != RFotaEngineSession::EDownloadComplete ) && ( fotamodelstate != RFotaEngineSession::EStartingUpdate ) ) |
173 { |
156 { |
174 //if download is suspended, try to resume it. |
157 //if download is suspended, try to resume it. |
175 if ( fotamodelstate == RFotaEngineSession::EDownloadProgressingWithResume) |
158 if ( fotamodelstate == RFotaEngineSession::EDownloadProgressing) |
176 { |
159 { |
177 TInt result = iFotaModel->TryResumeFwUpdDownload(); |
160 TInt result = iFotaModel->TryResumeFwUpdDownload(); |
178 FLOG_NUM( "[IAUPDATEFW] TryResumeFwUpdDownload result = %d", result ); |
161 FLOG_NUM( "[IAUPDATEFW] TryResumeFwUpdDownload result = %d", result ); |
179 } |
162 } |
180 //anyway, DM is in use |
163 //anyway, DM is in use |
227 // CIAUpdateFWUpdateHandler::ShowDialogL() |
210 // CIAUpdateFWUpdateHandler::ShowDialogL() |
228 // ----------------------------------------------------------------------------- |
211 // ----------------------------------------------------------------------------- |
229 // |
212 // |
230 void CIAUpdateFWUpdateHandler::ShowDialogL(TDesC& /*aText*/, TDesC& /*aHeading*/ ) |
213 void CIAUpdateFWUpdateHandler::ShowDialogL(TDesC& /*aText*/, TDesC& /*aHeading*/ ) |
231 { |
214 { |
232 //CAknMessageQueryDialog* dlg = CAknMessageQueryDialog::NewL( aText ); |
215 |
233 |
|
234 //dlg->PrepareLC( R_IAUPDATE_MESSAGE_QUERY ); |
|
235 |
|
236 //CAknPopupHeadingPane* headingPane = dlg->Heading(); |
|
237 //headingPane->SetTextL( aHeading ); |
|
238 |
|
239 //TInt ret = dlg->RunLD(); |
|
240 } |
216 } |
241 |
217 |
242 |
218 |
243 // ----------------------------------------------------------------------------- |
219 // ----------------------------------------------------------------------------- |
244 // CIAUpdateFWUpdateHandler::StartSyncL() |
220 // CIAUpdateFWUpdateHandler::StartSyncL() |