static int __req = -1;
static int __processId = -1;
-static const wchar_t __allowedAppControlTable[][2][64] =
+static const char __allowedAppControlTable[][2][96] =
{
- {L"osp.appcontrol.BT", L"osp.appcontrol.operation.PICK"},
- {L"osp.appcontrol.provider.bluetooth", L"osp.appcontrol.operation.pick"},
- {L"http://tizen.org/appcontrol/provider/bluetooth", L"http://tizen.org/appcontrol/operation/pick"},
- {L"tizen.bluetooth", L"http://tizen.org/appcontrol/operation/pick"},
- {L"tizen.bluetooth", L"http://tizen.org/appcontrol/operation/bluetooth/pick"},
+ {"osp.appcontrol.BT", "osp.appcontrol.operation.PICK"},
+ {"osp.appcontrol.provider.bluetooth", "osp.appcontrol.operation.pick"},
+ {"tizen.bluetooth", "http://tizen.org/appcontrol/operation/pick"},
+ {"tizen.bluetooth", "http://tizen.org/appcontrol/operation/bluetooth/pick"},
};
r = Tizen::System::_SystemInfoImpl::GetSysInfo(L"http://tizen.org/feature/network.bluetooth", isBtSupported);
SysTryReturnResult(NID_APP, (r == E_SUCCESS) && (isBtSupported == true), E_SYSTEM, "[%s] Bluetooth is not supported.", GetErrorMessage(r));
- const bool isAllowed = _AppControlManager::IsAllowedAppControl(__allowedAppControlTable, 5, aId, oId);
+ const bool isAllowed = _AppControlManager::IsAllowedAppControl(__allowedAppControlTable, 4, aId, oId);
SysTryReturnResult(NID_APP, isAllowed, E_SYSTEM, "Invalid AppControl entry for (%ls, %ls).", aId.GetPointer(), oId.GetPointer());
SysLog(NID_APP, "Bluetooth AppControl.");
msg.AddData(pMap);
msg.AddData(L"launch-type", L"pick");
- __processId = _AppControlManager::GetInstance()->Launch(msg, "ug-bluetooth-efl", APPSVC_OPERATION_PICK, NULL, NULL, OnAppControlResult, 0);
+ const String& package = _AppControlManager::GetAliasAppId(aId);
+ SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+
+ __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUri, pMime, OnAppControlResult, 0);
SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Bluetooth AppControl is failed.");
SysLog(NID_APP, "Launching Bluetooth AppControl succeeded.");
{
case SERVICE_RESULT_SUCCEEDED:
{
- pBuf = appsvc_get_data(pBundle, "address");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/address");
if (pBuf)
{
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/address"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/address"), new (std::nothrow) String(pBuf));
+ pResult->Remove(String(L"addr_val"));
+ pResult->Add(new (std::nothrow) String(L"addr_val"), new (std::nothrow) String(pBuf));
}
- pBuf = appsvc_get_data(pBundle, "name");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/name");
if (pBuf)
{
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/name"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/name"), new (std::nothrow) String(pBuf));
+ pResult->Remove(String(L"dev_name"));
+ pResult->Add(new (std::nothrow) String(L"dev_name"), new (std::nothrow) String(pBuf));
}
- pBuf = appsvc_get_data(pBundle, "rssi");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/rssi");
if (pBuf)
{
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/rssi"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/rssi"), new (std::nothrow) String(pBuf));
}
- pBuf = appsvc_get_data(pBundle, "is_bonded");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/is_paired");
if (pBuf)
{
if (*pBuf == '1')
{
pBuf = "false";
}
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/is_paired"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/is_paired"), new (std::nothrow) String(pBuf));
}
- pBuf = appsvc_get_data(pBundle, "major_class");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/major_class");
if (pBuf)
{
Integer::Decode(String(pBuf), majClassType);
majClassType = (int)_BluetoothAdapterUtility::ConvertToMajorDeviceClassType((bt_major_device_class_e)majClassType);
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/major_class"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/major_class"), new (std::nothrow) String(Integer::ToString(majClassType)));
+ pResult->Remove(String(L"maj_cls_type"));
+ pResult->Add(new (std::nothrow) String(L"maj_cls_type"), new (std::nothrow) String(Integer::ToString(majClassType)));
}
- pBuf = appsvc_get_data(pBundle, "minor_class");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/minor_class");
if (pBuf)
{
Integer::Decode(String(pBuf), minClassType);
minClassType = (int)_BluetoothAdapterUtility::ConvertToMinorDeviceClassType((bt_major_device_class_e)majClassType, (bt_minor_device_class_e)minClassType);
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/minor_class"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/minor_class"), new (std::nothrow) String(Integer::ToString(minClassType)));
+ pResult->Remove(String(L"min_cls_type"));
+ pResult->Add(new (std::nothrow) String(L"min_cls_type"), new (std::nothrow) String(Integer::ToString(minClassType)));
}
- pBuf = appsvc_get_data(pBundle, "service_class");
+ pBuf = appsvc_get_data(pBundle, "http://tizen.org/appcontrol/data/bluetooth/service_class");
if (pBuf)
{
Integer::Decode(String(pBuf), svcClassType);
svcClassType = (int)_BluetoothAdapterUtility::ConvertToServiceClassList(svcClassType);
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/service_class"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/service_class"), new (std::nothrow) String(Integer::ToString(svcClassType)));
+ pResult->Remove(String(L"svc_cls_type"));
+ pResult->Add(new (std::nothrow) String(L"svc_cls_type"), new (std::nothrow) String(Integer::ToString(svcClassType)));
}
int len = 0;
- char** ppArrayBuf = (char**)appsvc_get_data_array(pBundle, "uuids", &len);
+ char** ppArrayBuf = (char**)appsvc_get_data_array(pBundle, "http://tizen.org/appcontrol/data/bluetooth/uuid_list", &len);
ArrayList* pUuidList = null;
if (len > 0 && ppArrayBuf != null)
{
svcType = _BluetoothAdapterUtility::ConvertToServiceList(ppArrayBuf, len);
pUuidList = dynamic_cast<ArrayList*>(_BluetoothAdapterUtility::ConvertServiceUuidListN(ppArrayBuf, len));
- for (int i = 0; i < len; i++)
- {
- if (ppArrayBuf[i])
- {
- free(ppArrayBuf[i]);
- }
- }
- free(ppArrayBuf);
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/service_type"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/service_type"), new (std::nothrow) String(Long::ToString(svcType)));
+ pResult->Remove(String(L"svc_type"));
+ pResult->Add(new (std::nothrow) String(L"svc_type"), new (std::nothrow) String(Long::ToString(svcType)));
+
+ pResult->Remove(String(L"http://tizen.org/appcontrol/data/bluetooth/uuid_list"));
pResult->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/uuid_list"), pUuidList);
}
}