github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code quality changes

Browse source
This commit is contained in:
Robin 2016-09-22 20:40:13 +02:00
parent f07ed83722
commit 610f45d082
189 changed files with 4609 additions and 5203 deletions
Download patch file Download diff file Expand all files Collapse all files

28
GreenshotPlugin/Core/StringExtensions.cs
View file

@ -52,7 +52,7 @@ namespace GreenshotPlugin.Core {
/// <returns>Formatted string</returns>
public static string FormatWith(this string format, IFormatProvider provider, object source) {
if (format == null) {
throw new ArgumentNullException("format");
throw new ArgumentNullException(nameof(format));
}
IDictionary<string, object> properties = new Dictionary<string, object>();
@ -80,11 +80,7 @@ namespace GreenshotPlugin.Core {
Group endGroup = m.Groups["end"];
object value;
if (properties.TryGetValue(propertyGroup.Value, out value)) {
values.Add(value);
} else {
values.Add(source);
}
values.Add(properties.TryGetValue(propertyGroup.Value, out value) ? value : source);
return new string('{', startGroup.Captures.Count) + (values.Count - 1) + formatGroup.Value + new string('}', endGroup.Captures.Count);
});
@ -94,12 +90,12 @@ namespace GreenshotPlugin.Core {
/// <summary>
/// A simply rijndael aes encryption, can be used to store passwords
/// </summary>
/// <param name="ClearText">the string to call upon</param>
/// <param name="clearText">the string to call upon</param>
/// <returns>an encryped string in base64 form</returns>
public static string Encrypt(this string ClearText) {
string returnValue = ClearText;
public static string Encrypt(this string clearText) {
string returnValue = clearText;
try {
byte[] clearTextBytes = Encoding.ASCII.GetBytes(ClearText);
byte[] clearTextBytes = Encoding.ASCII.GetBytes(clearText);
SymmetricAlgorithm rijn = SymmetricAlgorithm.Create();
using (MemoryStream ms = new MemoryStream()) {
@ -113,7 +109,7 @@ namespace GreenshotPlugin.Core {
}
}
} catch (Exception ex) {
LOG.ErrorFormat("Error encrypting, error: ", ex.Message);
LOG.ErrorFormat("Error encrypting, error: {0}", ex.Message);
}
return returnValue;
}
@ -121,12 +117,12 @@ namespace GreenshotPlugin.Core {
/// <summary>
/// A simply rijndael aes decryption, can be used to store passwords
/// </summary>
/// <param name="EncryptedText">a base64 encoded rijndael encrypted string</param>
/// <param name="encryptedText">a base64 encoded rijndael encrypted string</param>
/// <returns>Decrypeted text</returns>
public static string Decrypt(this string EncryptedText) {
string returnValue = EncryptedText;
public static string Decrypt(this string encryptedText) {
string returnValue = encryptedText;
try {
byte[] encryptedTextBytes = Convert.FromBase64String(EncryptedText);
byte[] encryptedTextBytes = Convert.FromBase64String(encryptedText);
using (MemoryStream ms = new MemoryStream()) {
SymmetricAlgorithm rijn = SymmetricAlgorithm.Create();
@ -142,7 +138,7 @@ namespace GreenshotPlugin.Core {
}
} catch (Exception ex) {
LOG.ErrorFormat("Error decrypting {0}, error: ", EncryptedText, ex.Message);
LOG.ErrorFormat("Error decrypting {0}, error: {1}", encryptedText, ex.Message);
}
return returnValue;