Winify – Diff between revs 40 and 41

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 40 Rev 41
Line 289... Line 289...
289 { 289 {
290 Server = new BindingListWithCollectionChanged<Server>() 290 Server = new BindingListWithCollectionChanged<Server>()
291 }; 291 };
292 foreach (var server in servers.Server) 292 foreach (var server in servers.Server)
293 { 293 {
294 var encrypted = AES.Encrypt(Encoding.UTF8.GetBytes(server.Password), deviceId); 294 var password = Encoding.UTF8.GetBytes(server.Password);
-   295 var encrypted = await AES.Encrypt(password, deviceId);
295 var armored = Convert.ToBase64String(encrypted); 296 var armored = Convert.ToBase64String(encrypted);
Line 296... Line 297...
296   297  
297 @protected.Server.Add(new Server(server.Name, server.Url, server.Username, armored)); 298 @protected.Server.Add(new Server(server.Name, server.Url, server.Username, armored));
Line 347... Line 348...
347 Server = new BindingListWithCollectionChanged<Server>() 348 Server = new BindingListWithCollectionChanged<Server>()
348 }; 349 };
349 foreach (var server in serializationSuccess.Result.Server) 350 foreach (var server in serializationSuccess.Result.Server)
350 { 351 {
351 var unarmored = Convert.FromBase64String(server.Password); 352 var unarmored = Convert.FromBase64String(server.Password);
352 var decrypted = Encoding.UTF8.GetString(AES.Decrypt(unarmored, deviceId)); 353 var result = await AES.Decrypt(unarmored, deviceId);
-   354 var decrypted = Encoding.UTF8.GetString(result);
Line 353... Line 355...
353   355  
354 @protected.Server.Add(new Server(server.Name, server.Url, server.Username, decrypted)); 356 @protected.Server.Add(new Server(server.Name, server.Url, server.Username, decrypted));
Line 355... Line 357...
355 } 357 }