maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "ActiveSync: added support for specifying folder names" 

This reverts commit 7327b23a4dd31abdc9596916743892402bcffe0c.

Depends on 273527 "ActiveSync: added getDatabases support for fetching
folder list" which has to be reverted.
This commit is contained in:
Patrick Ohly 2013-02-26 11:20:37 +01:00
parent 374b277883
commit 6076c980b7
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/backends/activesync/ActiveSyncSource.cpp
View File

@ -174,48 +174,18 @@ ActiveSyncSource::Databases ActiveSyncSource::getDatabases()
return result;
}
std::string ActiveSyncSource::lookupFolder(std::string folder) {
// If folder matches a collectionId, use that
if (m_collections.find(folder) != m_collections.end()) return folder;
// If folder begins with /, drop it
if (folder[0] == '/') folder.erase(0,1);
// Lookup folder name
if (m_folderPaths.find(folder) != m_folderPaths.end()) return m_folderPaths[folder];
// Not found
return "";
}
void ActiveSyncSource::open()
{
// extract account ID and throw error if missing
std::string username = m_context->getSyncUsername();
std::string folder = getDatabaseID();
SE_LOG_DEBUG(NULL, NULL,
"using eas sync account %s from config %s with folder %s",
"using eas sync account %s from config %s",
username.c_str(),
m_context->getConfigName().c_str(),
folder.c_str());
if (folder.empty()) { // Most common case is empty string
m_folder = folder;
} else { // Lookup folder name
// Try using cached folder list
findCollections(username, false);
m_folder = lookupFolder(folder);
if (m_folder.empty()) {
// Fetch latest folder list and try again
findCollections(username, true);
m_folder = lookupFolder(folder);
}
if (m_folder.empty()) {
throwError("could not find folder: "+folder);
}
}
m_context->getConfigName().c_str());
m_account = username;
m_folder = getDatabaseID();
// create handler
m_handler.set(eas_sync_handler_new(m_account.c_str()), "EAS handler");

1
src/backends/activesync/ActiveSyncSource.h
View File

@ -182,7 +182,6 @@ class ActiveSyncSource :
void setCurrentSyncKey(const std::string &currentSyncKey) { m_currentSyncKey = currentSyncKey; }
void findCollections(const std::string account, bool force_update);
std::string getCollectionPath(const std::string parentId, const std::string name);
std::string lookupFolder(std::string folder);
boost::shared_ptr<ConfigNode> m_itemNode;