[PROJECT] Removing deprecated logs

[Verification] 1) Code compiles
2) Exif package 100% passrate
3) NFC automatic package 100% passrate

Change-Id: I97e40576fa0551905ef84befee2996b93eb678bf
Signed-off-by: Michal Bistyga <m.bistyga@samsung.com>

diff --git a/src/application/application_instance.cc b/src/application/application_instance.cc
index ec77dc8..5b8de1e 100644 (file)
--- a/src/application/application_instance.cc
+++ b/src/application/application_instance.cc
@@ -287,14 +287,14 @@ void ApplicationInstance::AddEventListener(const picojson::value& args, picojson
 
   const std::string& event_name = args.get("name").get<std::string>();
 
-  LOGGER(DEBUG) << "event_name: " << event_name;
+  LoggerD("event_name: %s", event_name.c_str());
 
   JsonCallback cb = [this, args](picojson::value* event) -> void {
     picojson::object& event_o = event->get<picojson::object>();
     event_o["listenerId"] = args.get("listenerId");
-    LOGGER(DEBUG) << event->serialize().c_str();
+    LoggerD("%s", event->serialize().c_str());
     Instance::PostMessage(this, event->serialize().c_str());
-    LOGGER(DEBUG) << event->serialize().c_str();
+    LoggerD("%s", event->serialize().c_str());
   };
 
   PlatformResult result = manager_.StartEventListener(event_name, cb);
@@ -310,7 +310,7 @@ void ApplicationInstance::RemoveEventListener(const picojson::value& args, picoj
 
   const std::string& event_name = args.get("name").get<std::string>();
 
-  LOGGER(DEBUG) << "event_name: " << event_name;
+  LoggerD("event_name: %s", event_name.c_str());
 
   manager_.StopEventListener(event_name);
 }

diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc
index df798f1..d25c838 100644 (file)
--- a/src/application/application_manager.cc
+++ b/src/application/application_manager.cc
@@ -1827,12 +1827,12 @@ void ApplicationManager::BroadcastEventHelper(const picojson::value& args, picoj
 }
 
 void ApplicationManager::OnEvent(const char* event_name, bundle* event_data, void* user_data) {
-  ScopeLogger("Event name is: '%f'", event_name);
+  ScopeLogger("Event name is: '%s'", event_name);
 
   ApplicationManager* manager = static_cast<ApplicationManager*>(user_data);
 
   if (!manager->event_callback_) {
-    LOGGER(DEBUG) << "No event listener registered, skipping.";
+    LoggerD("No event listener registered, skipping.");
     return;
   }
 
@@ -1869,14 +1869,14 @@ void ApplicationManager::OnEvent(const char* event_name, bundle* event_data, voi
     std::string err;
     picojson::parse(data, val, val + strlen(val), &err);
     if (!err.empty()) {
-      LOGGER(ERROR) << "Failed to parse bundle data: " << err;
+      LoggerE("Failed to parse bundle data: %s", err.c_str());
       return;
     }
 
     event_o["data"] = data;
   }
 
-  LOGGER(DEBUG) << "event_name is: " << event_name;
+  LoggerD("event_name is: %s", event_name);
   event_o["name"] = picojson::value(event_name);
 
   manager->event_callback_(&event);
@@ -1902,7 +1902,7 @@ PlatformResult ApplicationManager::StartEventListener(const std::string& event_n
   event_handler_map_[event_name] = event_handler;
 
   event_callback_ = callback;
-  LOGGER(DEBUG) << "event_add_event_handler success";
+  LoggerD("event_add_event_handler success");
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 

diff --git a/src/archive/archive_file.cc b/src/archive/archive_file.cc
index 98df4f9..0f91199 100644 (file)
--- a/src/archive/archive_file.cc
+++ b/src/archive/archive_file.cc
@@ -204,7 +204,8 @@ void ArchiveFile::taskManagerThread(gpointer data, gpointer user_data) {
         delete callback;
         callback = NULL;
       } else if (ErrorCode::NO_ERROR != result.error_code()) {
-        LoggerE("taskManagerThread fails, %d: %s", static_cast<int>(result.error_code()), result.message().c_str());
+        LoggerE("taskManagerThread fails, %d: %s", static_cast<int>(result.error_code()),
+                result.message().c_str());
         callback->setError(result.error_code(), result.message().c_str());
         if (!g_idle_add(callErrorCallback, static_cast<void*>(callback))) {
           LoggerE("g_idle_add fails");

diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc
index 77a2239..ae2745c 100644 (file)
--- a/src/archive/archive_instance.cc
+++ b/src/archive/archive_instance.cc
@@ -85,7 +85,8 @@ ArchiveInstance::~ArchiveInstance() {
 void ArchiveInstance::PostError(const PlatformResult& e, double callback_id) {
   ScopeLogger();
 
-  LoggerE("Posting an error: %d, message: %s", static_cast<int>(e.error_code()), e.message().c_str());
+  LoggerE("Posting an error: %d, message: %s", static_cast<int>(e.error_code()),
+          e.message().c_str());
 
   picojson::value val = picojson::value(picojson::object());
   picojson::object& obj = val.get<picojson::object>();

diff --git a/src/archive/un_zip.cc b/src/archive/un_zip.cc
index 46f9675..9689622 100644 (file)
--- a/src/archive/un_zip.cc
+++ b/src/archive/un_zip.cc
@@ -125,8 +125,8 @@ PlatformResult UnZip::listEntries(unsigned long* decompressedSize,
                                 ("ret: %d", err));
     }
 
-    LoggerD("file: %s | unc size: %lu | comp size: %lu", filename_inzip, file_info.uncompressed_size,
-            file_info.compressed_size);
+    LoggerD("file: %s | unc size: %lu | comp size: %lu", filename_inzip,
+            file_info.uncompressed_size, file_info.compressed_size);
 
     ArchiveFileEntryPtr entry = ArchiveFileEntryPtr(new ArchiveFileEntry());
     entry->setName(filename_inzip);

diff --git a/src/bookmark/bookmark_extension.cc b/src/bookmark/bookmark_extension.cc
index 6f24178..1b0160b 100644 (file)
--- a/src/bookmark/bookmark_extension.cc
+++ b/src/bookmark/bookmark_extension.cc
@@ -39,13 +39,13 @@ BookmarkExtension::BookmarkExtension() {
   SetExtraJSEntryPoints(entry_points);
 
   if (bp_bookmark_adaptor_initialize()) {
-    LOGGER(ERROR) << "Fail: Bookmark not supported";
+    LoggerE("Fail: Bookmark not supported");
   }
 }
 
 BookmarkExtension::~BookmarkExtension() {
   if (bp_bookmark_adaptor_deinitialize()) {
-    LOGGER(ERROR) << "Fail: Deinitialize Bookmark";
+    LoggerE("Fail: Deinitialize Bookmark");
   }
 }
 

diff --git a/src/calendar/calendar_item.cc b/src/calendar/calendar_item.cc
index 6ac5c8c..7e209b4 100644 (file)
--- a/src/calendar/calendar_item.cc
+++ b/src/calendar/calendar_item.cc
@@ -234,7 +234,7 @@ PlatformResult CalendarItem::Remove(int type, int id) {
 
   int ret = calendar_db_delete_record(view_uri.c_str(), id);
   if (CALENDAR_ERROR_NONE != ret) {
-    LOGE("Calendar record delete error");
+    LoggerE("Calendar record delete error");
     return LogAndCreateResult(
         ErrorCode::UNKNOWN_ERR, "Record deletion error",
         ("calendar_db_delete_record error: %d (%s)", ret, get_error_message(ret)));

diff --git a/src/common/tools.cc b/src/common/tools.cc
index 44d9d6a..c1d4998 100644 (file)
--- a/src/common/tools.cc
+++ b/src/common/tools.cc
@@ -62,7 +62,8 @@ void ReportError(const PlatformException& ex, picojson::object& out) {
 }
 
 void ReportError(const PlatformResult& error, picojson::object* out) {
-  LoggerE("PlatformResult: %d, message: %s", static_cast<int>(error.error_code()), error.message().c_str());
+  LoggerE("PlatformResult: %d, message: %s", static_cast<int>(error.error_code()),
+          error.message().c_str());
   out->insert(std::make_pair("status", picojson::value("error")));
   out->insert(std::make_pair("error", error.ToJSON()));
 }

diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index 6722aa5..8a3de66 100644 (file)
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -251,13 +251,13 @@ static void changedContentV1Callback(media_content_error_e error, int pid,
   ScopeLogger("File change callback");
 
   if (error != MEDIA_CONTENT_ERROR_NONE) {
-    LOGGER(ERROR) << "Media content changed callback error: " << error;
+    LoggerE("Media content changed callback error: %d", (int)error);
     return;
   }
 
   if (update_item == MEDIA_ITEM_FILE) {
     if (!uuid) {
-      LOGGER(ERROR) << "Provided uuid is NULL, ignoring";
+      LoggerE("Provided uuid is NULL, ignoring");
       return;
     }
 
@@ -292,7 +292,7 @@ static void changedContentV1Callback(media_content_error_e error, int pid,
     obj["listenerId"] = cbData->args.get("listenerId");
     common::Instance::PostMessage(cbData->instance, result.serialize().c_str());
   } else {
-    LOGGER(DEBUG) << "Media item is not a file, skipping.";
+    LoggerD("Media item is not a file, skipping.");
     return;
   }
 }
@@ -306,13 +306,13 @@ static void changedContentV2Callback(media_content_error_e error, int pid,
   ScopeLogger("Directory change callback");
 
   if (error != MEDIA_CONTENT_ERROR_NONE) {
-    LOGGER(ERROR) << "Media content changed v2 callback error: " << error;
+    LoggerE("Media content changed v2 callback error: %d", (int)error);
     return;
   }
 
   if (update_item == MEDIA_ITEM_DIRECTORY) {
     if (!uuid) {
-      LOGGER(ERROR) << "Provided uuid is NULL, ignoring";
+      LoggerE("Provided uuid is NULL, ignoring");
       return;
     }
 
@@ -347,7 +347,7 @@ static void changedContentV2Callback(media_content_error_e error, int pid,
     obj["listenerId"] = cbData->args.get("listenerId");
     common::Instance::PostMessage(cbData->instance, result.serialize().c_str());
   } else {
-    LOGGER(DEBUG) << "Media item is not directory, skipping.";
+    LoggerD("Media item is not directory, skipping.");
     return;
   }
 }

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index c12e3db..8be9b7a 100644 (file)
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -92,7 +92,7 @@ void ContentToJson(media_info_h info, picojson::object& o) {
   ret = media_info_get_media_type(info, &type);
 
   if (ret != MEDIA_CONTENT_ERROR_NONE) {
-    LOGGER(ERROR) << "Get media type failed: " << ret;
+    LoggerE("Get media type failed: %d", ret);
     type = MEDIA_CONTENT_TYPE_OTHERS;
   }
 
@@ -768,7 +768,7 @@ void ContentManager::find(const std::shared_ptr<ReplyCallbackData>& user_data) {
     std::string query;
     picojson::object argsObject = JsonCast<picojson::object>(user_data->args);
     if (filterMechanism.BuildQuery(FromJson<picojson::object>(argsObject, "filter"), &query)) {
-      LOGGER(DEBUG) << "Filter query: " << query;
+      LoggerD("Filter query: %s", query.c_str());
       ret = media_filter_set_condition(filter, query.c_str(), MEDIA_CONTENT_COLLATE_DEFAULT);
       if (MEDIA_CONTENT_ERROR_NONE != ret) {
         LoggerE("Platform filter setting failed, error %d", ret);
@@ -1379,7 +1379,7 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res
   int ret = METADATA_EXTRACTOR_ERROR_NONE;
   const std::string& contentURI = args.get("contentURI").to_str();
   if (contentURI.empty()) {
-    LOGGER(ERROR) << "contentURI empty - skipping media extractor";
+    LoggerE("contentURI empty - skipping media extractor");
     return -1;
   }
 
@@ -1390,7 +1390,7 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res
 
   ret = metadata_extractor_set_path(extractor, contentURI.c_str());
   if (ret != METADATA_EXTRACTOR_ERROR_NONE) {
-    LOGGER(ERROR) << "metadata_extractor_set_path failed, error: " << ret;
+    LoggerE("metadata_extractor_set_path failed, error: %d", ret);
     return ret;
   }
   picojson::array timestamps;
@@ -1399,7 +1399,7 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res
 
   ret = metadata_extractor_get_metadata(extractor, METADATA_SYNCLYRICS_NUM, &strSyncTextNum);
   if (ret != METADATA_EXTRACTOR_ERROR_NONE) {
-    LOGGER(ERROR) << "Media extractor error " << ret;
+    LoggerE("Media extractor error %d", ret);
     return ret;
   }
 
@@ -1430,7 +1430,7 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res
     if (ret == METADATA_EXTRACTOR_ERROR_NONE) {
       result["type"] = picojson::value(std::string("UNSYNCHRONIZED"));
       if (nullptr == unSyncText) {
-        LOGGER(ERROR) << "Unsynchronized lyrics text is NULL";
+        LoggerE("Unsynchronized lyrics text is NULL");
       }
       texts.push_back(picojson::value(unSyncText ? unSyncText : ""));
       result["texts"] = picojson::value(texts);

diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc
index 77c916a..c0cd6a8 100644 (file)
--- a/src/datacontrol/datacontrol_instance.cc
+++ b/src/datacontrol/datacontrol_instance.cc
@@ -20,10 +20,10 @@
 
 #include <algorithm>
 #include <functional>
+#include <limits>
 #include <map>
 #include <string>
 #include <vector>
-#include <limits>
 
 #include "common/logger.h"
 #include "common/picojson.h"

diff --git a/src/exif/exif_information.cc b/src/exif/exif_information.cc
index e31e176..bb93a75 100644 (file)
--- a/src/exif/exif_information.cc
+++ b/src/exif/exif_information.cc
@@ -542,9 +542,11 @@ void ExifInformation::set(std::string attributeName, const picojson::value& v) {
   }
 }
 
-void ExifInformation::removeNulledAttributesFromExifData(ExifData* exif_data) {
+PlatformResult ExifInformation::removeNulledAttributesFromExifData(ExifData* exif_data) {
   ScopeLogger();
-  AssertMsg(exif_data, "exif_data is NULL");
+  if (!exif_data) {
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "exif_data is NULL");
+  }
 
   if (!isSet(EXIF_INFORMATION_ATTRIBUTE_WIDTH)) {
     LoggerD("Removing width");
@@ -638,6 +640,7 @@ void ExifInformation::removeNulledAttributesFromExifData(ExifData* exif_data) {
     ExifTagSaver::removeExifEntryWithTag(static_cast<ExifTag>(EXIF_TAG_GPS_LONGITUDE_REF),
                                          exif_data);
   }
+  return PlatformResult(ErrorCode::NO_ERROR);
 }
 
 PlatformResult ExifInformation::updateAttributesInExifData(ExifData* exif_data) {
@@ -645,7 +648,9 @@ PlatformResult ExifInformation::updateAttributesInExifData(ExifData* exif_data)
 
   common::PlatformResult ret(common::ErrorCode::NO_ERROR);
 
-  AssertMsg(exif_data, "exif_data is NULL");
+  if (!exif_data) {
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "exif_data is NULL");
+  }
 
   if (isSet(EXIF_INFORMATION_ATTRIBUTE_WIDTH)) {
     LoggerD("Saving width: %lu", getWidth());
@@ -864,7 +869,11 @@ PlatformResult ExifInformation::saveToFile(const std::string& file_path) {
   // If we have created new ExifData there is nothing to remove
   if (!exif_data_is_new) {
     // Remove attributes that have been nulled
-    removeNulledAttributesFromExifData(exif_data);
+    PlatformResult ret = removeNulledAttributesFromExifData(exif_data);
+    if (ret.error_code() != ErrorCode::NO_ERROR) {
+      exif_data_unref(exif_data);
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not remove nulled attribute");
+    }
   }
   result = updateAttributesInExifData(exif_data);
   if (!result) {

diff --git a/src/exif/exif_information.h b/src/exif/exif_information.h
index 01fadad..5ce3802 100644 (file)
--- a/src/exif/exif_information.h
+++ b/src/exif/exif_information.h
@@ -204,7 +204,7 @@ class ExifInformation {
   void set(std::string attributeName, const picojson::value& args);
 
  private:
-  void removeNulledAttributesFromExifData(ExifData* exif_data);
+  common::PlatformResult removeNulledAttributesFromExifData(ExifData* exif_data);
   common::PlatformResult updateAttributesInExifData(ExifData* exif_data);
 
   std::string m_uri;

diff --git a/src/exif/jpeg_file.cc b/src/exif/jpeg_file.cc
index 305dcc3..8136e72 100644 (file)
--- a/src/exif/jpeg_file.cc
+++ b/src/exif/jpeg_file.cc
@@ -320,11 +320,12 @@ common::PlatformResult JpegFile::generateListOfSections() {
       }
 
       if (section_offset + 2 + total_section_len > m_in_data_size) {
-        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid",
-                                  ("offset:%u tag:0x%x | Error: current section offset:%u"
-                                   " + 2 + total_section_len:%ld = %lu is greater then file size:%u",
-                                   offset, cur_marker, section_offset, total_section_len,
-                                   section_offset + total_section_len, m_in_data_size));
+        return LogAndCreateResult(
+            ErrorCode::UNKNOWN_ERR, "JPEG file is invalid",
+            ("offset:%u tag:0x%x | Error: current section offset:%u"
+             " + 2 + total_section_len:%ld = %lu is greater then file size:%u",
+             offset, cur_marker, section_offset, total_section_len,
+             section_offset + total_section_len, m_in_data_size));
       }
 
       if (JPEG_MARKER_APP1 == cur_marker) {
@@ -444,8 +445,9 @@ bool JpegFile::searchForTagInBuffer(const unsigned char* buffer_start,
 
 PlatformResult JpegFile::setNewExifData(ExifData* new_exif_data) {
   ScopeLogger();
-  AssertMsg(new_exif_data, "Trying to set NULL exif_data!");
-
+  if (!new_exif_data) {
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Pointer can not be null!");
+  }
   JpegFileSectionPtr exif = getExifSection();
   if (!exif) {
     LoggerW("Could't find Exif section - creating new one");
@@ -714,7 +716,8 @@ JpegFileSectionPtr JpegFile::getExifSection() {
       } else {
         LoggerW(
             "Warning: found %d APP1/Exif sections -"
-            " only first is currently supported!", num_exif_sections);
+            " only first is currently supported!",
+            num_exif_sections);
       }
     }
   }

diff --git a/src/humanactivitymonitor/humanactivitymonitor_instance.cc b/src/humanactivitymonitor/humanactivitymonitor_instance.cc
index 3799126..e029e7d 100644 (file)
--- a/src/humanactivitymonitor/humanactivitymonitor_instance.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_instance.cc
@@ -82,7 +82,7 @@ PlatformResult HumanActivityMonitorInstance::Init() {
     manager_ = std::make_shared<HumanActivityMonitorManager>();
     const PlatformResult& result = manager_->Init();
     if (!result) {
-      LOGGER(ERROR) << "Error initializing manager: " << result.message();
+      LoggerE("Error initializing manager: %s", result.message().c_str());
       manager_.reset();
       return result;
     }
@@ -166,7 +166,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(const picojs
   JsonCallback cb = [this, listener_id](picojson::value* data) -> void {
     ScopeLogger("Entered into asynchronous function, cb");
     if (!data) {
-      LOGGER(ERROR) << "No data passed to json callback";
+      LoggerE("No data passed to json callback");
       return;
     }
 
@@ -230,7 +230,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerAddActivityRecogni
   JsonCallback cb = [this, listener_id](picojson::value* data) -> void {
     ScopeLogger("Entered into asynchronous function, cb");
     if (!data) {
-      LOGGER(ERROR) << "No data passed to json callback";
+      LoggerE("No data passed to json callback");
       return;
     }
 

diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
index 5604814..88acad9 100644 (file)
--- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@ -487,12 +487,12 @@ class HumanActivityMonitorManager::Monitor::GestureMonitor
     if (handle_) {
       int ret = gesture_stop_recognition(handle_);
       if (GESTURE_ERROR_NONE != ret) {
-        LOGGER(ERROR) << "Failed to stop WRIST_UP detection, error: " << ret;
+        LoggerE("Failed to stop WRIST_UP detection, error: %d", ret);
       }
 
       ret = gesture_release(handle_);
       if (GESTURE_ERROR_NONE != ret) {
-        LOGGER(ERROR) << "Failed to release WRIST_UP handle, error: " << ret;
+        LoggerE("Failed to release WRIST_UP handle, error: %d", ret);
       }
 
       handle_ = nullptr;
@@ -512,7 +512,7 @@ class HumanActivityMonitorManager::Monitor::GestureMonitor
     auto& callback = monitor->event_callback();
 
     if (!callback) {
-      LOGGER(ERROR) << "No WRIST_UP event callback registered, skipping.";
+      LoggerE("No WRIST_UP event callback registered, skipping.");
       return;
     }
 
@@ -772,7 +772,7 @@ class HumanActivityMonitorManager::Monitor::SensorMonitor
     auto& callback = monitor->event_callback();
 
     if (!callback) {
-      LOGGER(ERROR) << "No sensor event callback registered, skipping.";
+      LoggerE("No sensor event callback registered, skipping.");
       return;
     }
 
@@ -780,7 +780,7 @@ class HumanActivityMonitorManager::Monitor::SensorMonitor
 
     auto result = monitor->converter_(event, &sensor_data.get<picojson::object>());
     if (!result) {
-      LOGGER(ERROR) << "Failed to convert sensor data: " << result.message();
+      LoggerE("Failed to convert sensor data: %s", result.message().c_str());
       return;
     }
 
@@ -1054,12 +1054,12 @@ class HumanActivityMonitorManager::Monitor::GpsMonitor
     auto& callback = monitor->event_callback();
 
     if (!callback) {
-      LOGGER(ERROR) << "No GPS event callback registered, skipping.";
+      LoggerE("No GPS event callback registered, skipping.");
       return;
     }
 
     if (0 == num_of_location) {
-      LOGGER(ERROR) << "No GPS locations available, skipping.";
+      LoggerE("No GPS locations available, skipping.");
       return;
     }
 
@@ -1067,7 +1067,7 @@ class HumanActivityMonitorManager::Monitor::GpsMonitor
     int ret = location_manager_foreach_location_batch(monitor->handle_, ConvertGpsEvent,
                                                       &gps_info.get<picojson::array>());
     if (LOCATIONS_ERROR_NONE != ret) {
-      LOGGER(ERROR) << "Failed to convert location, error: " << ret;
+      LoggerE("Failed to convert location, error: %d", ret);
       return;
     }
 
@@ -1342,7 +1342,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager()
     auto& diffs =
         data->insert(std::make_pair(kStepCountDifferences, picojson::value{picojson::array{}}))
             .first->second.get<picojson::array>();
-    LOGGER(DEBUG) << "  pedometer_data->diffs_coun: " << pedometer_data->diffs_count;
+    LoggerD("pedometer_data->diffs_count: %d", pedometer_data->diffs_count);
     if (pedometer_data->diffs_count > 0) {
       for (int i = 0; i < pedometer_data->diffs_count; ++i) {
         InsertStepDifference(pedometer_data->diffs[i].steps,
@@ -1362,17 +1362,17 @@ HumanActivityMonitorManager::HumanActivityMonitorManager()
   auto convert_hrm = [](sensor_event_s* event, picojson::object* data) -> PlatformResult {
     ScopeLogger("Entered into asynchronous function, convert_hrm");
 
-    LOGGER(DEBUG) << "Sensor event:";
-    LOGGER(DEBUG) << "  |- accuracy: " << event->accuracy;
-    LOGGER(DEBUG) << "  |- timestamp: " << event->timestamp;
-    LOGGER(DEBUG) << "  |- value_count: " << event->value_count;
+    LoggerD("Sensor event:");
+    LoggerD("|- accuracy: %d", event->accuracy);
+    LoggerD("|- timestamp: %llu", event->timestamp);
+    LoggerD("|- value_count: %d", event->value_count);
 
     if (event->value_count < 2) {
       return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "To few values of HRM event");
     }
 
-    LOGGER(DEBUG) << "  |- values[0]: " << event->values[0];
-    LOGGER(DEBUG) << "  |- values[1]: " << event->values[1];
+    LoggerD("|- values[0]: %f", event->values[0]);
+    LoggerD("|- values[1]: %f", event->values[1]);
 
     float hr = floor(event->values[0] + 0.5);  // heart beat rate 0 ~ 220 integer (bpm)
 

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
index 55dccb2..99ca583 100644 (file)
--- a/src/mediacontroller/mediacontroller_client.cc
+++ b/src/mediacontroller/mediacontroller_client.cc
@@ -40,7 +40,7 @@ MediaControllerClient::~MediaControllerClient() {
   if (handle_) {
     int ret = mc_client_destroy(handle_);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-      LOGGER(ERROR) << "Unable to destroy media controller client";
+      LoggerE("Unable to destroy media controller client");
     }
   }
 }
@@ -72,12 +72,12 @@ PlatformResult MediaControllerClient::FindServers(picojson::array* servers) {
   picojson::value latest_server = picojson::value();
   PlatformResult result = GetLatestServerInfo(&latest_server);
   if (!result) {
-    LOGGER(ERROR) << "GetLatestServerInfo failed, error: " << result.message();
+    LoggerE("GetLatestServerInfo failed, error: %s", result.message().c_str());
     return result;
   }
 
   if (latest_server.is<picojson::null>()) {
-    LOGGER(DEBUG) << "No latest server available";
+    LoggerD("No latest server available");
     return PlatformResult(ErrorCode::NO_ERROR);
   }
 
@@ -127,7 +127,7 @@ PlatformResult MediaControllerClient::GetLatestServerInfo(picojson::value* serve
   }
 
   if (!name) {
-    LOGGER(DEBUG) << "No active server available";
+    LoggerD("No active server available");
     return PlatformResult(ErrorCode::NO_ERROR);
   }
 
@@ -135,7 +135,7 @@ PlatformResult MediaControllerClient::GetLatestServerInfo(picojson::value* serve
   PlatformResult result = Types::PlatformEnumToString(Types::kMediaControllerServerState,
                                                       static_cast<int>(state), &state_str);
   if (!result) {
-    LOGGER(ERROR) << "PlatformEnumToString failed, error: " << result.message();
+    LoggerE("PlatformEnumToString failed, error: %s", result.message().c_str());
     return result;
   }
 
@@ -168,7 +168,7 @@ PlatformResult MediaControllerClient::GetPlaybackInfo(const std::string& server_
   std::string state;
   PlatformResult result = Types::ConvertPlaybackState(playback_h, &state);
   if (!result) {
-    LOGGER(ERROR) << "ConvertPlaybackState failed, error: " << result.message();
+    LoggerE("ConvertPlaybackState failed, error: %s", result.message().c_str());
     return result;
   }
 
@@ -176,7 +176,7 @@ PlatformResult MediaControllerClient::GetPlaybackInfo(const std::string& server_
   double position;
   result = Types::ConvertPlaybackPosition(playback_h, &position);
   if (!result) {
-    LOGGER(ERROR) << "ConvertPlaybackPosition failed, error: " << result.message();
+    LoggerE("ConvertPlaybackPosition failed, error: %s", result.message().c_str());
     return result;
   }
 
@@ -275,7 +275,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name, mc_ser
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->server_status_listener_) {
-    LOGGER(DEBUG) << "No server status listener registered, skipping";
+    LoggerD("No server status listener registered, skipping");
     return;
   }
 
@@ -284,7 +284,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name, mc_ser
   PlatformResult result = Types::PlatformEnumToString(Types::kMediaControllerServerState,
                                                       static_cast<int>(state), &state_str);
   if (!result) {
-    LOGGER(ERROR) << "PlatformEnumToString failed, error: " << result.message();
+    LoggerE("PlatformEnumToString failed, error: %s", result.message().c_str());
     return;
   }
 
@@ -360,7 +360,7 @@ PlatformResult MediaControllerClient::SetPlaybackInfoListener(JsonCallback callb
 
     ret = mc_client_unset_metadata_update_cb(handle_);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-      LOGGER(ERROR) << "Unable to unregister metadata listener, error: " << ret;
+      LoggerE("Unable to unregister metadata listener, error: %d", ret);
       return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unable to unregister metadata listener",
                                 ("mc_client_unset_metadata_update_cb() error: %d, message: %s", ret,
                                  get_error_message(ret)));
@@ -376,7 +376,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char* server_name, mc_playbac
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
-    LOGGER(DEBUG) << "No playback info listener registered, skipping";
+    LoggerD("No playback info listener registered, skipping");
     return;
   }
 
@@ -384,7 +384,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char* server_name, mc_playbac
   std::string state;
   PlatformResult result = Types::ConvertPlaybackState(playback, &state);
   if (!result) {
-    LOGGER(ERROR) << "ConvertPlaybackState failed, error: " << result.message();
+    LoggerE("ConvertPlaybackState failed, error: %s", result.message().c_str());
     return;
   }
 
@@ -392,7 +392,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char* server_name, mc_playbac
   double position;
   result = Types::ConvertPlaybackPosition(playback, &position);
   if (!result) {
-    LOGGER(ERROR) << "ConvertPlaybackPosition failed, error: " << result.message();
+    LoggerE("ConvertPlaybackPosition failed, error: %s", result.message().c_str());
     return;
   }
 
@@ -413,7 +413,7 @@ void MediaControllerClient::OnShuffleModeUpdate(const char* server_name, mc_shuf
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
-    LOGGER(DEBUG) << "No playback info listener registered, skipping";
+    LoggerD("No playback info listener registered, skipping");
     return;
   }
 
@@ -433,7 +433,7 @@ void MediaControllerClient::OnRepeatModeUpdate(const char* server_name, mc_repea
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
-    LOGGER(DEBUG) << "No playback info listener registered, skipping";
+    LoggerD("No playback info listener registered, skipping");
     return;
   }
 
@@ -453,7 +453,7 @@ void MediaControllerClient::OnMetadataUpdate(const char* server_name, mc_metadat
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
-    LOGGER(DEBUG) << "No playback info listener registered, skipping";
+    LoggerD("No playback info listener registered, skipping");
     return;
   }
 
@@ -463,7 +463,7 @@ void MediaControllerClient::OnMetadataUpdate(const char* server_name, mc_metadat
   picojson::value metadata = picojson::value(picojson::object());
   PlatformResult result = Types::ConvertMetadata(metadata_h, &metadata.get<picojson::object>());
   if (!result) {
-    LOGGER(ERROR) << "ConvertMetadata failed, error: " << result.message();
+    LoggerE("ConvertMetadata failed, error: ", result.message().c_str());
     return;
   }
 
@@ -531,7 +531,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name, int result_c
 
   ret = bundle_get_str(bundle, "replyId", &reply_id_str);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-    LOGGER(ERROR) << "bundle_get_str(replyId) failed, error: " << ret;
+    LoggerE("bundle_get_str(replyId) failed, error: %d", ret);
     return;
   }
 
@@ -539,7 +539,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name, int result_c
 
   ret = bundle_get_str(bundle, "data", &data_str);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-    LOGGER(ERROR) << "bundle_get_str(data) failed, error: " << ret;
+    LoggerE("bundle_get_str(data) failed, error: %d", ret);
     return;
   }
 
@@ -547,7 +547,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name, int result_c
   std::string err;
   picojson::parse(data, data_str, data_str + strlen(data_str), &err);
   if (!err.empty()) {
-    LOGGER(ERROR) << "Failed to parse bundle data: " << err;
+    LoggerE("Failed to parse bundle data: %s", err.c_str());
     return;
   }
   reply_o["data"] = data;

diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index 6f2a961..5baaaa4 100644 (file)
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -250,7 +250,7 @@ void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoL
 
   JsonCallback callback = [this, args](picojson::value* data) -> void {
     if (!data) {
-      LOGGER(ERROR) << "No data passed to json callback";
+      LoggerE("No data passed to json callback");
       return;
     }
 
@@ -615,7 +615,7 @@ void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeList
 
   JsonCallback callback = [this, args](picojson::value* data) -> void {
     if (nullptr == data) {
-      LOGGER(ERROR) << "No data passed to json callback";
+      LoggerE("No data passed to json callback");
       return;
     }
 
@@ -655,7 +655,7 @@ void MediaControllerInstance::MediaControllerServerInfoAddPlaybackInfoChangeList
 
   JsonCallback callback = [this, args](picojson::value* data) -> void {
     if (!data) {
-      LOGGER(ERROR) << "No data passed to json callback";
+      LoggerE("No data passed to json callback");
       return;
     }
 

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
index bd88e3f..0c4d811 100644 (file)
--- a/src/mediacontroller/mediacontroller_server.cc
+++ b/src/mediacontroller/mediacontroller_server.cc
@@ -48,12 +48,12 @@ MediaControllerServer::~MediaControllerServer() {
     int ret;
     ret = mc_server_unset_custom_command_received_cb(handle_);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-      LOGGER(ERROR) << "Unable to unset command callback, error: " << ret;
+      LoggerE("Unable to unset command callback, error: %d", ret);
     }
 
     ret = mc_server_destroy(handle_);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-      LOGGER(ERROR) << "mc_server_destroy() failed, error: " << ret;
+      LoggerE("mc_server_destroy() failed, error: %d", ret);
     }
   }
 }
@@ -198,13 +198,13 @@ void MediaControllerServer::OnCommandReceived(const char* client_name, const cha
 
   ret = bundle_get_str(bundle, "data", &data_str);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-    LOGGER(ERROR) << "bundle_get_str(data) failed, error: " << ret;
+    LoggerE("bundle_get_str(data) failed, error: %d", ret);
     return;
   }
 
   ret = bundle_get_str(bundle, "replyId", &reply_id_str);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-    LOGGER(ERROR) << "bundle_get_str(replyId) failed, error: " << ret;
+    LoggerE("bundle_get_str(replyId) failed, error: %d", ret);
     return;
   }
 
@@ -212,7 +212,7 @@ void MediaControllerServer::OnCommandReceived(const char* client_name, const cha
   std::string err;
   picojson::parse(data, data_str, data_str + strlen(data_str), &err);
   if (!err.empty()) {
-    LOGGER(ERROR) << "Failed to parse bundle data: " << err;
+    LoggerE("Failed to parse bundle data: %d", err);
     return;
   }
 
@@ -330,7 +330,7 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name,
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
-    LOGGER(DEBUG) << "No change request playback info listener registered, skipping";
+    LoggerD("No change request playback info listener registered, skipping");
     return;
   }
 
@@ -338,7 +338,7 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name,
   PlatformResult result = Types::PlatformEnumToString(Types::kMediaControllerPlaybackState,
                                                       static_cast<int>(state_e), &state);
   if (!result) {
-    LOGGER(ERROR) << "PlatformEnumToString failed, error: " << result.message();
+    LoggerE("PlatformEnumToString failed, error: %s", result.message().c_str());
     return;
   }
 
@@ -359,7 +359,7 @@ void MediaControllerServer::OnPlaybackPositionCommand(const char* client_name,
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
-    LOGGER(DEBUG) << "No change request playback info listener registered, skipping";
+    LoggerD("No change request playback info listener registered, skipping");
     return;
   }
 
@@ -379,7 +379,7 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shu
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
-    LOGGER(DEBUG) << "No change request playback info listener registered, skipping";
+    LoggerD("No change request playback info listener registered, skipping");
     return;
   }
 
@@ -399,7 +399,7 @@ void MediaControllerServer::OnRepeatModeCommand(const char* client_name, mc_repe
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
-    LOGGER(DEBUG) << "No change request playback info listener registered, skipping";
+    LoggerD("No change request playback info listener registered, skipping");
     return;
   }
 

diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc
index a08aeff..f56c431 100644 (file)
--- a/src/mediacontroller/mediacontroller_types.cc
+++ b/src/mediacontroller/mediacontroller_types.cc
@@ -143,7 +143,7 @@ PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h, std::string
   PlatformResult result = Types::PlatformEnumToString(Types::kMediaControllerPlaybackState,
                                                       static_cast<int>(state_e), state);
   if (!result) {
-    LOGGER(ERROR) << "PlatformEnumToString failed, error: " << result.message();
+    LoggerE("PlatformEnumToString failed, error: %s", result.message().c_str());
     return result;
   }
 
@@ -175,7 +175,7 @@ PlatformResult Types::ConvertMetadata(mc_metadata_h metadata_h, picojson::object
   PlatformResult result =
       GetPlatformEnumMap(Types::kMediaControllerMetadataAttribute, &metadata_fields);
   if (!result) {
-    LOGGER(ERROR) << "GetPlatformEnumMap failed, error: " << result.message();
+    LoggerE("GetPlatformEnumMap failed, error: %s", result.message().c_str());
     return result;
   }
 

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index 58b3f46..c11c940 100644 (file)
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -65,7 +65,13 @@ void HCEEventCallback(nfc_se_h handle, nfc_hce_event_type_e event_type, unsigned
   // HCE Event Data
   picojson::value event_data = picojson::value(picojson::object());
   picojson::object& event_data_obj = event_data.get<picojson::object>();
-  event_data_obj[JSON_EVENT_TYPE] = picojson::value(NFCUtil::ToStr(event_type));
+  std::string event_type_str;
+  PlatformResult ret = NFCUtil::ToStr(event_type, &event_type_str);
+  if (!ret) {
+    LoggerE("ToStr method returned error. Error code: [%d]", (int)ret.error_code());
+    return;
+  }
+  event_data_obj[JSON_EVENT_TYPE] = picojson::value(event_type_str);
   event_data_obj[JSON_APDU] = picojson::value(NFCUtil::FromUCharArray(apdu, apdu_len));
   event_data_obj[JSON_LENGTH] = picojson::value(static_cast<double>(apdu_len));
   tools::ReportSuccess(event_data, response_obj);
@@ -141,7 +147,6 @@ void NFCAdapter::SetResponder(IResponder* responder) {
 void NFCAdapter::RespondAsync(const char* msg) {
   ScopeLogger();
   if (GetInstance()->responder_) {
-    AssertMsg(GetInstance()->responder_, "Handler variable should be set");
     GetInstance()->responder_->RespondAsync(msg);
   } else {
     LoggerE("Ignoring, instance does not exist");
@@ -614,7 +619,9 @@ PlatformResult NFCAdapter::RemoveTransactionEventListener(const picojson::value&
     nfc_manager_unset_se_transaction_event_cb(se_type);
     m_is_transaction_hce_listener_set = false;
   } else {
-    AssertMsg(false, "Invalid NFC SecureElement type");
+    return LogAndCreateResult(
+        ErrorCode::UNKNOWN_ERR, "Invalid NFC SecureElement type",
+        ("NFC SecureElement type has not an expected value. Passed value is %d", (int)se_type));
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
@@ -1388,8 +1395,10 @@ void NFCAdapter::SendHostAPDUResponse(const UCharVector& apdu,
 PlatformResult NFCAdapter::IsActivatedHandlerForAID(const std::string& type, const std::string& aid,
                                                     bool* is_activated_handler) {
   ScopeLogger();
-  AssertMsg(is_activated_handler, "Poiner can not be null!");
 
+  if (!is_activated_handler) {
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Pointer can not be null!");
+  }
   nfc_se_type_e se_type;
   PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type);
   if (!result.IsError()) {
@@ -1409,8 +1418,10 @@ PlatformResult NFCAdapter::IsActivatedHandlerForCategory(
     const std::string& type, nfc_card_emulation_category_type_e category,
     bool* is_activated_handler) {
   ScopeLogger();
-  AssertMsg(is_activated_handler, "Poiner can not be null!");
 
+  if (!is_activated_handler) {
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Pointer can not be null!");
+  }
   nfc_se_type_e se_type;
   PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type);
   if (!result.IsError()) {
@@ -1464,11 +1475,19 @@ PlatformResult NFCAdapter::UnregisterAID(const std::string& type, const std::str
 
 static void SaveRow(nfc_se_type_e se_type, const char* aid, bool read_only, void* user_data) {
   ScopeLogger();
-  AssertMsg(aid, "Poiner can not be null!");
-  AssertMsg(user_data, "Poiner can not be null!");
+  if (!aid || !user_data) {
+    LoggerE("Aid or user_data are empty. Returning");
+    return;
+  }
   AIDDataVector* aids = static_cast<AIDDataVector*>(user_data);
   std::string aid_str = std::string(aid);
-  aids->push_back(AIDData(std::string(NFCUtil::ToStr(se_type)), aid_str, read_only));
+  std::string se_type_str;
+  PlatformResult ret = NFCUtil::ToStr(se_type, &se_type_str);
+  if (!ret) {
+    LoggerE("ToStr method returned error. Error code: [%d]", (int)ret.error_code());
+    return;
+  }
+  aids->push_back(AIDData(se_type_str, aid_str, read_only));
 };
 
 void NFCAdapter::GetAIDsForCategory(const std::string& type,

diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index 3727407..f152b5a 100644 (file)
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -901,11 +901,16 @@ void NFCInstance::IsActivatedHandlerForCategory(const picojson::value& args,
   CHECK_EXIST(args, JSON_TYPE, out);
   CHECK_EXIST(args, JSON_CATEGORY, out);
 
-  nfc_card_emulation_category_type_e category =
-      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>());
+  nfc_card_emulation_category_type_e category;
+  PlatformResult result =
+      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>(), &category);
+  if (result.IsError()) {
+    LogAndReportError(result, &out);
+    return;
+  }
   bool is_activated_handler = false;
 
-  PlatformResult result = NFCAdapter::GetInstance()->IsActivatedHandlerForCategory(
+  result = NFCAdapter::GetInstance()->IsActivatedHandlerForCategory(
       args.get(JSON_TYPE).get<std::string>(), category, &is_activated_handler);
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(is_activated_handler), out);
@@ -922,11 +927,16 @@ void NFCInstance::RegisterAID(const picojson::value& args, picojson::object& out
   CHECK_EXIST(args, JSON_AID, out);
   CHECK_EXIST(args, JSON_CATEGORY, out);
 
-  nfc_card_emulation_category_type_e category =
-      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>());
+  nfc_card_emulation_category_type_e category;
+  PlatformResult result =
+      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>(), &category);
+  if (result.IsError()) {
+    LogAndReportError(result, &out);
+    return;
+  }
 
-  PlatformResult result = NFCAdapter::GetInstance()->RegisterAID(
-      args.get(JSON_TYPE).get<std::string>(), args.get(JSON_AID).get<std::string>(), category);
+  result = NFCAdapter::GetInstance()->RegisterAID(args.get(JSON_TYPE).get<std::string>(),
+                                                  args.get(JSON_AID).get<std::string>(), category);
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
@@ -941,11 +951,15 @@ void NFCInstance::UnregisterAID(const picojson::value& args, picojson::object& o
   CHECK_EXIST(args, JSON_TYPE, out);
   CHECK_EXIST(args, JSON_AID, out);
   CHECK_EXIST(args, JSON_CATEGORY, out);
+  nfc_card_emulation_category_type_e category;
+  PlatformResult result =
+      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>(), &category);
+  if (result.IsError()) {
+    LogAndReportError(result, &out);
+    return;
+  }
 
-  nfc_card_emulation_category_type_e category =
-      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>());
-
-  PlatformResult result = NFCAdapter::GetInstance()->UnregisterAID(
+  result = NFCAdapter::GetInstance()->UnregisterAID(
       args.get(JSON_TYPE).get<std::string>(), args.get(JSON_AID).get<std::string>(), category);
   if (result.IsSuccess()) {
     ReportSuccess(out);
@@ -961,8 +975,13 @@ void NFCInstance::GetAIDsForCategory(const picojson::value& args, picojson::obje
   CHECK_EXIST(args, JSON_TYPE, out);
   CHECK_EXIST(args, JSON_CATEGORY, out);
   const std::string& type = args.get(JSON_TYPE).get<std::string>();
-  nfc_card_emulation_category_type_e required_category =
-      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>());
+  nfc_card_emulation_category_type_e required_category;
+  PlatformResult result =
+      NFCUtil::StringToCategory(args.get(JSON_CATEGORY).get<std::string>(), &required_category);
+  if (result.IsError()) {
+    LogAndReportError(result, &out);
+    return;
+  }
   const double& callback_id = args.get(JSON_CALLBACK_ID).get<double>();
 
   auto success_cb = [this, callback_id](const AIDDataVector& data) -> void {

diff --git a/src/nfc/nfc_util.cc b/src/nfc/nfc_util.cc
index 45aa3a5..3718a34 100644 (file)
--- a/src/nfc/nfc_util.cc
+++ b/src/nfc/nfc_util.cc
@@ -295,46 +295,68 @@ void NFCUtil::setDefaultFilterValues(std::vector<nfc_tag_type_e>& filter) {
 }
 
 // Convertion of enum to HCEEventType(characters sequence).
-const char* NFCUtil::ToStr(nfc_hce_event_type_e event_type) {
+PlatformResult NFCUtil::ToStr(nfc_hce_event_type_e event_type, std::string* result_type) {
   ScopeLogger();
   switch (event_type) {
     case NFC_HCE_EVENT_DEACTIVATED:
-      return "DEACTIVATED";
+      *result_type = "DEACTIVATED";
+      break;
     case NFC_HCE_EVENT_ACTIVATED:
-      return "ACTIVATED";
+      *result_type = "ACTIVATED";
+      break;
     case NFC_HCE_EVENT_APDU_RECEIVED:
-      return "APDU_RECEIVED";
+      *result_type = "APDU_RECEIVED";
+      break;
     default:
-      AssertMsg(false, "That event type is incorrect.");
+      return LogAndCreateResult(
+          ErrorCode::UNKNOWN_ERR, "That event type is incorrect.",
+          ("Event has not an expected value. Passed value is %d", (int)event_type));
   }
+  return PlatformResult(ErrorCode::NO_ERROR);
 }
 
 // Convertion of enum to SecureElementType(characters sequence).
 // Warning! DISABLE and SDCARD are not mentioned at widl spec.
-const char* NFCUtil::ToStr(nfc_se_type_e se_type) {
+PlatformResult NFCUtil::ToStr(nfc_se_type_e se_type, std::string* result_type) {
   ScopeLogger();
   switch (se_type) {
     case NFC_SE_TYPE_DISABLE:
-      return "DISABLE";
+      *result_type = "DISABLE";
+      break;
     case NFC_SE_TYPE_ESE:
-      return "ESE";
+      *result_type = "ESE";
+      break;
     case NFC_SE_TYPE_UICC:
-      return "UICC";
+      *result_type = "UICC";
+      break;
     case NFC_SE_TYPE_SDCARD:
-      return "SDCARD";
+      *result_type = "SDCARD";
+      break;
     case NFC_SE_TYPE_HCE:
-      return "HCE";
+      *result_type = "HCE";
+      break;
     default:
-      AssertMsg(false, "That event type is incorrect.");
+      return LogAndCreateResult(
+          ErrorCode::UNKNOWN_ERR, "That event type is incorrect.",
+          ("Event has not an expected value. Passed value is %d", (int)se_type));
   }
+  return PlatformResult(ErrorCode::NO_ERROR);
 }
 
 // Convertion CardEmulationCategoryType(characters sequence) to enum.
-nfc_card_emulation_category_type_e NFCUtil::StringToCategory(const std::string& category_type) {
+PlatformResult NFCUtil::StringToCategory(const std::string& category_type,
+                                         nfc_card_emulation_category_type_e* result_type) {
   ScopeLogger();
-  if (category_type == "PAYMENT") return NFC_CARD_EMULATION_CATEGORY_PAYMENT;
-  if (category_type == "OTHER") return NFC_CARD_EMULATION_CATEGORY_OTHER;
-  AssertMsg(false, "That category type is incorrect.");
+  if (category_type == "PAYMENT") {
+    *result_type = NFC_CARD_EMULATION_CATEGORY_PAYMENT;
+  } else if (category_type == "OTHER") {
+    *result_type = NFC_CARD_EMULATION_CATEGORY_OTHER;
+  } else {
+    return LogAndCreateResult(
+        ErrorCode::UNKNOWN_ERR, "That category type is incorrect.",
+        ("Category has not an expected value. Passed value is %s", category_type.c_str()));
+  }
+  return PlatformResult(ErrorCode::NO_ERROR);
 }
 
 unsigned char* NFCUtil::DoubleArrayToUCharArray(const picojson::array& array_in) {

diff --git a/src/nfc/nfc_util.h b/src/nfc/nfc_util.h
index a08b2ad..b3f8039 100644 (file)
--- a/src/nfc/nfc_util.h
+++ b/src/nfc/nfc_util.h
@@ -76,9 +76,10 @@ class NFCUtil {
   static common::PlatformResult ToSecureElementType(const std::string& type_string,
                                                     nfc_se_type_e* type);
   static void setDefaultFilterValues(std::vector<nfc_tag_type_e>& filter);
-  static const char* ToStr(nfc_hce_event_type_e event_type);
-  static const char* ToStr(nfc_se_type_e se_type);
-  static nfc_card_emulation_category_type_e StringToCategory(const std::string& category_type);
+  static common::PlatformResult ToStr(nfc_hce_event_type_e event_type, std::string* result_type);
+  static common::PlatformResult ToStr(nfc_se_type_e se_type, std::string* result_type);
+  static common::PlatformResult StringToCategory(const std::string& category_type,
+                                                 nfc_card_emulation_category_type_e* result_type);
   static unsigned char* DoubleArrayToUCharArray(const picojson::array& array_in);
   static UCharVector DoubleArrayToUCharVector(const picojson::array& array_in);
   static picojson::array FromUCharArray(unsigned char* array, unsigned int apdu_len);

diff --git a/src/notification/common_notification.h b/src/notification/common_notification.h
index 9ec9ed0..7bb17c4 100644 (file)
--- a/src/notification/common_notification.h
+++ b/src/notification/common_notification.h
@@ -40,8 +40,8 @@ const std::string kProgressTypeByte = "BYTE";
 typedef std::map<int, notification_text_type_e> InformationEnumMap;
 typedef std::map<int, notification_image_type_e> ImageEnumMap;
 
-typedef std::function<common::PlatformResult(const picojson::value& noti_val,
-                                             bool is_update, notification_h* noti_handle)>
+typedef std::function<common::PlatformResult(const picojson::value& noti_val, bool is_update,
+                                             notification_h* noti_handle)>
     GetHandleFromJsonFun;
 
 class CommonNotification {

diff --git a/src/power/power_manager.cc b/src/power/power_manager.cc
index cf50a59..ed1a2a6 100644 (file)
--- a/src/power/power_manager.cc
+++ b/src/power/power_manager.cc
@@ -115,7 +115,7 @@ void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value,
       if (object->set_custom_brightness_ == true) {
         PlatformResult result = object->RestoreScreenBrightness();
         if (result.IsError()) {
-          LOGGER(ERROR) << "RestoreScreenBrightness failed";
+          LoggerE("RestoreScreenBrightness failed");
           return;
         }
         object->set_custom_brightness_ = false;
@@ -481,7 +481,7 @@ void PowerManager::BroadcastScreenState(PowerState current) {
     if (prev_state == POWER_STATE_SCREEN_DIM) {
       PlatformResult result = RestoreSettedBrightness();
       if (result.IsError()) {
-        LOGGER(ERROR) << "Error restore custom brightness " << result.message();
+        LoggerE("Error restore custom brightness %s", result.message().c_str());
       }
     } else if (prev_state == POWER_STATE_SCREEN_OFF) {
       should_be_read_from_cache_ = false;

diff --git a/src/systeminfo/systeminfo_manager.cc b/src/systeminfo/systeminfo_manager.cc
index 35e8043..d411091 100644 (file)
--- a/src/systeminfo/systeminfo_manager.cc
+++ b/src/systeminfo/systeminfo_manager.cc
@@ -1045,11 +1045,11 @@ PlatformResult SysteminfoManager::RegisterDeviceOrientationListener() {
       sensord_register_event(GetSensorHandle(), AUTO_ROTATION_EVENT_CHANGE_STATE,
                              BASE_GATHERING_INTERVAL, 0, OnDeviceOrientationChangedCb, this);
   if (!sensor_ret) {
-    SysteminfoUtils::UnregisterVconfCallback(
-        VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, OnDeviceAutoRotationChangedCb);
-    return LogAndCreateResult(
-        ErrorCode::UNKNOWN_ERR, "Failed to register orientation change event listener",
-        ("sensord_register_event returned false"));
+    SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL,
+                                             OnDeviceAutoRotationChangedCb);
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "Failed to register orientation change event listener",
+                              ("sensord_register_event returned false"));
   }
 
   LoggerD("Added callback for DEVICE_ORIENTATION");
@@ -1060,11 +1060,11 @@ PlatformResult SysteminfoManager::UnregisterDeviceOrientationListener() {
   ScopeLogger();
   bool sensor_ret = sensord_unregister_event(GetSensorHandle(), AUTO_ROTATION_EVENT_CHANGE_STATE);
   if (!sensor_ret) {
-    SysteminfoUtils::UnregisterVconfCallback(
-        VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, OnDeviceAutoRotationChangedCb);
-    return LogAndCreateResult(
-        ErrorCode::UNKNOWN_ERR, "Failed to unregister orientation change event listener",
-        ("sensord_unregister_event returned false"));
+    SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL,
+                                             OnDeviceAutoRotationChangedCb);
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "Failed to unregister orientation change event listener",
+                              ("sensord_unregister_event returned false"));
   }
   PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR);
   CHECK_LISTENER_ERROR(SysteminfoUtils::UnregisterVconfCallback(
@@ -1223,9 +1223,8 @@ PlatformResult SysteminfoManager::UnregisterCellularNetworkListener() {
 
   // if there is no other ip-relateded listeners left, unregister
   if (!IsListenerRegistered(kPropertyIdCellularNetwork)) {
-    PlatformResult ret =
-        SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-                                                 OnCellularNetworkValueChangedCb);
+    PlatformResult ret = SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_TELEPHONY_FLIGHT_MODE,
+                                                                  OnCellularNetworkValueChangedCb);
     if (ret.IsError()) {
       tapi_manager_->UnregisterCallbacks();
       if (IsIpChangeCallbackNotRegistered()) {

diff --git a/src/time/time_manager.cc b/src/time/time_manager.cc
index 1d32c23..6522110 100644 (file)
--- a/src/time/time_manager.cc
+++ b/src/time/time_manager.cc
@@ -132,7 +132,7 @@ PlatformResult TimeManager::UnregisterVconfCallback(ListenerType type) {
   if (!is_time_listener_registered_ && !is_timezone_listener_registered_) {
     LoggerD("unregistering listener on platform");
     if (0 != vconf_ignore_key_changed(VCONFKEY_SYSTEM_TIME_CHANGED, OnTimeChangedCallback)) {
-      LOGE("Failed to unregister vconf callback");
+      LoggerE("Failed to unregister vconf callback");
       // silent fail
       // return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to unregister vconf callback");
     }