when downloading an encrypted asset that already exists locally, dont set its local value to null and keep old local value instead

Author: jodoglevy

AutomationISE/Model/AutomationCredential.cs

@@ -64,6 +64,7 @@ public string getUsername()
 
         public void setUsername(string username)
         {
+            this.ValueFields.Remove("Username");
             this.ValueFields.Add("Username", username);
         }
 
@@ -76,6 +77,7 @@ public string getPassword()
 
         public void setPassword(string password)
         {
+            this.ValueFields.Remove("Password");
             this.ValueFields.Add("Password", password);
         }
     }

AutomationISE/Model/AutomationVariable.cs

@@ -74,6 +74,7 @@ public Object getValue()
 
         public void setValue(Object value)
         {
+            this.ValueFields.Remove("Value"); 
             this.ValueFields.Add("Value", value);
         }
 

AutomationISE/Model/LocalAssetsStore.cs

@@ -65,32 +65,55 @@ private static void Set(String workspacePath, ICollection<AutomationAsset> asset
 
                 if (assetToAffect is AutomationVariable)
                 {
+                    var variableToAffect = (AutomationVariable)assetToAffect;
+                    
                     if (assetToDelete != null)
                     {
-                        localAssets.Variables.Remove((VariableJson)assetToDelete);
+                        var variableToDelete = (VariableJson)assetToDelete;
+                        
+                        // Encrypted variable assets returned from the cloud have their values removed,
+                        // so keep the old local asset value instead of overwriting the local asset value with null
+                        if(variableToAffect.Encrypted && variableToAffect.getValue() == null) {
+                            variableToAffect.setValue(variableToDelete.Value);
+                        }
+
+                        localAssets.Variables.Remove(variableToDelete);
                     }
 
                     if (replace)
                     {
-                        localAssets.Variables.Add(new VariableJson((AutomationVariable)assetToAffect));
+                        localAssets.Variables.Add(new VariableJson(variableToAffect));
                     }
                 }
 
                 else if (assetToAffect is AutomationCredential)
                 {
+                    var credToAffect = (AutomationCredential)assetToAffect;
+                    
                     if (assetToDelete != null)
                     {
-                        localAssets.PSCredentials.Remove((CredentialJson)assetToDelete);
+                        var credToDelete = (CredentialJson)assetToDelete;
+
+                        // PSCredential assets returned from the cloud have their passwords removed,
+                        // so keep the old local asset password instead of overwriting the local asset password with null
+                        if (credToAffect.getPassword() == null)
+                        {
+                            credToAffect.setPassword(credToDelete.Password);
+                        }
+                        
+                        localAssets.PSCredentials.Remove(credToDelete);
                     }
 
                     if (replace)
                     {
-                        localAssets.PSCredentials.Add(new CredentialJson((AutomationCredential)assetToAffect));
+                        localAssets.PSCredentials.Add(new CredentialJson(credToAffect));
                     }
                 }
 
                 else if (assetToAffect is AutomationConnection)
                 {
+                    // TODO: support carry over of null fields from previous local asset
+
                     if (assetToDelete != null)
                     {
                         localAssets.Connections.Remove((ConnectionJson)assetToDelete);