Add CloudAppProperties Struct and update SCAP&Rsp

2 files changed, 101 insertions, 55 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
new file mode 100644
index 000000000..3c0cb4c8d
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
@@ -0,0 +1,92 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.HybridAppPreference;
+
+import java.util.Hashtable;
+
+/**
+ * Properties that relate to a a cloud app entry.
+ */
+public class CloudAppProperties extends RPCStruct {
+    public static final String KEY_APP_NAME                 = "appName";
+    public static final String KEY_APP_ID                   = "appID";
+    public static final String KEY_ENABLED                  = "enabled";
+    public static final String KEY_APP_AUTH_TOKEN           = "appAuthToken";
+    public static final String KEY_CLOUD_TRANSPORT_TYPE     = "cloudTransportType";
+    public static final String KEY_HYBRID_APP_PREFERENCE    = "hybridAppPreference";
+    public static final String KEY_ENDPOINT                 = "endpoint";
+
+
+    public CloudAppProperties(){}
+
+    public CloudAppProperties(Hashtable<String, Object> hash) {
+        super(hash);
+    }
+
+    public CloudAppProperties(@NonNull String appName, @NonNull String appID){
+        this();
+        setValue(KEY_APP_NAME, appName);
+        setValue(KEY_APP_ID, appID);
+    }
+
+    public void setAppName(String appName){
+        setValue(KEY_APP_NAME, appName);
+    }
+
+    public String getAppName(){
+        return getString((KEY_APP_NAME));
+    }
+
+    public void setAppID(String appID){
+        setValue(KEY_APP_ID, appID);
+    }
+
+    public String getAppID(){
+        return getString((KEY_APP_ID));
+    }
+
+    /**
+     * If true, this cloud app entry will designate it should appear in the HMI
+     * @param enabled if the app should be
+     */
+    public void setEnabled(boolean enabled){
+        setValue(KEY_ENABLED, enabled);
+    }
+
+    /**
+     * @return if this cloud app entry will designate it should appear in the HMI
+     */
+    public Boolean isEnabled(){
+        return getBoolean((KEY_ENABLED));
+    }
+
+    public void setAppAuthToken(String token){
+        setValue(KEY_APP_AUTH_TOKEN, token);
+    }
+
+    public String getAppAuthToken(){
+        return getString((KEY_APP_AUTH_TOKEN));
+    }
+
+    public void setCloudTransportType(String transportType){
+        setValue(KEY_CLOUD_TRANSPORT_TYPE, transportType);
+    }
+
+    public String getCloudTransportType(){
+        return getString((KEY_CLOUD_TRANSPORT_TYPE));
+    }
+
+    public void setHybridAppPreference(HybridAppPreference hybridAppPreference){
+        setValue(KEY_HYBRID_APP_PREFERENCE, hybridAppPreference);
+    }
+
+    public HybridAppPreference getHybridAppPreference(){
+        return (HybridAppPreference)getObject(HybridAppPreference.class, KEY_HYBRID_APP_PREFERENCE);
+    }
+
+
+
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
index e447a8e1c..7fac16e1a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
@@ -1,21 +1,15 @@
 package com.smartdevicelink.proxy.rpc;
 
+import android.support.annotation.NonNull;
+
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.proxy.rpc.enums.HybridAppPreference;
 
 import java.util.Hashtable;
 
 public class SetCloudAppProperties extends RPCRequest {
 
-    public static final String KEY_APP_NAME                 = "appName";
-    public static final String KEY_APP_ID                   = "appID";
-    public static final String KEY_ENABLED                  = "enabled";
-    public static final String KEY_CLOUD_APP_AUTH_TOKEN     = "cloudAppAuthToken";
-    public static final String KEY_CLOUD_TRANSPORT_TYPE     = "cloudTransportType";
-    public static final String KEY_HYBRID_APP_PREFERENCE    = "hybridAppPreference";
-
-
+    public static final String KEY_PROPERTIES         = "properties";
 
     public SetCloudAppProperties(){
         super(FunctionID.SET_CLOUD_APP_PROPERTIES.toString());
@@ -25,58 +19,18 @@ public class SetCloudAppProperties extends RPCRequest {
         super(hash);
     }
 
-    public SetCloudAppProperties(String appName, String appId){
+    public SetCloudAppProperties(@NonNull CloudAppProperties cloudAppProperties){
         this();
-        setParameters(KEY_APP_NAME, appName);
-        setParameters(KEY_APP_ID, appId);
-    }
-
-    public void setAppName(String appName){
-        setParameters(KEY_APP_NAME, appName);
-    }
-
-    public String getAppName(){
-        return getString((KEY_APP_NAME));
-    }
-
-    public void setAppId(String appId){
-        setParameters(KEY_APP_ID, appId);
-    }
-
-    public String getAppId(){
-        return getString((KEY_APP_ID));
+        setParameters(KEY_PROPERTIES, cloudAppProperties);
     }
 
-    public void setEnabled(boolean enabled){
-        setParameters(KEY_ENABLED, enabled);
+    public void setCloudAppProperties(@NonNull CloudAppProperties cloudAppProperties){
+        setParameters(KEY_PROPERTIES, cloudAppProperties);
     }
 
-    public Boolean isEnabled(){
-        return getBoolean((KEY_ENABLED));
+    public CloudAppProperties getCloudAppProperties(){
+        return (CloudAppProperties) getObject(CloudAppProperties.class, KEY_PROPERTIES);
     }
 
-    public void setCloudAppAuthToken(String token){
-        setParameters(KEY_CLOUD_APP_AUTH_TOKEN, token);
-    }
-
-    public String getCloudAppAuthToken(){
-        return getString((KEY_CLOUD_APP_AUTH_TOKEN));
-    }
-
-    public void setCloudTransportType(String transportType){
-        setParameters(KEY_CLOUD_TRANSPORT_TYPE, transportType);
-    }
-
-    public String getCloudTransportType(){
-        return getString((KEY_CLOUD_TRANSPORT_TYPE));
-    }
-
-    public void setHybridAppPreference(HybridAppPreference hybridAppPreference){
-        setParameters(KEY_HYBRID_APP_PREFERENCE, hybridAppPreference);
-    }
-
-    public HybridAppPreference getHybridAppPreference(){
-        return (HybridAppPreference)getObject(HybridAppPreference.class, KEY_HYBRID_APP_PREFERENCE);
-    }
 
 }