Unverified Commit 255dc70a authored by Javier Guerra's avatar Javier Guerra Committed by GitHub

Merge pull request #13 from openconnectivity/develop

Merge develop into master
parents 5c1ac910 09b84320
......@@ -65,6 +65,7 @@ git checkout swig
2. Apply all patchs of the OTGC in IoTivity-lite
```
git apply <otgc-linux>/extlibs/patchs/remove_cred_by_credid.patch
git apply <otgc-linux>/extlibs/patchs/fix_config.patch
```
3. Go to the linux directory.
```
......
......@@ -11,7 +11,7 @@
# Constants
PROJECT_NAME="otgc"
VERSION="2.3.0"
VERSION="2.4.0"
program=$0
......
diff --git a/port/linux/oc_config.h b/port/linux/oc_config.h
index 8e801156..7c8fbd78 100644
--- a/port/linux/oc_config.h
+++ b/port/linux/oc_config.h
@@ -34,7 +34,7 @@ typedef uint64_t oc_clock_time_t;
/* Add support for the oic.if.create interface in Collections */
#define OC_COLLECTIONS_IF_CREATE
/* Add support for the maintenance resource */
-#define OC_MNT
+//#define OC_MNT
/* If we selected support for dynamic memory allocation */
#ifdef OC_DYNAMIC_ALLOCATION
#define OC_COLLECTIONS
......@@ -6,7 +6,7 @@
<groupId>otgc</groupId>
<artifactId>otgc</artifactId>
<version>2.3.0</version>
<version>2.4.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -169,9 +169,14 @@ public class ClientView implements FxmlView<ClientViewModel>, Initializable {
notificationCenter.publish(NotificationKey.SET_PROGRESS_STATUS, true);
break;
case SUCCESS:
notificationCenter.publish(NotificationKey.SET_PROGRESS_STATUS, false);
viewModel.buildUiForIntrospect(newValue.data);
box.getChildren().clear();
if (!newValue.data.isEmpty()) {
notificationCenter.publish(NotificationKey.SET_PROGRESS_STATUS, false);
viewModel.buildUiForIntrospect(newValue.data);
box.getChildren().clear();
} else {
notificationCenter.publish(NotificationKey.SET_PROGRESS_STATUS, false);
viewModel.findResources();
}
break;
default:
notificationCenter.publish(NotificationKey.SET_PROGRESS_STATUS, false);
......
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