Remove hardcoded path for multiuser support

[platform/core/messaging/msg-service.git] / utils / MsgSpamFilter.cpp

diff --git a/utils/MsgSpamFilter.cpp b/utils/MsgSpamFilter.cpp
index d3f5faa..18c1ca1 100755 (executable)
--- a/utils/MsgSpamFilter.cpp
+++ b/utils/MsgSpamFilter.cpp
@@ -1,11 +1,11 @@
 /*
 * Copyright 2012-2013  Samsung Electronics Co., Ltd
 *
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
-*    http://floralicense.org
+*    http://floralicense.org/license/
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 
 #include "MsgDebug.h"
 #include "MsgUtilFile.h"
+#include "MsgContact.h"
 #include "MsgCppTypes.h"
 #include "MsgGconfWrapper.h"
 #include "MsgSpamFilter.h"
@@ -176,10 +177,22 @@ bool MsgCheckFilter(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsgInfo)
                MSG_DEBUG("pData [%s]", pData);
 
                if (strcasestr(pData, filterValue) != NULL) {
-                       MSG_DEBUG("Msg is Filtered by Subject [%s] Data [%s]", filterValue, pData);
 
-                       bFiltered = true;
-                       break;
+                       MSG_CONTACT_INFO_S contactInfo;
+                       memset(&contactInfo, 0x00, sizeof(MSG_CONTACT_INFO_S));
+
+                       // Get Contact Info
+                       if (MsgGetContactInfo(&(pMsgInfo->addressList[0]), &contactInfo) == MSG_SUCCESS) {
+                               if (contactInfo.contactId > 0) {
+                                       MSG_DEBUG("Msg is Filtered by Subject [%s] Data [%s], but address is in contact. Skip.", filterValue, pData);
+                               } else {
+                                       MSG_DEBUG("Msg is Filtered by Subject [%s] Data [%s]", filterValue, pData);
+                                       bFiltered = true;
+                                       break;
+                               }
+                       } else {
+                               MSG_DEBUG("MsgGetContactInfo() fail.");
+                       }
                }
        }