# HG changeset patch # User Stefan Karlsson # Date 1269861948 -3600 # Node ID 49b497aeb789f40efc12631a88f6495de57bdf36 # Parent db95ac47977d50ddca1f7859a88cfc8f833cbf77# Parent c7f00bb26c69df726b7163ffa747ae50558c8696 Merge. diff -r db95ac47977d -r 49b497aeb789 contentctrl_plat/ds_agenda_handler_plugin_api/inc/nsmlagendaadapterhandler.inl --- a/contentctrl_plat/ds_agenda_handler_plugin_api/inc/nsmlagendaadapterhandler.inl Fri Mar 19 15:14:53 2010 -0700 +++ b/contentctrl_plat/ds_agenda_handler_plugin_api/inc/nsmlagendaadapterhandler.inl Mon Mar 29 12:25:48 2010 +0100 @@ -16,7 +16,7 @@ */ // INCLUDE FILES -#include +#include #include "nsmlagendaadapterhandler.h" // ============================ MEMBER FUNCTIONS =============================== diff -r db95ac47977d -r 49b497aeb789 omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h --- a/omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h Mon Mar 29 12:25:48 2010 +0100 @@ -45,7 +45,7 @@ #ifdef RD_DSUI_TIMEDSYNC #include -#include +#include #endif diff -r db95ac47977d -r 49b497aeb789 omads/omadsappui/AspSyncUtil/src/AspDialogUtil.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspDialogUtil.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsappui/AspSyncUtil/src/AspDialogUtil.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -1038,16 +1038,15 @@ if (iNaviPane) { TRAP_IGNORE(iNaviDecorator = iNaviPane->CreateTabGroupL(this)); - } + if (iNaviDecorator) + { + TRAP_IGNORE(iNaviPane->PushL(*iNaviDecorator)); + iNavidecoratorPushed = ETrue; - if (iNaviDecorator) - { - TRAP_IGNORE(iNaviPane->PushL(*iNaviDecorator)); - iNavidecoratorPushed = ETrue; - - iTabGroup = static_cast( iNaviDecorator->DecoratedControl() ); - } - } + iTabGroup = static_cast( iNaviDecorator->DecoratedControl() ); + } + } + } // ----------------------------------------------------------------------------- // CAspTabbedNaviPaneHandler::SetTabWidthL diff -r db95ac47977d -r 49b497aeb789 omads/omadsappui/AspSyncUtil/src/AspProfile.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -1440,12 +1440,18 @@ TPckgC pckgAppUIDValue( KCRUidNSmlDSApp.iUid ); calinfo->SetPropertyL( keyBuff, pckgAppUIDValue ); - + // Profile ID Meta Property keyBuff.Zero(); keyBuff.AppendNum( EDeviceSyncProfileID ); TPckgC pckgProfileIdValue( currentProfileId ); calinfo->SetPropertyL( keyBuff, pckgProfileIdValue ); + // Lock the SYNC option + keyBuff.Zero(); + keyBuff.AppendNum( ESyncConfigEnabled ); + TBool synclockstatus( ETrue ); + TPckgC pckgSyncLockValue( synclockstatus ); + calinfo->SetPropertyL( keyBuff, pckgSyncLockValue ); // Create the CalFile HBufC* calfilename = CCalenMultiCalUtil::GetNextAvailableCalFileL(); diff -r db95ac47977d -r 49b497aeb789 omads/omadsappui/AspSyncUtil/src/AspUtil.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspUtil.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsappui/AspSyncUtil/src/AspUtil.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -42,6 +42,7 @@ #include #include // sync error codes +#include //#ifdef __SAP_POLICY_MANAGEMENT #include // VSettingEnforcementInfo @@ -2054,55 +2055,73 @@ // TInt CAspAccessPointHandler::ShowApSelectDialogL(TAspAccessPointItem& aItem) { + FLOG( _L("CAspAccessPointHandler::ShowApSelectDialogL START") ); + aItem.iUid = KErrNotFound; aItem.iName = KNullDesC; - TUint32 selectedAp = 0; + TInt err(KErrNone); + TInt retVal( KErrNone ); + TCmSettingSelection selection; + TBearerFilterArray filterArray; + TUint32 currentAp = 0; if (aItem.iUid2 != KAskAlways && aItem.iUid2 != KDefaultConnection) { - //currentAp = aItem.iUid2; - + FLOG( _L("ShowApSelectDialogL aItem.iUid2 = %d"), aItem.iUid2 ); // convert internet ap to Wap ap (CApSettingsHandler requires this) - TRAP_IGNORE(currentAp = iApUtil->WapIdFromIapIdL(aItem.iUid2)); + TRAP_IGNORE(currentAp = iApUtil->WapIdFromIapIdL(aItem.iUid2)); + } + else + { + FLOG( _L("ShowApSelectDialogL KAskAlways or KDefaultConnection")); } - + + // Mark the current selection + selection.iResult = CMManager::EConnectionMethod; + selection.iId = currentAp; + FLOG( _L("ShowApSelectDialogL selection.iId = %d"), selection.iId ); - CApSettingsHandler* handler = NULL; - handler = CApSettingsHandler::NewLC( ETrue, - EApSettingsSelListIsPopUp, - EApSettingsSelMenuSelectNormal, - KEApIspTypeAll, - BearerFlags(), - KEApSortNameAscending); + // Start the connection dialog + CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL(); + CleanupStack::PushL( settings ); - TInt ret = handler->RunSettingsL(currentAp, selectedAp); - CleanupStack::PopAndDestroy(handler); - - if (ret & KApUiEventSelected) + TRAP ( err, retVal = settings->RunApplicationSettingsL( selection, + CMManager::EShowConnectionMethods, // Show only access points + filterArray ) ); + + CleanupStack::PopAndDestroy(); // settings + + if (err != KErrNone) + { + // Error showing dialogue, return + FLOG( _L("ShowApSelectDialogL err = %d"), err ); + return EAspDialogCancel; + } + + if (retVal) { TAspAccessPointItem item; - item.iUid = selectedAp; + item.iUid = selection.iId; + FLOG( _L("ShowApSelectDialogL Uid (%d)"), item.iUid ); - GetApInfo(item); + GetApInfo(item); + + // convert Wap ap to internet ap + aItem.iUid = iApUtil->IapIdFromWapIdL(selection.iId); + FLOG( _L("ShowApSelectDialogL Uid Conv (%d)"), item.iUid ); - // convert Wap ap to internet ap - aItem.iUid = iApUtil->IapIdFromWapIdL(selectedAp); - - //aItem.iUid = selectedAp; - - aItem.iName = item.iName; - + aItem.iName = item.iName; + + FLOG( _L("ShowApSelectDialogL RETURNING EAspDialogSelect") ); return EAspDialogSelect; } - else if (ret & KApUiEventExitRequested) - { - return EAspDialogExit; - } - else - { - return EAspDialogCancel; - } + else + { + FLOG( _L("ShowApSelectDialogL RETURNING EAspDialogCancel") ); + return EAspDialogCancel; + } + FLOG( _L("CAspAccessPointHandler::ShowApSelectDialogL END") ); } diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -1511,14 +1511,14 @@ delete calfilename; } + iSnapshotRegistered = EFalse; + // Update changefinder if ( iChangeFinder ) { iChangeFinder->ResetL(); + RegisterSnapshotL(); } - iSnapshotRegistered = EFalse; - RegisterSnapshotL(); - User::RequestComplete( iCallerStatus, KErrNone ); FLOG(_L("CNSmlAgendaDataStore::DoDeleteAllItemsL: END")); @@ -3267,6 +3267,13 @@ keyBuff.AppendNum( EDeviceSyncProfileID ); TPckgC pckgProfileIdValue( aProfileId ); calinfo->SetPropertyL( keyBuff, pckgProfileIdValue ); + + // Lock the SYNC option + keyBuff.Zero(); + keyBuff.AppendNum( ESyncConfigEnabled ); + TBool synclockstatus( ETrue ); + TPckgC pckgSyncLockValue( synclockstatus ); + calinfo->SetPropertyL( keyBuff, pckgSyncLockValue ); // Create the CalFile HBufC* calfilename = CCalenMultiCalUtil::GetNextAvailableCalFileL(); diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/bookmark/inc/bookmarkdatastore.h --- a/omads/omadsextensions/adapters/bookmark/inc/bookmarkdatastore.h Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/bookmark/inc/bookmarkdatastore.h Mon Mar 29 12:25:48 2010 +0100 @@ -23,7 +23,7 @@ #include #include -#include +#include #include class CNSmlDataItemUidSet; diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/bookmark/src/bookmarkdatastore.cpp --- a/omads/omadsextensions/adapters/bookmark/src/bookmarkdatastore.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/bookmark/src/bookmarkdatastore.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -18,10 +18,10 @@ #include #include -#include +#include -#include -#include +#include +#include #include #include "bookmarkdatastore.h" diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/bookmark/src/changefinder.cpp --- a/omads/omadsextensions/adapters/bookmark/src/changefinder.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/bookmark/src/changefinder.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -165,12 +165,10 @@ { LOGGER_WRITE("iOldSnapshot->Reset()"); iOldSnapshot->Reset(); + // Write 'null' data to file, + // this removes change history from the file + CloseL(); } - - // Write 'null' data to file, - // this removes change history from the file - CloseL(); - LOGGER_LEAVEFN( "CChangeFinder::ResetL" ); } diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp Mon Mar 29 12:25:48 2010 +0100 @@ -1910,12 +1910,61 @@ { iWriteStream.Close(); User::RequestComplete( iCallerStatus, aError ); - } - else if(iLastOperation == ENSmlRetrieveOp) - { - User::RequestComplete( iCallerStatus, aError ); - } - } + } + else if (iLastOperation == ENSMLUpdateExportOp) + { + iWriteStream.Close(); + delete iMergeItem; + iMergeItem = NULL; + User::RequestComplete( iCallerStatus, aError ); + } + else if (iLastOperation == ENSMLUpdateImportOp) + { + if(iBatchMode) + { + iResultArray->Append( aError ); + } + delete iBuf; + iBuf = NULL; + iReadStream.Close(); + iIndex++; + if(iIndex == iContactsBufferItemList.Count() ) + { + ResetBuffer(); + User::RequestComplete( iCallerStatus, aError ); + } + else + { + _DBG_FILE("VPbkSingleContactOperationFailed, Continuing to complete the Batch Operation"); + ExecuteBufferL(); + } + } + else if(iLastOperation == ENSmlRetrieveOp) + { + iRetrieveCount--; + if(iBatchMode) + { + iResultArray->AppendL( aError ); + } + iIndex++; + if(iIndex == iContactsBufferItemList.Count() ) + { + ResetBuffer(); + User::RequestComplete( iCallerStatus, aError ); + } + else if(!iRetrieveCount) + { + _DBG_FILE("VPbkSingleContactOperationFailed, Continuing to complete the Batch Operation"); + ExecuteBufferL(); + } + } + else + { + _DBG_FILE("VPbkSingleContactOperationFailed, No Matching LastOperation Completing the Operation"); + User::RequestComplete( iCallerStatus, aError ); + } + _DBG_FILE("CNSmlContactsDataStore::VPbkSingleContactOperationFailed(): end"); + } // --------------------------------------------------------------------------- // CNSmlContactsDataStore::VPbkSingleContactOperationFailed // --------------------------------------------------------------------------- diff -r db95ac47977d -r 49b497aeb789 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Fri Mar 19 15:14:53 2010 -0700 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Mon Mar 29 12:25:48 2010 +0100 @@ -450,7 +450,7 @@ display_name="Type"; name="TYPE"; data_type=""; - enum_values={"POC", "SWIS", "VOIP"}; + enum_values={"POC", "SWIS", "VOIP", "WORK", "HOME"}; } }; },