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

List:       kde-commits
Subject:    [phoneblocker] frontends/blackberry/headless: Do proper check in block for the block call and sms co
From:       Laszlo Papp <lpapp () kde ! org>
Date:       2015-01-20 9:23:46
Message-ID: E1YDV2I-0003cm-9B () scm ! kde ! org
[Download RAW message or body]

Git commit f92038a25aaf3374d6ac3f4aaf302a534abd533e by Laszlo Papp.
Committed on 20/01/2015 at 09:19.
Pushed by lpapp into branch 'master'.

Do proper check in block for the block call and sms conditions

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

http://commits.kde.org/phoneblocker/f92038a25aaf3374d6ac3f4aaf302a534abd533e

diff --git a/frontends/blackberry/headless/blocker.cpp \
b/frontends/blackberry/headless/blocker.cpp index 0167ddc..c3812f7 100644
--- a/frontends/blackberry/headless/blocker.cpp
+++ b/frontends/blackberry/headless/blocker.cpp
@@ -56,7 +56,8 @@ Blocker::~Blocker()
 void Blocker::block(const QString &phoneNumber, bool call, bool sms)
 {
     if (!m_blockedNumbers.contains(phoneNumber)) {
-        m_blockedNumbers[phoneNumber] = qMakePair(call, sms);
+        QPair<bool, bool> callSmsPair = m_blockedNumbers.value(phoneNumber);
+        m_blockedNumbers[phoneNumber] = qMakePair(call ? call : callSmsPair.first, \
sms ? sms : callSmsPair.second);  QSettings settings(m_authorName, \
                m_applicationName);
         settings.setValue(m_blockedNumbersKey, \
QVariant::fromValue<BlockedNumbers>(m_blockedNumbers));  settings.sync();
@@ -70,7 +71,7 @@ void Blocker::unblock(const QString &phoneNumber, bool call, bool \
sms)  m_blockedNumbers.remove(phoneNumber);
         else {
             QPair<bool, bool> callSmsPair = m_blockedNumbers.value(phoneNumber);
-            if ((callSmsPair.first and call)) or (callSmsPair.second and sms)
+            if ((callSmsPair.first and call) or (callSmsPair.second and sms))
                 m_blockedNumbers.remove(phoneNumber);
             m_blockedNumbers[phoneNumber] = qMakePair(call ? !call : \
callSmsPair.first, sms ? !sms : callSmsPair.second);  }


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