Add AWS support to libcloudproxyneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0

Bug-AGL: SPEC-3645
Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com>
Change-Id: Ie165a50e7975a8e6f25b259be1679a9689414148

1 files changed, 25 insertions, 6 deletions

diff --git a/sample/test-cloud-app/app/main.cpp b/sample/test-cloud-app/app/main.cpp
index 6918e97..829d593 100755
--- a/sample/test-cloud-app/app/main.cpp
+++ b/sample/test-cloud-app/app/main.cpp
@@ -72,14 +72,23 @@ int main(int argc, char *argv[])
                     str = "<empty>";
                 qDebug("Event_SendMessageConfirmation: %s", str);
 
-                json_object *j_result;
-                if(!json_object_object_get_ex(object, "result", &j_result))
+                json_object *j_obj;
+
+                const char* cloud_type{nullptr};
+                if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||
+                   (cloud_type = json_object_get_string(j_obj)) == nullptr)
+                {
+                    qDebug("Can't read cloud_type");
+                    return;
+                }
+
+                if(!json_object_object_get_ex(object, "result", &j_obj))
                 {
                     qDebug("Can't read confirmation result");
                     return;
                 }
 
-                int result = (int)json_object_get_boolean(j_result);
+                int result = (int)json_object_get_boolean(j_obj);
 
                 if (result)
                     ++i_confirm_good;
@@ -87,15 +96,25 @@ int main(int argc, char *argv[])
                     ++i_confirm_bad;
 
                 window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QVariant());
-                qDebug("Application received confirmation result [good: %d, bad: %d]: %d", i_confirm_good, i_confirm_bad, result);
+                qDebug("Application received confirmation result from %s [good: %d, bad: %d]: %d", cloud_type, i_confirm_good, i_confirm_bad, result);
             });
+
         g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [&window](json_object* object){
                 qDebug("CloudProxyClient::Event_ReceivedMessage: object ptr %p", object);
 
                 const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
                 if (!str)
                     str = "<empty>";
-                qDebug("Event_SendMessageConfirmation: %s", str);
+                qDebug("Event_ReceivedMessage: %s", str);
+
+                json_object *j_obj;
+                const char* cloud_type{nullptr};
+                if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||
+                   (cloud_type = json_object_get_string(j_obj)) == nullptr)
+                {
+                    qDebug("Can't read cloud_type");
+                    return;
+                }
 
                 json_object *event_data;
                 const char* data_str{nullptr};
@@ -108,7 +127,7 @@ int main(int argc, char *argv[])
 
                 ++i_recv;
                 window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QString(data_str));
-                qDebug("Application received data [count: %d,  good: %d, bad %d]: %s", i_recv, i_confirm_good, i_confirm_bad, data_str);
+                qDebug("Application received data from %s [count: %d,  good: %d, bad %d]: %s", cloud_type, i_recv, i_confirm_good, i_confirm_bad, data_str);
             });