replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / android / EasySetupCore / src / main / java / org / iotivity / service / easysetup / mediator / CloudProp.java

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java
old mode 100644 (file)
new mode 100755 (executable)
index 6f4d5be..22a2acb
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java
@@ -22,6 +22,8 @@ package org.iotivity.service.easysetup.mediator;
 
 import android.util.Log;
 
+import org.iotivity.service.easysetup.mediator.enums.OAUTH_TOKENTYPE;
+
 import org.iotivity.base.OcException;
 import org.iotivity.base.OcRepresentation;
 
@@ -30,8 +32,9 @@ import org.iotivity.base.OcRepresentation;
  */
 public class CloudProp {
     private static final String TAG = CloudProp.class.getName();
-    protected OcRepresentation mRep;
-    protected String mCloudID;
+    protected OcRepresentation mRep = null;
+    protected String mCloudID = null;
+    protected int mCredID ;
 
     /**
      * Constructor
@@ -43,6 +46,18 @@ public class CloudProp {
 
     public void setCloudProp(String authCode, String authProvider, String ciServer)
     {
+        if(authCode == null)
+        {
+            authCode = "";
+        }
+        if(authProvider == null)
+        {
+            authProvider = "";
+        }
+        if(ciServer == null)
+        {
+            ciServer = "";
+        }
         try {
             mRep.setValue(ESConstants.OC_RSRVD_ES_AUTHCODE, authCode);
             mRep.setValue(ESConstants.OC_RSRVD_ES_AUTHPROVIDER, authProvider);
@@ -52,24 +67,61 @@ public class CloudProp {
         }
     }
 
+    public void setCloudPropWithAccessToken(String accessToken, OAUTH_TOKENTYPE tokenType,
+                                        String authProvider, String ciServer)
+    {
+        if(accessToken == null)
+        {
+            accessToken = "";
+        }
+        if(authProvider == null)
+        {
+            authProvider = "";
+        }
+        if(ciServer == null)
+        {
+            ciServer = "";
+        }
+        try {
+            mRep.setValue(ESConstants.OC_RSRVD_ES_ACCESSTOKEN, accessToken);
+            mRep.setValue(ESConstants.OC_RSRVD_ES_ACCESSTOKEN_TYPE, tokenType.getValue());
+            mRep.setValue(ESConstants.OC_RSRVD_ES_AUTHPROVIDER, authProvider);
+            mRep.setValue(ESConstants.OC_RSRVD_ES_CISERVER, ciServer);
+        } catch (OcException e) {
+            Log.e(TAG, "setCloudPropWithAccessToken is failed.");
+        }
+    }
+
     public void setCloudID(String cloudID)
     {
         mCloudID = cloudID;
     }
 
+    public void setCredID(int credID)
+    {
+        mCredID = credID;
+    }
     /**
      * This method returns the authCode used for the first registration to IoTivity cloud
      * @return AuthCode for sign-up to IoTivity cloud
      */
     public String getAuthCode()
     {
-        try {
+        if(mRep == null)
+        {
+            return null;
+        }
+
+        try
+        {
             if (mRep.hasAttribute(ESConstants.OC_RSRVD_ES_AUTHCODE))
                 return mRep.getValue(ESConstants.OC_RSRVD_ES_AUTHCODE);
-        } catch (OcException e) {
+        }
+        catch (OcException e)
+        {
             Log.e(TAG, "getAuthCode is failed.");
         }
-        return new String("");
+        return null;
     }
 
     /**
@@ -78,13 +130,21 @@ public class CloudProp {
      */
     public String getAuthProvider()
     {
-        try {
+        if(mRep == null)
+        {
+            return null;
+        }
+
+        try
+        {
             if (mRep.hasAttribute(ESConstants.OC_RSRVD_ES_AUTHPROVIDER))
                 return mRep.getValue(ESConstants.OC_RSRVD_ES_AUTHPROVIDER);
-        } catch (OcException e) {
+        }
+        catch (OcException e)
+        {
             Log.e(TAG, "getAuthProvider is failed.");
         }
-        return new String("");
+        return null;
     }
 
        /**
@@ -93,13 +153,21 @@ public class CloudProp {
      */
     public String getCiServer()
     {
-        try {
+        if(mRep == null)
+        {
+            return null;
+        }
+
+        try
+        {
             if (mRep.hasAttribute(ESConstants.OC_RSRVD_ES_CISERVER))
                 return mRep.getValue(ESConstants.OC_RSRVD_ES_CISERVER);
-        } catch (OcException e) {
+        }
+        catch (OcException e)
+        {
             Log.e(TAG, "getCiServer is failed.");
         }
-        return new String("");
+        return null;
     }
 
     /**
@@ -111,6 +179,61 @@ public class CloudProp {
         return mCloudID;
     }
 
+    /**
+     * This method returns the Cloud Certificate's Cred ID
+     * @return CI server's Credential ID of Certificate
+     */
+    public int getCredID()
+    {
+        return mCredID;
+    }
+
+    /**
+     * This method returns an accessToken used for the first registration to IoTivity cloud
+     * @return accessToken for sign-up to IoTivity cloud
+     */
+    public String getAccessToken()
+    {
+        if(mRep == null)
+        {
+            return null;
+        }
+
+        try
+        {
+            if (mRep.hasAttribute(ESConstants.OC_RSRVD_ES_ACCESSTOKEN))
+                return mRep.getValue(ESConstants.OC_RSRVD_ES_ACCESSTOKEN);
+        }
+        catch (OcException e)
+        {
+            Log.e(TAG, "getAccessToken is failed.");
+        }
+        return null;
+    }
+
+    /**
+     * This method returns an access token type
+     * @return tokenType of access token
+     */
+    public OAUTH_TOKENTYPE getAccessTokenType()
+    {
+        if(mRep == null)
+        {
+            return null;
+        }
+
+        try
+        {
+            if (mRep.hasAttribute(ESConstants.OC_RSRVD_ES_ACCESSTOKEN_TYPE))
+                return OAUTH_TOKENTYPE.fromInt((int)mRep.getValue(ESConstants.OC_RSRVD_ES_ACCESSTOKEN_TYPE));
+        }
+        catch (OcException e)
+        {
+            Log.e(TAG, "getAccessTokenType is failed.");
+        }
+        return OAUTH_TOKENTYPE.NONE_OAUTH_TOKENTYPE;
+    }
+
     public OcRepresentation toOCRepresentation()
     {
         return mRep;