Issue 1107.update1 - read Notification properties (title, message and type) on the fly

src/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 46 matching lines @@
   }
 }
 
 Notification::Notification(const JsValuePtr& jsValue)
   : JsValue(jsValue)
 {
 }
 
 NotificationType Notification::GetType() const
 {
-  return type;
+  return StringToNotificationType(GetProperty("type")->AsString());
 }
 
-const std::string& Notification::GetTitle() const
+NotificationTexts Notification::GetTexts()
 {
-  return title;
-}
-
-const std::string& Notification::GetMessageString() const
-{
-  return message;
+  JsValueList params;
+  params.push_back(shared_from_this());
+  JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(params);
+  NotificationTexts notificationTexts;
+  JsValuePtr jsTitle = jsTexts->GetProperty("title");
+  if (jsTitle->IsString())
+  {
+    notificationTexts.title = jsTitle->AsString();
+  }
+  JsValuePtr jsMessage = jsTexts->GetProperty("message");
+  if (jsMessage->IsString())
+  {
+    notificationTexts.message = jsMessage->AsString();
+  }
+  return notificationTexts;
 }
 
 std::vector<std::string> Notification::GetLinks() const
 {
   std::vector<std::string> retValue;
   JsValuePtr jsLinks = GetProperty("links");
   if (!jsLinks->IsArray())
   {
     return retValue;
   }
   JsValueList urlLinksList = jsLinks->AsList();
   for (JsValueList::const_iterator linkIterator = urlLinksList.begin();
     linkIterator != urlLinksList.end(); ++linkIterator)
   {
     retValue.push_back((*linkIterator)->AsString());
   }
   return retValue;
 }
 
 void Notification::MarkAsShown()
 {
   JsValueList params;
   params.push_back(GetProperty("id"));
   jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
-}
-
-NotificationPtr Notification::JsValueToNotification(const JsValuePtr& jsValue)
-{
-  if (!jsValue || !jsValue->IsObject())
-  {
-    return NotificationPtr();
-  }
-
-  NotificationPtr notification(new Notification(jsValue));
-  JsValuePtr jsType = notification->GetProperty("type");
-  notification->type = StringToNotificationType(jsType ? jsType->AsString() : "");
-
-  JsValueList params;
-  params.push_back(notification);
-  JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts");
-  JsValuePtr jsTexts = func->Call(params);
-  JsValuePtr jsTitle = jsTexts->GetProperty("title");
-  if (jsTitle->IsString())
-  {
-    notification->title = jsTitle->AsString();
-  }
-  JsValuePtr jsMessage = jsTexts->GetProperty("message");
-  if (jsMessage->IsString())
-  {
-    notification->message = jsMessage->AsString();
-  }
-  return notification;
 }