[NFC] Log refactoring.

[Verification] Module disabled, code not compiled.

Change-Id: Ia3bffc6c47b548a2a6997c5c7dfe8d944214477d
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index beb1dab8b48d69eee9bcb33d851698d7e7a542dd..130af60ad9ceac783a213b27cd87854730af81f1 100644 (file)
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -33,6 +33,7 @@
 
 using namespace common;
 using namespace std;
+using common::tools::ReportError;
 
 namespace extension {
 namespace nfc {
@@ -145,9 +146,10 @@ void NFCAdapter::RespondAsync(const char* msg) {
 
 static picojson::value CreateEventError(double callbackId, const PlatformResult& ret) {
   LoggerD("Entered");
+
   picojson::value event = picojson::value(picojson::object());
   picojson::object& obj = event.get<picojson::object>();
-  tools::ReportError(ret, &obj);
+  LogAndReportError(ret, &obj, ("Creating event error."));
   obj[JSON_CALLBACK_ID] = picojson::value(callbackId);
 
   return event;
@@ -301,6 +303,7 @@ static void transaction_event_callback(nfc_se_type_e type,
 
 #ifdef APP_CONTROL_SETTINGS_SUPPORT
 static void PostMessage(double* callbackId) {
+  LoggerE("Posting error message.");
   picojson::value event = CreateEventError(*callbackId,
                                            PlatformResult(ErrorCode::UNKNOWN_ERR,
                                                           "SetPowered failed."));
@@ -318,10 +321,9 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) {
 
   if (nfc_manager_is_activated() == powered) {
     if (!g_idle_add(setPoweredCompleteCB, static_cast<void*>(callbackId))) {
-      LoggerE("g_idle addition failed");
       delete callbackId;
       callbackId = NULL;
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.", ("g_idle addition failed"));
     }
     return PlatformResult(ErrorCode::NO_ERROR);
   }
@@ -331,28 +333,31 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) {
 
   int ret = app_control_create(&service);
   if (ret != APP_CONTROL_ERROR_NONE) {
-    LoggerE("app_control_create failed: %d", ret);
     delete callbackId;
     callbackId = NULL;
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "SetPowered failed.",
+                              ("app_control_create() error: %d, message: %s", ret, get_error_message(ret)));
   }
 
   ret = app_control_set_operation(service, "http://tizen.org/appcontrol/operation/setting/nfc");
   if (ret != APP_CONTROL_ERROR_NONE) {
-    LoggerE("app_control_set_operation failed: %d", ret);
     app_control_destroy(service);
     delete callbackId;
     callbackId = NULL;
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "SetPowered failed.",
+                              ("app_control_set_operation() error: %d, message: %s", ret, get_error_message(ret)));
   }
 
   ret = app_control_add_extra_data(service, "type", "nfc");
   if (ret != APP_CONTROL_ERROR_NONE) {
-    LoggerE("app_control_add_extra_data failed: %d", ret);
     app_control_destroy(service);
     delete callbackId;
     callbackId = NULL;
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "SetPowered failed.",
+                              ("app_control_add_extra_data() error: %d, message: %s", ret, get_error_message(ret)));
   }
 
   ret = app_control_send_launch_request(service, [](app_control_h request,
@@ -382,17 +387,19 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) {
   }, static_cast<void*>(callbackId));
 
   if (ret != APP_CONTROL_ERROR_NONE) {
-    LoggerE("app_control_send_launch_request failed: %d", ret);
     app_control_destroy(service);
     delete callbackId;
     callbackId = NULL;
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "SetPowered failed.",
+                              ("app_control_send_launch_request() error: %d, message: %s", ret, get_error_message(ret)));
   }
 
   ret = app_control_destroy(service);
   if (ret != APP_CONTROL_ERROR_NONE) {
-    LoggerE("app_control_destroy failed: %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "SetPowered failed.",
+                              ("app_control_destroy() error: %d, message: %s", ret, get_error_message(ret)));
   }
 #else
   int ret = nfc_manager_set_activation(powered,
@@ -457,9 +464,9 @@ PlatformResult NFCAdapter::SetCardEmulationMode(const std::string& mode) {
     default:
       // Should never go here - in case of invalid mode
       // platformResult is returned from convertert few lines above
-      LoggerE("Invalid card emulation mode: %s", mode.c_str());
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                            "Invalid card emulation mode given.");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                                "Invalid card emulation mode given.",
+                                ("Invalid card emulation mode: %s", mode.c_str()));
   }
 
   if (NFC_ERROR_NONE != ret) {
@@ -555,8 +562,7 @@ PlatformResult NFCAdapter::AddCardEmulationModeChangeListener() {
 PlatformResult NFCAdapter::RemoveCardEmulationModeChangeListener() {
   LoggerD("Entered");
   if (!nfc_manager_is_supported()) {
-    LoggerE("NFC Not Supported");
-    return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
+    return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
   }
 
   if (m_is_listener_set) {
@@ -651,8 +657,7 @@ PlatformResult NFCAdapter::AddActiveSecureElementChangeListener() {
 PlatformResult NFCAdapter::RemoveActiveSecureElementChangeListener() {
   LoggerD("Entered");
   if (!nfc_manager_is_supported()) {
-    LoggerE("NFC Not Supported");
-    return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
+    return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
   }
 
   if (m_is_listener_set) {
@@ -704,8 +709,7 @@ PlatformResult NFCAdapter::PeerIsConnectedGetter(int peer_id, bool* state) {
 PlatformResult NFCAdapter::SetPeerListener() {
   LoggerD("Entered");
   if (!nfc_manager_is_supported()) {
-    LoggerE("NFC Not Supported");
-    return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
+    return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
   }
 
   if (!m_is_peer_listener_set) {
@@ -723,8 +727,7 @@ PlatformResult NFCAdapter::SetPeerListener() {
 PlatformResult NFCAdapter::UnsetPeerListener() {
   LoggerD("Entered");
   if (!nfc_manager_is_supported()) {
-    LoggerE("NFC Not Supported");
-    return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
+    return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported");
   }
 
   if (m_is_peer_listener_set) {
@@ -778,8 +781,7 @@ PlatformResult NFCAdapter::SetReceiveNDEFListener(int peer_id) {
   }
 
   if (!is_connected) {
-    LoggerE("Target is not connected");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Target is not connected.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Target is not connected.");
   }
 
   int ret = nfc_p2p_set_data_received_cb(m_peer_handle, targetReceivedCallback, NULL);
@@ -1027,6 +1029,7 @@ static void tagReadNDEFCb(nfc_error_e result,
   data = NULL;
 
   if(NFC_ERROR_NONE != result) {
+    LoggerE("Tag read failed: %d, message: %s", result, get_error_message(result));
     // create exception and post error message (call error callback)
     picojson::value event = CreateEventError(callbackId, PlatformResult(ErrorCode::UNKNOWN_ERR,
                                                                         "Failed to read NDEF message"));
@@ -1039,7 +1042,7 @@ static void tagReadNDEFCb(nfc_error_e result,
 
   int ret = nfc_ndef_message_get_rawdata(message, &raw_data, &size);
   if(NFC_ERROR_NONE != ret) {
-    LoggerE("Failed to get message data: %d", ret);
+    LoggerE("Failed to get message data: %d, message: %s", ret, get_error_message(ret));
 
     // release data if any allocated
     free(raw_data);
@@ -1075,11 +1078,12 @@ PlatformResult NFCAdapter::TagReadNDEF(int tag_id,
   LoggerD("Received callback id: %f", callbackId);
 
   if(!is_connected) {
+    LoggerE("Tag is not connected");
     picojson::value event = CreateEventError(callbackId,
                                              PlatformResult(ErrorCode::UNKNOWN_ERR,
                                                             "Tag is no more connected."));
     NFCAdapter::GetInstance()->RespondAsync(event.serialize().c_str());
-    return PlatformResult(ErrorCode::NO_ERROR);;
+    return PlatformResult(ErrorCode::NO_ERROR);
   }
 
   double* callbackIdPointer = new double(callbackId);
@@ -1093,8 +1097,9 @@ PlatformResult NFCAdapter::TagReadNDEF(int tag_id,
     // for permission related error throw exception ...
     if(NFC_ERROR_SECURITY_RESTRICTED == ret ||
         NFC_ERROR_PERMISSION_DENIED == ret) {
-      LoggerD("Error: %d", ret);
-      return PlatformResult(ErrorCode::SECURITY_ERR, "Failed to read NDEF - permission denied");
+      return LogAndCreateResult(ErrorCode::SECURITY_ERR,
+                                "Failed to read NDEF - permission denied",
+                                ("nfc_tag_read_ndef() error: %d, message: %s", ret, get_error_message(ret)));
     }
 
     LoggerE("Preparing error callback to call");
@@ -1126,11 +1131,12 @@ PlatformResult NFCAdapter::TagWriteNDEF(int tag_id,
   LoggerD("Received callback id: %f", callbackId);
 
   if(!is_connected) {
+    LoggerE("Tag is not connected");
     picojson::value event = CreateEventError(callbackId,
                                              PlatformResult(ErrorCode::UNKNOWN_ERR,
                                                             "Tag is no more connected."));
     NFCAdapter::GetInstance()->RespondAsync(event.serialize().c_str());
-    return PlatformResult(ErrorCode::NO_ERROR);;
+    return PlatformResult(ErrorCode::NO_ERROR);
   }
 
   const picojson::array& records_array = FromJson<picojson::array>(
@@ -1155,8 +1161,9 @@ PlatformResult NFCAdapter::TagWriteNDEF(int tag_id,
       // for permission related error throw exception
       if(NFC_ERROR_SECURITY_RESTRICTED == ret ||
           NFC_ERROR_PERMISSION_DENIED == ret) {
-        LoggerE("Error: %d", ret);
-        return PlatformResult(ErrorCode::SECURITY_ERR, "Failed to read NDEF - permission denied");
+        return LogAndCreateResult(ErrorCode::SECURITY_ERR,
+                                  "Failed to read NDEF - permission denied",
+                                  ("nfc_tag_write_ndef() error: %d, message: %s", ret, get_error_message(ret)));
       }
 
       LoggerE("Error occured when sending message: %d", ret);
@@ -1234,10 +1241,11 @@ PlatformResult NFCAdapter::TagTransceive(int tag_id, const picojson::value& args
   LoggerD("Received callback id: %f", callback_id);
 
   if(!is_connected) {
+    LoggerE("Tag is not connected");
     picojson::value event = CreateEventError(callback_id,
         PlatformResult(ErrorCode::UNKNOWN_ERR, "Tag is no more connected."));
     NFCAdapter::GetInstance()->RespondAsync(event.serialize().c_str());
-    return PlatformResult(ErrorCode::NO_ERROR);;
+    return PlatformResult(ErrorCode::NO_ERROR);
  }
 
   const picojson::array& data_array = FromJson<picojson::array>(
@@ -1258,9 +1266,9 @@ PlatformResult NFCAdapter::TagTransceive(int tag_id, const picojson::value& args
     // for permission related error throw exception
     if(NFC_ERROR_SECURITY_RESTRICTED == ret ||
         NFC_ERROR_PERMISSION_DENIED == ret) {
-      LoggerE("Error: %d", ret);
-      return PlatformResult(ErrorCode::SECURITY_ERR,
-          "Failed to read NDEF - permission denied");
+      return LogAndCreateResult(ErrorCode::SECURITY_ERR,
+                                "Failed to read NDEF - permission denied",
+                                ("nfc_tag_transceive() error: %d, message: %s", ret, get_error_message(ret)));
     }
 
     std::string error_message = NFCUtil::getNFCErrorMessage(ret);
@@ -1353,6 +1361,7 @@ PlatformResult NFCAdapter::sendNDEF(int peer_id, const picojson::value& args) {
   double* callbackId = new double(args.get(JSON_CALLBACK_ID).get<double>());
 
   if (!is_connected) {
+    LoggerE("Peer is not connected");
     picojson::value event = CreateEventError(*callbackId,
         PlatformResult(ErrorCode::UNKNOWN_ERR, "Peer is no more connected"));
     NFCAdapter::GetInstance()->RespondAsync(event.serialize().c_str());
@@ -1428,8 +1437,7 @@ void NFCAdapter::SendHostAPDUResponse(
   LoggerD("Entered");
 
   if (!nfc_manager_is_supported()) {
-    LoggerE("NFC Not Supported");
-    error_cb(PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"));
+    error_cb(LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"));
     return;
   }
 

diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index 7649d6120aa67b3670ddf43e93f61762a5dd7d3d..b24d3fb7bd97d7412482912788ccded2c503303f 100644 (file)
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -140,11 +140,11 @@ NFCInstance::NFCInstance() {
   NFCAdapter::GetInstance()->SetResponder(this);
 }
 
-#define CHECK_EXIST(args, name, out)                                           \
-  if (!args.contains(name)) {                                                  \
-    LoggerE("args doesn't contain attribute '%s'", name);                      \
-    ReportError(TypeMismatchException(name" is required argument"), out);      \
-    return;                                                                    \
+#define CHECK_EXIST(args, name, out)                                                 \
+  if (!args.contains(name)) {                                                        \
+    LoggerE("args doesn't contain attribute '%s'", name);                            \
+    LogAndReportError(TypeMismatchException(name" is required argument"), out);      \
+    return;                                                                          \
   }
 
 NFCInstance::~NFCInstance() {
@@ -159,11 +159,11 @@ void NFCInstance::GetDefaultAdapter(
   LoggerD("Entered");
 
   if(!nfc_manager_is_supported()) {
-    LoggerE("NFC manager is not supported");
     // According to API reference only Security and Unknown
     // exceptions are allowed here
-    ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR,
-                               "NFC manager not supported"), &out);
+    LogAndReportError(
+        PlatformResult(ErrorCode::UNKNOWN_ERR, "NFC manager not supported"),
+        &out);
   }
   else {
     ReportSuccess(out);
@@ -178,10 +178,9 @@ void NFCInstance::SetExclusiveMode(
 
   int ret = nfc_manager_set_system_handler_enable(!exmode);
   if (NFC_ERROR_NONE != ret) {
-    LoggerE("Error: %d", ret);
     PlatformResult result = NFCUtil::CodeToResult(ret,
                                                   "Failed to set exclusive mode.");
-    ReportError(result, &out);
+    LogAndReportError(result, &out, ("nfc_manager_set_system_handler_enable() error: %d, message: %s", ret, get_error_message(ret)));
   } else {
     ReportSuccess(out);
   }
@@ -195,8 +194,7 @@ void NFCInstance::SetPowered(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -216,8 +214,7 @@ void NFCInstance::CardEmulationModeSetter(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -229,8 +226,7 @@ void NFCInstance::CardEmulationModeGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(mode), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -243,8 +239,7 @@ void NFCInstance::ActiveSecureElementSetter(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -256,8 +251,7 @@ void NFCInstance::ActiveSecureElementGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(ase), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -268,8 +262,7 @@ void NFCInstance::SetTagListener(
       if (supported) {
           SLoggerE("Tag is supported");
       } else {
-          SLoggerE("Tag is not supported");
-          ReportError(
+          LogAndReportError(
               common::PlatformResult(common::ErrorCode::NOT_SUPPORTED_ERR,
                                      "Tag is not supported on this device."),
               &out);
@@ -279,8 +272,7 @@ void NFCInstance::SetTagListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -296,8 +288,7 @@ void NFCInstance::PeerIsConnectedGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(ret), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 
 }
@@ -309,8 +300,7 @@ void NFCInstance::SetPeerListener(
   if (supported) {
     SLoggerE("P2P is supported");
   } else {
-    SLoggerE("P2P is not supported");
-    ReportError(
+    LogAndReportError(
         common::PlatformResult(common::ErrorCode::NOT_SUPPORTED_ERR,
                                "P2P is not supported on this device."),
                                &out);
@@ -320,8 +310,7 @@ void NFCInstance::SetPeerListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -332,8 +321,7 @@ void NFCInstance::UnsetTagListener(
   if (supported) {
     SLoggerE("Tag is supported");
   } else {
-    SLoggerE("Tag is not supported");
-    ReportError(
+    LogAndReportError(
         common::PlatformResult(common::ErrorCode::NOT_SUPPORTED_ERR,
                                "Tag is not supported on this device."),
                                &out);
@@ -350,8 +338,7 @@ void NFCInstance::UnsetPeerListener(
       if (supported) {
           SLoggerE("P2P is supported");
       } else {
-          SLoggerE("P2P is not supported");
-          ReportError(
+          LogAndReportError(
               common::PlatformResult(common::ErrorCode::NOT_SUPPORTED_ERR,
                                      "P2P is not supported on this device."),
               &out);
@@ -361,8 +348,7 @@ void NFCInstance::UnsetPeerListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -373,8 +359,7 @@ void NFCInstance::AddCardEmulationModeChangeListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -385,8 +370,7 @@ void NFCInstance::RemoveCardEmulationModeChangeListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -397,8 +381,7 @@ void NFCInstance::AddTransactionEventListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -409,8 +392,7 @@ void NFCInstance::RemoveTransactionEventListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -421,8 +403,7 @@ void NFCInstance::AddActiveSecureElementChangeListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -433,8 +414,7 @@ void NFCInstance::RemoveActiveSecureElementChangeListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -448,8 +428,7 @@ void NFCInstance::GetCachedMessage(
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -464,8 +443,7 @@ void NFCInstance::SetExclusiveModeForTransaction(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -482,8 +460,7 @@ void NFCInstance::ReadNDEF(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -500,8 +477,7 @@ void NFCInstance::WriteNDEF(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -518,8 +494,7 @@ void NFCInstance::Transceive(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -533,8 +508,7 @@ void NFCInstance::SetReceiveNDEFListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -548,8 +522,7 @@ void NFCInstance::UnsetReceiveNDEFListener(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -567,8 +540,7 @@ void NFCInstance::SendNDEF(
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -583,8 +555,7 @@ void NFCInstance::ToByte(
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -598,8 +569,7 @@ void NFCInstance::NDEFMessageContructor(const picojson::value& args, picojson::o
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -612,8 +582,7 @@ void NFCInstance::NDEFRecordContructor(const picojson::value& args, picojson::ob
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -627,8 +596,7 @@ void NFCInstance::NDEFRecordTextContructor(const picojson::value& args, picojson
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -641,8 +609,7 @@ void NFCInstance::NDEFRecordURIContructor(const picojson::value& args, picojson:
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -656,8 +623,7 @@ void NFCInstance::NDEFRecordMediaContructor(const picojson::value& args, picojso
   if (ret.IsSuccess()) {
     ReportSuccess(result, out);
   } else {
-    LoggerE("Error: %s", ret.message().c_str());
-    ReportError(ret, &out);
+    LogAndReportError(ret, &out);
   }
 }
 
@@ -675,8 +641,7 @@ void NFCInstance::TagTypeGetter(
   PlatformResult result = NFCAdapter::GetInstance()->TagIsConnectedGetter(tag_id, &is_connected);
 
   if (result.IsError()) {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
     return;
   }
 
@@ -694,8 +659,7 @@ void NFCInstance::TagTypeGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(tag_type), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -711,8 +675,7 @@ void NFCInstance::TagIsSupportedNDEFGetter(
   PlatformResult result = NFCAdapter::GetInstance()->TagIsConnectedGetter(tag_id, &is_connected);
 
   if (result.IsError()) {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
     return;
   }
 
@@ -729,8 +692,7 @@ void NFCInstance::TagIsSupportedNDEFGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(is_supported), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -747,8 +709,7 @@ void NFCInstance::TagNDEFSizeGetter(
   PlatformResult result = NFCAdapter::GetInstance()->TagIsConnectedGetter(tag_id, &is_connected);
 
   if (result.IsError()) {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
     return;
   }
 
@@ -766,8 +727,7 @@ void NFCInstance::TagNDEFSizeGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value((double)ndef_size), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -784,8 +744,7 @@ void NFCInstance::TagPropertiesGetter(
   PlatformResult result = NFCAdapter::GetInstance()->TagIsConnectedGetter(tag_id, &is_connected);
 
   if (result.IsError()) {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
     return;
   }
 
@@ -820,8 +779,7 @@ void NFCInstance::TagPropertiesGetter(
     }
     ReportSuccess(properties, out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 
 }
@@ -841,8 +799,7 @@ void NFCInstance::TagIsConnectedGetter(
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(connected), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -852,8 +809,7 @@ void NFCInstance::AddHCEEventListener(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -863,8 +819,7 @@ void NFCInstance::RemoveHCEEventListener(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -891,7 +846,7 @@ void NFCInstance::SendHostAPDUResponse(const picojson::value& args,
     picojson::value response = picojson::value(picojson::object());
     picojson::object& response_obj = response.get<picojson::object>();
     response_obj[JSON_CALLBACK_ID] = picojson::value(callback_id);
-    ReportError(error, &response_obj);
+    LogAndReportError(error, &response_obj);
     Instance::PostMessage(this, response.serialize().c_str());
   };
 
@@ -916,8 +871,7 @@ void NFCInstance::IsActivatedHandlerForAID(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(is_activated_handler), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -939,8 +893,7 @@ void NFCInstance::IsActivatedHandlerForCategory(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(picojson::value(is_activated_handler), out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -961,8 +914,7 @@ void NFCInstance::RegisterAID(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -984,8 +936,7 @@ void NFCInstance::UnregisterAID(const picojson::value& args,
   if (result.IsSuccess()) {
     ReportSuccess(out);
   } else {
-    LoggerE("Error: %s", result.message().c_str());
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -1018,7 +969,7 @@ void NFCInstance::GetAIDsForCategory(const picojson::value& args,
     picojson::value response = picojson::value(picojson::object());
     picojson::object& response_obj = response.get<picojson::object>();
     response_obj[JSON_CALLBACK_ID] = picojson::value(callback_id);
-    ReportError(error, &response_obj);
+    LogAndReportError(error, &response_obj);
     Instance::PostMessage(this, response.serialize().c_str());
   };
 

diff --git a/src/nfc/nfc_message_utils.cc b/src/nfc/nfc_message_utils.cc
index 1b2deaeeee1e57258f46109d4ec7d6248b53997e..80e1c8328b27f1e7b3a38a364e6f4a2e89813171 100644 (file)
--- a/src/nfc/nfc_message_utils.cc
+++ b/src/nfc/nfc_message_utils.cc
@@ -332,7 +332,7 @@ static PlatformResult NdefRecordGetHandle(picojson::value& record,
   LoggerD("Entered");
   if (!record.is<picojson::object>() || !record.contains("tnf") || !record.contains("type") ||
       !record.contains("id") || !record.contains("payload")) {
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "Record is empty");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Record is empty");
   }
   const picojson::object& record_obj = record.get<picojson::object>();
   short tnf_from_json = static_cast<short>(record.get("tnf").get<double>());
@@ -359,8 +359,9 @@ static PlatformResult NdefRecordGetHandle(picojson::value& record,
     payload[i] = static_cast<unsigned char>(payload_data[i].get<double>());
   }
   if ((tnf_from_json < TNF_MIN) || (tnf_from_json > TNF_MAX)) {
-    LoggerE("Not supported tnf");
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "Type mismatch");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR,
+                              "Type mismatch",
+                              ("Not supported TNF"));
   }
   const int BYTE_ARRAY_MAX = 255;
   nfc_ndef_record_h ndef_record_handle = NULL;

diff --git a/src/nfc/nfc_util.cc b/src/nfc/nfc_util.cc
index 11d0e8cdcf91faf80b20e9af8e2a2fad49e7fe2b..f7823119e683141277c6437206268b2ff8b6e051 100644 (file)
--- a/src/nfc/nfc_util.cc
+++ b/src/nfc/nfc_util.cc
@@ -41,12 +41,12 @@ PlatformResult NFCUtil::CodeToResult(const int errorCode,
     case NFC_ERROR_INVALID_NDEF_MESSAGE:
     case NFC_ERROR_INVALID_RECORD_TYPE:
     case NFC_ERROR_NOT_NDEF_FORMAT:
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, message);
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, message);
     case NFC_ERROR_SECURITY_RESTRICTED:
     case NFC_ERROR_PERMISSION_DENIED:
-      return PlatformResult(ErrorCode::SECURITY_ERR, message);
+      return LogAndCreateResult(ErrorCode::SECURITY_ERR, message);
     case NFC_ERROR_NOT_SUPPORTED:
-      return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, message);
+      return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, message);
     case NFC_ERROR_NOT_ACTIVATED:
     case NFC_ERROR_OPERATION_FAILED:
     case NFC_ERROR_DEVICE_BUSY:
@@ -55,7 +55,7 @@ PlatformResult NFCUtil::CodeToResult(const int errorCode,
     case NFC_ERROR_OUT_OF_MEMORY:
     case NFC_ERROR_NOT_INITIALIZED:
     default:
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, message);
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, message);
   }
 }
 
@@ -219,7 +219,7 @@ PlatformResult NFCUtil::ToNfcTagString(const std::string& type_string, nfc_tag_t
     *tag_type = NFC_UNKNOWN_TARGET;
   }
   else {
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Tag Type");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Tag Type");
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
@@ -237,8 +237,9 @@ PlatformResult NFCUtil::ToStringCardEmulationMode(
       *mode = ALWAYS_ON;
       break;
     default:
-      LoggerE("No Match Card Emulation mode: %x", card_mode);
-      return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Card Emulation mode");
+      return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR,
+                                "No Match Card Emulation mode",
+                                ("No Match Card Emulation mode: %x", card_mode));
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
@@ -252,8 +253,9 @@ PlatformResult NFCUtil::ToCardEmulationMode(
   } else if (mode_string == OFF) {
     *mode = NFC_SE_CARD_EMULATION_MODE_OFF;
   } else {
-    LoggerE("No Match Card Emulation mode: %s", mode_string.c_str());
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Card Emulation mode");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR,
+                              "No Match Card Emulation mode",
+                              ("No Match Card Emulation mode: %s", mode_string.c_str()));
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
@@ -272,8 +274,9 @@ PlatformResult NFCUtil::ToStringSecureElementType(const nfc_se_type_e se_type,
       *type = DATA_NFC_SE_TYPE_HCE;
       break;
     default:
-      LoggerE("No Match Secure Element Type: %x", se_type);
-      return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Secure Element Type");
+      return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR,
+                                "No Match Secure Element Type",
+                                ("No Match Secure Element Type: %x", se_type));
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
@@ -288,8 +291,9 @@ PlatformResult NFCUtil::ToSecureElementType(const std::string& type_string,
   } else if (type_string == DATA_NFC_SE_TYPE_HCE) {
     *type = NFC_SE_TYPE_HCE;
   } else {
-    LoggerE("No Match Secure Element Type: %s", type_string.c_str());
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "No Match Secure Element Type");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR,
+                              "No Match Secure Element Type",
+                              ("No Match Secure Element Type: %s", type_string.c_str()));
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }