--- a/activityfw/activitydatabase/hsactivitydbclient/src/hsactivitydbclient.cpp Fri May 14 16:10:06 2010 +0300
+++ b/activityfw/activitydatabase/hsactivitydbclient/src/hsactivitydbclient.cpp Thu May 27 13:11:12 2010 +0300
@@ -57,9 +57,13 @@
{
switch (requestType) {
case WaitActivity:
+ if(KErrCancel != result) {
+ waitActivity(QVariantHash());
+ }
if (KErrNone == result) {
emit activityRequested(data);
}
+
break;
}
}
@@ -75,9 +79,8 @@
{
switch (requestType) {
case GetThumbnail:
- if (KErrNone == result) {
- emit thumbnailRequested(pixmap, userData);
- }
+ emit thumbnailRequested(0 == result ? pixmap : QPixmap(),
+ userData);
break;
}
}
@@ -86,6 +89,24 @@
//
// -----------------------------------------------------------------------------
//
+void HsActivityDbClient::asyncRequestCompleated(int result,int requestType)
+{
+ switch(requestType) {
+ case NotifyChange:
+ if (KErrCancel != result) {
+ d_ptr->notifyDataChange();
+ }
+ if (KErrNone == result) {
+ emit dataChanged();
+ }
+ break;
+ }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
int HsActivityDbClient::addActivity(const QVariantHash &activity)
{
return d_ptr->addActivity(activity);
@@ -143,7 +164,11 @@
//
int HsActivityDbClient::waitActivity(const QVariantHash &activity)
{
- return d_ptr->waitActivity(activity);
+ QVariantHash condition(activity);
+ RProcess process;
+ condition.insert(ActivityApplicationKeyword,
+ static_cast<int>(process.SecureId().iId));
+ return d_ptr->waitActivity(condition);
}
// -----------------------------------------------------------------------------
@@ -159,8 +184,16 @@
//
// -----------------------------------------------------------------------------
//
-//int HsActivityDbClient::getThumbnail(const QVariantHash &condition)
int HsActivityDbClient::getThumbnail(QSize size, QString imagePath, QString mimeType, void* userDdata)
{
return d_ptr->getThumbnail(size, imagePath, mimeType, userDdata);
}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+int HsActivityDbClient::notifyDataChange()
+{
+ return d_ptr->notifyDataChange();
+}