[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phoneblocker] frontends/blackberry/headless: Check against the call and sms flags in the message an
From:       Laszlo Papp <lpapp () kde ! org>
Date:       2015-01-20 8:49:22
Message-ID: E1YDUV0-0003Sd-En () scm ! kde ! org
[Download RAW message or body]

Git commit 471844e9560731d61da815054fbb928940f689f3 by Laszlo Papp.
Committed on 20/01/2015 at 08:43.
Pushed by lpapp into branch 'master'.

Check against the call and sms flags in the message and call handlers

M  +4    -2    frontends/blackberry/headless/blocker.cpp

http://commits.kde.org/phoneblocker/471844e9560731d61da815054fbb928940f689f3

diff --git a/frontends/blackberry/headless/blocker.cpp \
b/frontends/blackberry/headless/blocker.cpp index c2951c2..f936223 100644
--- a/frontends/blackberry/headless/blocker.cpp
+++ b/frontends/blackberry/headless/blocker.cpp
@@ -144,16 +144,18 @@ void Blocker::checkNewMessage(AccountKey /*account_key*/, \
ConversationKey /*conv  {
     Message message = m_messageService.message(m_smsAccountIdentifier, message_key);
     MessageContact senderMessageContact = message.sender();
+    const QString phoneNumber = senderMessageContact.address();
     // TODO: Add check for m_blockOutsideContactsSmsNumbers and contact list
-    if ((message.mimeType() == MimeTypes::Sms) and message.isInbound() and \
(m_blockAllSmsNumbers or m_blockedNumbers.contains(senderMessageContact.address()))) \
+    if ((message.mimeType() == MimeTypes::Sms) and message.isInbound() and \
(m_blockAllSmsNumbers or (m_blockedNumbers.contains(phoneNumber) and \
m_blockedNumbers.value(phoneNumber).second)))  \
m_messageService.remove(m_smsAccountIdentifier, message_key);  }
 
 void Blocker::checkNewCall(const bb::system::phone::Call &call)
 {
+    const QString phoneNumber = call.phoneNumber();
     // TODO(1): Add check for m_blockOutsideContactsCallNumbers and contact list
     // TODO(2): Add check for m_blockPrivateCallNumbers and private numbers
-    if (m_phone.activeLine().isValid() and \
m_blockedNumbers.contains(call.phoneNumber())) +    if \
(m_phone.activeLine().isValid() and m_blockedNumbers.contains(phoneNumber) and \
m_blockedNumbers.value(phoneNumber).first)  m_phone.endCall(call.callId());
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]