Unverified Commit 8f3befba authored by Javier Guerra's avatar Javier Guerra Committed by GitHub

Merge pull request #8 from openconnectivity/develop

Merge develop into master
parents 318afe66 92a1e8d6
Package: OTGC
Version: 2.0.6
Version: 2.0.7
Section: custom
Priority: optional
Architecture: amd64
......
......@@ -11,7 +11,7 @@
# Constants
PROJECT_NAME="otgc"
VERSION="2.0.6"
VERSION="2.0.7"
program=$0
......
......@@ -6,7 +6,7 @@
<groupId>otgc</groupId>
<artifactId>otgc</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -100,13 +100,14 @@ public class IotivityRepository {
File introspectionFile = new File(OtgcConstant.INTROSPECTION_CBOR_FILE);
byte[] introspectionData = Files.readAllBytes(introspectionFile.toPath());
OCIntrospection.setIntrospectionData(0 /* First device */, introspectionData);
OCBufferSettings.setMaxAppDataSize(16384); // 16 KB
int ret = OCMain.mainInit(new OCMainInitHandler() {
@Override
public int initialize() {
LOG.debug("In OCMainInitHandler.initilize()");
int ret = OCMain.initPlatform("OCF");
ret |= OCMain.addDevice("/oic/d", "oic.wk.d", "OTGC", "ocf.2.4.0", "ocf.res.1.3.0");
ret |= OCMain.addDevice("/oic/d", "oic.wk.d", "OTGC", "ocf.2.0.5", "ocf.res.1.3.0");
return ret;
}
......
......@@ -206,7 +206,8 @@ public class ToolbarViewModel implements ViewModel {
deviceRole -> {
ownedDevice.setDeviceRole(deviceRole);
deviceRoleResponse.setValue(Response.success(ownedDevice));
createAclUseCase.execute(ownedDevice, true, Arrays.asList("*"), 31)
String deviceId = getDeviceIdUseCase.execute().blockingGet();
createAclUseCase.execute(ownedDevice, deviceId, Arrays.asList("*"), 6)
.subscribeOn(schedulersFacade.io())
.observeOn(schedulersFacade.ui())
.subscribe(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment