//
-// Open Service Platform
// Copyright (c) 2012 Samsung Electronics Co., Ltd.
//
// Licensed under the Apache License, Version 2.0 (the License);
static const char OSP_V_REQUEST_TYPE_MAP_INSERT[] = "map_insert";
static const char OSP_V_REQUEST_TYPE_MAP_UPDATE[] = "map_update";
static const char OSP_V_REQUEST_TYPE_MAP_DELETE[] = "map_delete";
+static const char OSP_V_VERSION_2_1_0_2[] = "ver_2.1.0.2";
static const char BUNDLE_KEY_PREFIX_AUL[] = "__AUL_";
static const char BUNDLE_KEY_PREFIX_SERVICE[] = "__APP_SVC_";
static const char BUNDLE_KEY_PREFIX_OSP[] = "__OSP_";
result
+_AppArg::Construct(const _AppMessageImpl& msg, const String& oId, const String* pUri, const String* pMime)
+{
+ __pBundle = bundle_dup(const_cast<bundle*>(msg.GetBundle()));
+ SysTryReturnResult(NID_APP, __pBundle != null, E_OUT_OF_MEMORY, "Bundle creation failure.");
+
+ return CreateAppControlArg(__pBundle, oId, pUri, pMime, null);
+}
+
+
+result
_AppArg::Construct(const _SqlDataControlImpl& dc, _DataControlRequestType requestType, const IList* pList)
{
__pBundle = bundle_create();
return null;
}
- ArrayList* pList = _AppMessageImpl::GetValueArray(__pBundle, OSP_K_ARG);
+ ArrayList* pList = _AppMessageImpl::GetValueArrayN(__pBundle, OSP_K_ARG);
if (pList)
{
pHashMap->Add(new (std::nothrow) String(TIZEN_APPCONTROL_DATA_LEGACY), pList);
}
}
break;
+ case BUNDLE_TYPE_BYTE:
+ bundle_keyval_get_basic_val(const_cast<bundle_keyval_t*>(pVal), reinterpret_cast<void**>(&pStr), &size);
+
+ SysLog(NID_IO, "Bundle byte value = %s, size = %d", pStr, size);
+
+ if (pStr)
+ {
+ ByteBuffer* pBuffer = new (std::nothrow) ByteBuffer();
+ SysTryLog(NID_IO, pBuffer != null, "The memory is insufficient.");
+ result r = pBuffer->Construct(size);
+ SysTryLog(NID_IO, r == E_SUCCESS, "Constructing pBuffer is failed.");
+
+ r = pBuffer->SetArray((const byte*)pStr, 0, size);
+ SysTryLog(NID_IO, r == E_SUCCESS, "SetArray()for ByteBuffer is failed.");
+
+ pBuffer->Flip();
+
+ pMap->Add(new (std::nothrow) String(pKey), pBuffer);
+ }
+ break;
default:
SysLog(NID_APP, "Invalid type for %s : %d", pKey, type);
break;
else if (typeid(*pObj) == typeid(const ByteBuffer))
{
SysLog(NID_APP, "ByteBuffer type");
+ const ByteBuffer* pBuffer = static_cast<const ByteBuffer*>(pObj);
+
+ std::unique_ptr<char[]> pBundleKey(_StringConverter::CopyToCharArrayN(*pKey));
+ bundle_add_byte(b, pBundleKey.get(), pBuffer->GetPointer(), pBuffer->GetLimit());
}
}
}
result
-_AppArg::CreateAppControlArg(bundle* b, const _AppControlImpl& ac, const String* pUriData, const String* pMimeType, const IMap* pList)
+_AppArg::CreateAppControlArg(bundle* b, const _AppControlImpl& ac, const String* pUriData, const String* pMimeType, const IMap* pMap)
+{
+ return CreateAppControlArg(b, ac._opId, pUriData, pMimeType, pMap);
+}
+
+
+result
+_AppArg::CreateAppControlArg(bundle* b, const String& oId, const String* pUriData, const String* pMimeType, const IMap* pMap)
{
SysAssertf(b != null, "Valid bundle should be supplied");
bundle* pb = b;
- std::unique_ptr<char[]> pOperation(_StringConverter::CopyToCharArrayN(ac._opId));
+ std::unique_ptr<char[]> pOperation(_StringConverter::CopyToCharArrayN(oId));
if (pOperation.get())
{
appsvc_set_operation(pb, pOperation.get());
}
}
- AddStrMap(pb, pList);
+ AddStrMap(pb, pMap);
bundle_add(pb, OSP_K_LAUNCH_TYPE, OSP_V_LAUNCH_TYPE_APPCONTROL);
char dataControlRequestType[MAX_LEN_DATA_CONTROL_REQ_TYPE] = {0, };
snprintf(dataControlRequestType, MAX_LEN_DATA_CONTROL_REQ_TYPE, "%d", static_cast<int>(requestType));
bundle_add(b, OSP_K_DATACONTROL_REQUEST_TYPE, dataControlRequestType);
+ bundle_add(b, OSP_K_DATACONTROL_PROTOCOL_VERSION, OSP_V_VERSION_2_1_0_2);
std::unique_ptr<char[]> pProvider(_StringConverter::CopyToCharArrayN(dc.__providerId));
if (pProvider)
char dataControlRequestType[MAX_LEN_DATA_CONTROL_REQ_TYPE] = {0, };
snprintf(dataControlRequestType, MAX_LEN_DATA_CONTROL_REQ_TYPE, "%d", static_cast < int >(requestType));
bundle_add(b, OSP_K_DATACONTROL_REQUEST_TYPE, dataControlRequestType);
+ bundle_add(b, OSP_K_DATACONTROL_PROTOCOL_VERSION, OSP_V_VERSION_2_1_0_2);
std::unique_ptr<char[]> pProvider(_StringConverter::CopyToCharArrayN(dc.__providerId));
if (pProvider)
bundle_keyval_get_basic_val(const_cast<bundle_keyval_t*>(pVal), reinterpret_cast<void**>(&pStr), &size);
if (pStr)
{
- SysLog(NID_APP, "(%s, %s)", pKey, pStr);
+ SysSecureLog(NID_APP, "(%s, %s)", pKey, pStr);
}
break;
default: