Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/Notification.cpp

Issue 5797488346791936: Issue 1107 - Support notifications (Closed)
Left Patch Set: simplify the expression Created Jan. 22, 2015, 7:54 p.m.
Right Patch Set: fix comment Created Jan. 23, 2015, 3:56 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/FilterEngine.cpp ('k') | test/Notification.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <AdblockPlus/JsValue.h> 18 #include <AdblockPlus/JsValue.h>
19 #include <AdblockPlus/JsEngine.h> 19 #include <AdblockPlus/JsEngine.h>
20 #include <AdblockPlus/Notification.h> 20 #include <AdblockPlus/Notification.h>
21 #include <algorithm> 21 #include <algorithm>
22 22
23 using namespace AdblockPlus; 23 using namespace AdblockPlus;
24 24
25 namespace 25 namespace
26 { 26 {
27 typedef std::pair<NotificationType, std::string> NotificationTypeString; 27 typedef std::pair<NotificationType, std::string> NotificationTypeString;
28 typedef std::vector<NotificationTypeString> NotificationTypes; 28 typedef std::vector<NotificationTypeString> NotificationTypes;
29 const NotificationTypes g_notificationTypes = []()->NotificationTypes 29 NotificationTypes InitNotificationTypes()
30 { 30 {
31 NotificationTypes retValue; 31 NotificationTypes retValue;
32 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_QUE STION, "question")); 32 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_QUESTI ON, "question"));
33 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_CRI TICAL, "critical")); 33 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_CRITIC AL, "critical"));
34 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_INF ORMATION, "information")); 34 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_INFORM ATION, "information"));
35 return retValue; 35 return retValue;
36 }(); 36 }
37
38 const NotificationTypes notificationTypes = InitNotificationTypes();
37 39
38 NotificationType StringToNotificationType(const std::string& value) 40 NotificationType StringToNotificationType(const std::string& value)
39 { 41 {
40 auto ii_notificationType = std::find_if(g_notificationTypes.begin(), g_notif icationTypes.end(), 42 struct IsSecondEqualToPredicate
41 [&value](const NotificationTypeString& pair)->bool
42 { 43 {
43 return value == pair.second; 44 std::string value;
44 }); 45 bool operator()(const NotificationTypeString& pair) const
45 if (ii_notificationType == g_notificationTypes.end()) 46 {
47 return value == pair.second;
48 }
49 } findBySecond = {value};
50 NotificationTypes::const_iterator notificationTypeIterator = std::find_if(
51 notificationTypes.begin(), notificationTypes.end(), findBySecond);
52 if (notificationTypeIterator == notificationTypes.end())
46 { 53 {
47 return NotificationType::NOTIFICATION_TYPE_INFORMATION; 54 return NotificationType::NOTIFICATION_TYPE_INFORMATION;
48 } 55 }
49 return ii_notificationType->first; 56 return notificationTypeIterator->first;
50 } 57 }
51 } 58 }
52 59
53 Notification::Notification(const JsValuePtr& jsValue, PrivateCtrArg) 60 Notification::Notification(const JsValuePtr& jsValue)
54 : JsValue(jsValue) 61 : JsValue(jsValue)
55 { 62 {
56 } 63 }
57 64
58 NotificationType Notification::GetType() const 65 NotificationType Notification::GetType() const
59 { 66 {
60 return type; 67 return type;
61 } 68 }
62 69
63 const std::string& Notification::GetTitle() const 70 const std::string& Notification::GetTitle() const
64 { 71 {
65 return title; 72 return title;
66 } 73 }
67 74
68 const std::string& Notification::GetMessageString() const 75 const std::string& Notification::GetMessageString() const
69 { 76 {
70 return message; 77 return message;
71 } 78 }
72 79
73 void Notification::MarkAsShown() 80 void Notification::MarkAsShown()
74 { 81 {
75 JsValueList params; 82 JsValueList params;
76 params.push_back(GetProperty("id")); 83 params.push_back(GetProperty("id"));
77 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params); 84 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
78 } 85 }
79 86
80 NotificationPtr Notification::JsValueToNotification(const JsValuePtr& jsValue) 87 NotificationPtr Notification::JsValueToNotification(const JsValuePtr& jsValue)
81 { 88 {
82 if(!jsValue || !jsValue->IsObject()) 89 if (!jsValue || !jsValue->IsObject())
83 { 90 {
84 return NotificationPtr(); 91 return NotificationPtr();
85 } 92 }
86 93
87 auto notification = std::tr1::make_shared<Notification>(jsValue, PrivateCtrArg ()); 94 NotificationPtr notification(new Notification(jsValue));
88 auto jsType = notification->GetProperty("type"); 95 JsValuePtr jsType = notification->GetProperty("type");
89 notification->type = StringToNotificationType(jsType ? jsType->AsString() : "" ); 96 notification->type = StringToNotificationType(jsType ? jsType->AsString() : "" );
90 97
91 JsValueList params; 98 JsValueList params;
92 params.push_back(notification); 99 params.push_back(notification);
93 JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts") ; 100 JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts") ;
94 auto jsTexts = func->Call(params); 101 JsValuePtr jsTexts = func->Call(params);
95 auto jsTitle = jsTexts->GetProperty("title"); 102 JsValuePtr jsTitle = jsTexts->GetProperty("title");
96 if (jsTitle->IsString()) 103 if (jsTitle->IsString())
97 { 104 {
98 notification->title = jsTitle->AsString(); 105 notification->title = jsTitle->AsString();
99 } 106 }
100 auto jsMessage = jsTexts->GetProperty("message"); 107 JsValuePtr jsMessage = jsTexts->GetProperty("message");
101 if (jsMessage->IsString()) 108 if (jsMessage->IsString())
102 { 109 {
103 notification->message = jsMessage->AsString(); 110 notification->message = jsMessage->AsString();
104 } 111 }
105 return notification; 112 return notification;
106 } 113 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld