FCL/sf/mw/qtextensions: comparison qtmobility/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 #include <QEventLoop>
 #include <QTimer>
 #include <QDebug>
-const int KRequestTimeout = 30000; // in ms
+#include <centralrepository.h>
+// Telephony Configuration API
+// Keys under this category are used in defining telephony configuration.
+const TUid KCRUidTelConfiguration = {0x102828B8};
+// Amount of digits to be used in contact matching.
+// This allows a customer to variate the amount of digits to be matched.
+const TUint32 KTelMatchDigits                               = 0x00000001;
+// Default match length
+const TInt KDefaultMatchLength(7);
 CntSymbianSimEngineData::CntSymbianSimEngineData()
 :m_simStore(0)
 {
 d->m_simStore = new CntSimStore(this, parameters.value(KParameterKeySimStoreName), error);
 if (*error != QContactManager::NoError) {
 //qDebug() << "Failed to open SIM store" << error;
 return;
 }
-if(d->m_simStore->storeName() == KParameterValueSimStoreNameSdn) {
+// Get phone number match length from cenrep
+d->m_phoneNumberMatchLen = KDefaultMatchLength;
+TRAP_IGNORE(getMatchLengthL(d->m_phoneNumberMatchLen)); // ignore error and use default value
+if(d->m_simStore->storeInfo().m_storeName == KParameterValueSimStoreNameSdn) {
 // In case of SDN store we need to check if any SDN contacts exist to
 // determine if the store is supported or not
-if(d->m_simStore->storeInfo().iUsedEntries == 0)
+if(d->m_simStore->storeInfo().m_usedEntries == 0)
 *error = QContactManager::NotSupportedError;
 }
 }
 CntSymbianSimEngine::CntSymbianSimEngine(const CntSymbianSimEngine &other)
 QContactName name = contact.detail(QContactName::DefinitionName);
 if(!name.customLabel().isEmpty()) {
 return name.customLabel();
 } else {
-// TODO: localize unnamed
+return QString("");
-return QString("Unnamed");
 }
 }
 /*!
 * Saves the contacts to the Etel store. Only part of the contact's details
 *error = QContactManager::NotSupportedError;
 return QMap<QString, QContactDetailDefinition>();
 }
 // Get store information
-TSimStoreInfo storeInfo = d->m_simStore->storeInfo();
+SimStoreInfo storeInfo = d->m_simStore->storeInfo();
 // the map we will eventually return
 QMap<QString, QContactDetailDefinition> retn;
 // local variables for reuse
 def.setFields(fields);
 def.setUnique(true);
 retn.insert(def.name(), def);
 // email support needs to be checked run-time, because it is SIM specific
-#ifndef SYMBIANSIM_BACKEND_PHONEBOOKINFOV1
+if (storeInfo.m_emailSupported) {
-if (storeInfo.iMaxEmailAddr > 0) {
 def.setName(QContactEmailAddress::DefinitionName);
 fields.clear();
 f.setDataType(QVariant::String);
 f.setAllowableValues(QVariantList());
 fields.insert(QContactEmailAddress::FieldEmailAddress, f);
 def.setFields(fields);
 def.setUnique(true);
 retn.insert(def.name(), def);
 }
-#endif
 // phone number
 def.setName(QContactPhoneNumber::DefinitionName);
 fields.clear();
 f.setDataType(QVariant::String);
 f.setAllowableValues(QVariantList());
 fields.insert(QContactPhoneNumber::FieldNumber, f);
 // TODO: subtypes supported in case a sim contact can have multiple phone numbers?
 def.setFields(fields);
-#ifndef SYMBIANSIM_BACKEND_PHONEBOOKINFOV1
+if (storeInfo.m_additionalNumberSupported) {
-if (storeInfo.iMaxAdditionalNumbers > 0) {
 // multiple numbers supported
 def.setUnique(false);
 } else {
 // only one phone number allowed
 def.setUnique(true);
 }
-#else
-// only one phone number allowed
-def.setUnique(true);
-#endif
 retn.insert(def.name(), def);
 // nickname support needs to be checked run-time, because it is SIM specific
-#ifndef SYMBIANSIM_BACKEND_PHONEBOOKINFOV1
+if (storeInfo.m_secondNameSupported) {
-if (storeInfo.iMaxSecondNames > 0) {
 def.setName(QContactNickname::DefinitionName);
 fields.clear();
 f.setDataType(QVariant::String);
 f.setAllowableValues(QVariantList());
 fields.insert(QContactNickname::FieldNickname, f);
 def.setFields(fields);
 def.setUnique(true);
 retn.insert(def.name(), def);
 }
-#endif
 // name
 def.setName(QContactName::DefinitionName);
 fields.clear();
 f.setDataType(QVariant::String);
 // We don't support anything in the ManagerFeature
 return false;
 }
 /*!
+Returns a whether the supplied \a filter can be implemented
+natively by this engine.  If not, the base class implementation
+will emulate the functionality.
+*/
+bool CntSymbianSimEngine::isFilterSupported(const QContactFilter& filter) const
+{
+if (filter.type() == QContactFilter::ContactDetailFilter) {
+QContactDetailFilter f(filter);
+if (f.detailDefinitionName() == QContactPhoneNumber::DefinitionName &&
+f.detailFieldName() == QContactPhoneNumber::FieldNumber &&
+f.matchFlags() == QContactFilter::MatchPhoneNumber)
+return true;
+}
+return false;
+}
+/*!
 * Returns the list of data types supported by the manager
 */
 QStringList CntSymbianSimEngine::supportedContactTypes() const
 {
 // TODO: groups supported by some USIM cards?
 }
 void CntSymbianSimEngine::setReadOnlyAccessConstraint(QContactDetail* detail) const
 {
 setDetailAccessConstraints(detail, QContactDetail::ReadOnly);
+}
+/*!
+Returns true if the supplied contact \a contact matches the supplied filter \a filter.
+*/
+bool CntSymbianSimEngine::filter(const QContactFilter &filter, const QContact &contact)
+{
+// Special handling for phonenumber matching:
+// Matching is done from the right by using a configurable number of digits.
+// Default number of digits is 7. So for example if we filter with number
+// +358505555555 the filter should match to +358505555555 and 0505555555.
+if (filter.type() == QContactFilter::ContactDetailFilter)
+{
+QContactDetailFilter f(filter);
+if (f.detailDefinitionName() == QContactPhoneNumber::DefinitionName &&
+f.detailFieldName() == QContactPhoneNumber::FieldNumber &&
+f.matchFlags() == QContactFilter::MatchPhoneNumber)
+{
+QString matchNumber = f.value().toString().right(d->m_phoneNumberMatchLen);
+QList<QContactPhoneNumber> pns = contact.details<QContactPhoneNumber>();
+foreach (QContactPhoneNumber pn, pns) {
+QString number = pn.number().right(d->m_phoneNumberMatchLen);
+if (number == matchNumber)
+return true;
+}
+return false;
+}
+}
+return QContactManagerEngine::testFilter(filter, contact);
 }
 /*!
 * Executes an asynchronous request so that it will appear synchronous. This is
 * used internally in all synchronous functions. This way we only need to
 // Mimic the way how async requests are normally run
 if (!engine.startRequest(req)) {
 *qtError = QContactManager::LockedError;
 } else {
-if (!engine.waitForRequestFinished(req, KRequestTimeout))
+if (!engine.waitForRequestFinished(req, 0)) // no timeout
-*qtError = QContactManager::UnspecifiedError; // timeout occurred
+*qtError = QContactManager::UnspecifiedError;
 }
 engine.requestDestroyed(req);
 if (req->error())
 *qtError = req->error();
 return (*qtError == QContactManager::NoError);
+}
+/*
+* Get the match length setting used in MatchPhoneNumber type filtering.
+* \a matchLength Phone number digits to be used in matching (counted from
+* right).
+*/
+void CntSymbianSimEngine::getMatchLengthL(int &matchLength)
+{
+//Get number of digits used to match
+CRepository* repository = CRepository::NewL(KCRUidTelConfiguration);
+CleanupStack::PushL(repository);
+User::LeaveIfError(repository->Get(KTelMatchDigits, matchLength));
+CleanupStack::PopAndDestroy(repository);
 }
 QContactManagerEngine* CntSymbianSimFactory::engine(const QMap<QString, QString>& parameters, QContactManager::Error* error)
 {
 CntSymbianSimEngine *engine = new CntSymbianSimEngine(parameters, error);

changeset 14	6fbed849b4f4
parent 5	453da2cfceef