equal
deleted
inserted
replaced
235 User::Leave( THttpProvStates::EStatusWrapperParsingFailed ); |
235 User::Leave( THttpProvStates::EStatusWrapperParsingFailed ); |
236 } |
236 } |
237 |
237 |
238 |
238 |
239 TInt numSaved( 0 ); |
239 TInt numSaved( 0 ); |
240 CPnpProvisioningSaver* saver = new(ELeave) CPnpProvisioningSaver( *wpengine, EFalse ); |
240 CPnpProvisioningSaver* saver = new(ELeave) CPnpProvisioningSaver( *wpengine, EFalse, EFalse ); |
241 TInt retValue( KErrNone ); |
241 TInt retValue( KErrNone ); |
242 LOGSTRING("saver created"); |
242 LOGSTRING("saver created"); |
243 // dismiss waitdialog, saver will show own waitdialog |
243 // dismiss waitdialog, saver will show own waitdialog |
244 iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty); |
244 //iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty); |
245 |
245 |
246 TRAPD( saverErr, retValue = saver->ExecuteLD( numSaved ) ); |
246 TRAPD( saverErr, retValue = saver->ExecuteLD( numSaved ) ); |
247 |
247 |
248 if( retValue == KErrCancel ) |
248 if( retValue == KErrCancel ) |
249 { |
249 { |
326 } |
326 } |
327 |
327 |
328 if( setAsDefault ) |
328 if( setAsDefault ) |
329 { |
329 { |
330 LOGSTRING( "create setter" ); |
330 LOGSTRING( "create setter" ); |
331 CPnpProvisioningSaver* setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue ); |
331 CPnpProvisioningSaver* setter = NULL; |
332 TInt numSet( 0 ); |
332 TInt numSet( 0 ); |
|
333 if(!activate) |
|
334 { |
|
335 setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, ETrue ); |
|
336 iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty); |
|
337 } |
|
338 else |
|
339 { |
|
340 setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, EFalse ); |
|
341 } |
333 LOGSTRING( "setter->ExecuteLD" ); |
342 LOGSTRING( "setter->ExecuteLD" ); |
334 setter->ExecuteLD( numSet ); |
343 setter->ExecuteLD( numSet ); |
335 } |
344 } |
336 |
345 |
337 // Display note to user that settings are saved successfully |
346 // Display note to user that settings are saved successfully |
345 CAknGlobalNote* globalNote = CAknGlobalNote::NewL(); |
354 CAknGlobalNote* globalNote = CAknGlobalNote::NewL(); |
346 CleanupStack::PushL( globalNote ); |
355 CleanupStack::PushL( globalNote ); |
347 globalNote->ShowNoteL( EAknGlobalInformationNote , *msgTextSaved ); |
356 globalNote->ShowNoteL( EAknGlobalInformationNote , *msgTextSaved ); |
348 CleanupStack::PopAndDestroy( 2 ); |
357 CleanupStack::PopAndDestroy( 2 ); |
349 } |
358 } |
350 else |
|
351 { |
|
352 CPnpServiceActivation *service = CPnpServiceActivation::NewLC(); |
|
353 service->DisplayAppSpecNoteL(); |
|
354 CleanupStack::PopAndDestroy(); |
|
355 } |
|
356 |
359 |
357 } |
360 } |
358 else |
361 else |
359 { |
362 { |
360 User::Leave( THttpProvStates::EStatusStorageFailed ); |
363 User::Leave( THttpProvStates::EStatusStorageFailed ); |