Fixed issue where both key and iv aren't stored for upload and it would try to decrypt it.

Teknik/Areas/API/Controllers/APIv1Controller.cs

@@ -93,7 +93,7 @@ namespace Teknik.Areas.API.Controllers
                             string fullUrl = Url.SubRouteUrl("upload", "Upload.Download", new { file = upload.Url });
                             var returnData = new
                             {
-                                url = (saveKey) ? fullUrl : fullUrl + "#" + key,
+                                url = (saveKey && !string.IsNullOrEmpty(key)) ? fullUrl : fullUrl + "#" + key,
                                 fileName = upload.Url,
                                 contentType = contentType,
                                 contentLength = contentLength,

Teknik/Areas/Upload/Controllers/UploadController.cs

@@ -119,11 +119,16 @@ namespace Teknik.Areas.Upload.Controllers
                     if (System.IO.File.Exists(upload.FileName))
                     {
                         // Read in the file
-                        byte[] encData = System.IO.File.ReadAllBytes(upload.FileName);
-                        // Decrypt the data
-                        byte[] data = AES.Decrypt(encData, upload.Key, upload.IV);
+                        byte[] data = System.IO.File.ReadAllBytes(upload.FileName);
 
-                        // Create File
+                        // If the IV is set, and Key is set, then decrypt it
+                        if (!string.IsNullOrEmpty(upload.Key) && !string.IsNullOrEmpty(upload.IV))
+                        {
+                            // Decrypt the data
+                            data = AES.Decrypt(data, upload.Key, upload.IV);
+                        }
+
+                        // Create content disposition
                         var cd = new System.Net.Mime.ContentDisposition
                         {
                             FileName = upload.Url,