Update snapshot(2018-02-14)

[platform/upstream/iotivity.git] / android / android_api / base / jni / JniUtils.h

diff --git a/android/android_api/base/jni/JniUtils.h b/android/android_api/base/jni/JniUtils.h
index 5297293..0fe8578 100644 (file)
--- a/android/android_api/base/jni/JniUtils.h
+++ b/android/android_api/base/jni/JniUtils.h
@@ -108,21 +108,7 @@ public:
                 return OC::ObserveType::ObserveAll;
         };
     }
-#ifdef WITH_CLOUD
-    static OC::AclGroupType getAclGroupType(JNIEnv *env, int type)
-    {
-        switch (type)
-        {
-            case 0:
-                return OC::AclGroupType::PUBLIC;
-            case 1:
-                return OC::AclGroupType::PRIVATE;
-            default:
-                ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected acl group type");
-                return OC::AclGroupType::PUBLIC;
-        };
-    }
-#endif
+
     static OCEntityHandlerResult getOCEntityHandlerResult(JNIEnv *env, int type)
     {
         switch (type)
@@ -147,6 +133,36 @@ public:
         };
     }
 
+    static OCTransportAdapter getOCTransportAdapter(int adapter)
+    {
+        int transport = OCTransportAdapter::OC_DEFAULT_ADAPTER;
+        if (adapter & CT_ADAPTER_IP)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_IP;
+        }
+
+        if (adapter & CT_ADAPTER_GATT_BTLE)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_GATT_BTLE;
+        }
+
+        if (adapter & CT_ADAPTER_RFCOMM_BTEDR)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_RFCOMM_BTEDR;
+        }
+
+        if (adapter & CT_ADAPTER_TCP)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_TCP;
+        }
+
+        if (adapter & CT_ADAPTER_NFC)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_NFC;
+        }
+        return (OCTransportAdapter)transport;
+    }
+
     static std::string stackResultToStr(const int result)
     {
         switch (result)
@@ -221,8 +237,12 @@ public:
             case OC_STACK_INVALID_JSON:
                 return "INVALID_JSON";
             /** Request is not authorized by Resource Server. */
+            case OC_STACK_NOT_ACCEPTABLE:
+                return "NOT_ACCEPTABLE";
             case OC_STACK_UNAUTHORIZED_REQ:
                 return "UNAUTHORIZED_REQ";
+            case OC_STACK_TOO_MANY_REQUESTS:
+                return "TOO_MANY_REQUESTS";
             /** Error code from PDM */
             case OC_STACK_PDM_IS_NOT_INITIALIZED:
                 return "PDM_IS_NOT_INITIALIZED";
@@ -230,6 +250,8 @@ public:
                 return "DUPLICATE_UUID";
             case OC_STACK_INCONSISTENT_DB:
                 return "INCONSISTENT_DB";
+            case OC_STACK_SVR_DB_NOT_EXIST:
+                return "SVR_DB_NOT_EXIST";
             /** Error code from OTM */
             case OC_STACK_AUTHENTICATION_FAILURE:
                 return "AUTHENTICATION_FAILURE";