From 65878a4799f5d7c1b93b53f505b83d65171b1fd2 Mon Sep 17 00:00:00 2001 From: Markus Jung Date: Wed, 23 Mar 2016 15:50:14 +0900 Subject: [PATCH] [IOT-1020], [IOT-1024], [IOT-1029], [IOT-1030] fixes - param check for getConfiguredResourceParams API - updated example configuration for Android sample of resource container - removed getLibraryPath API from Android wrapper Change-Id: Ib825240a2ebec7cfa0a61e1ae63e156408904bd6 Signed-off-by: Markus Jung Reviewed-on: https://gerrit.iotivity.org/gerrit/6211 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi Reviewed-by: Madan Lanka --- .../service/resourcecontainer/RcsBundleInfo.java | 10 --- .../resourcecontainer/RcsResourceContainer.java | 2 +- .../src/main/jni/JniRcsResourceContainer.cpp | 26 ++++--- .../main/assets/lib/ResourceContainerConfig.xml | 87 ++++------------------ 4 files changed, 29 insertions(+), 96 deletions(-) diff --git a/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java index 5d2964f..8e6273f 100644 --- a/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java +++ b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java @@ -87,16 +87,6 @@ public class RcsBundleInfo { } /** - * API for getting the library path for the bundle - * - * @return string - Library path in string form - * - */ - public String getLibraryPath() { - return mLibraryPath; - } - - /** * API for getting the version of the bundle * * @return string - version of the bundle diff --git a/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java index 9d06a86..eec885c 100644 --- a/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java +++ b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java @@ -269,7 +269,7 @@ public class RcsResourceContainer implements RcsResourceContainerBundleAPI { List bundles = listBundles(); for(RcsBundleInfo bundleInfo : bundles){ - if(bundleInfo.getID().equals(bundleId) && bundleInfo.getLibraryPath().endsWith(".apk")){ + if(bundleInfo.getID().equals(bundleId) && bundleInfo.getPath().endsWith(".apk")){ Log.d(TAG, "Have to start android bundle"); Log.d(TAG, "bundle-id: " + bundleInfo.getID() + ", " + bundleInfo.getPath()); if(bundleInfo.getPath().endsWith(".apk")){ diff --git a/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp b/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp index 3bd2beb..5a5b420 100644 --- a/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp +++ b/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp @@ -460,19 +460,23 @@ Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeGetConfig { (void)obj; jobjectArray ret; - const char *str_bundleId = env->GetStringUTFChars(bundleId, 0); - - ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance(); - vector< resourceInfo > resourceConfig; - container->getResourceConfiguration(str_bundleId, &resourceConfig); - resourceInfo conf = resourceConfig[resourceId]; ret = (jobjectArray) env->NewObjectArray(4, env->FindClass("java/lang/String"), - env->NewStringUTF("")); + env->NewStringUTF("")); + if(bundleId != NULL){ + const char *str_bundleId = env->GetStringUTFChars(bundleId, 0); - env->SetObjectArrayElement(ret, 0, env->NewStringUTF(conf.name.c_str())); - env->SetObjectArrayElement(ret, 1, env->NewStringUTF(conf.uri.c_str())); - env->SetObjectArrayElement(ret, 2, env->NewStringUTF(conf.resourceType.c_str())); - env->SetObjectArrayElement(ret, 3, env->NewStringUTF(conf.address.c_str())); + ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance(); + vector< resourceInfo > resourceConfig; + container->getResourceConfiguration(str_bundleId, &resourceConfig); + + if(resourceConfig.size() > resourceId && resourceId >=0){ + resourceInfo conf = resourceConfig[resourceId]; + env->SetObjectArrayElement(ret, 0, env->NewStringUTF(conf.name.c_str())); + env->SetObjectArrayElement(ret, 1, env->NewStringUTF(conf.uri.c_str())); + env->SetObjectArrayElement(ret, 2, env->NewStringUTF(conf.resourceType.c_str())); + env->SetObjectArrayElement(ret, 3, env->NewStringUTF(conf.address.c_str())); + } + } return ret; } diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/assets/lib/ResourceContainerConfig.xml b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/assets/lib/ResourceContainerConfig.xml index 493d638..d6fe5b3 100755 --- a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/assets/lib/ResourceContainerConfig.xml +++ b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/assets/lib/ResourceContainerConfig.xml @@ -1,45 +1,8 @@ + + +--> \ No newline at end of file -- 2.7.4