diff --git a/QRBee.Core/Data/RegistrationResponse.cs b/QRBee.Core/Data/RegistrationResponse.cs index 59d0f49..982c3eb 100644 --- a/QRBee.Core/Data/RegistrationResponse.cs +++ b/QRBee.Core/Data/RegistrationResponse.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace QRBee.Core.Data +namespace QRBee.Core.Data { public record RegistrationResponse { diff --git a/QRBee.Core/Security/ReadableCertificateRequest.cs b/QRBee.Core/Security/ReadableCertificateRequest.cs index d4f1cce..4601771 100644 --- a/QRBee.Core/Security/ReadableCertificateRequest.cs +++ b/QRBee.Core/Security/ReadableCertificateRequest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace QRBee.Core.Security +namespace QRBee.Core.Security { public class ReadableCertificateRequest { diff --git a/QRBee/QRBee.Android/MainActivity.cs b/QRBee/QRBee.Android/MainActivity.cs index fb3d8fd..352cd04 100644 --- a/QRBee/QRBee.Android/MainActivity.cs +++ b/QRBee/QRBee.Android/MainActivity.cs @@ -1,9 +1,8 @@ -using System; -using Android; +using Android; using Android.App; using Android.Content.PM; -using Android.Runtime; using Android.OS; +using Android.Runtime; using Android.Support.V4.Content; using AndroidX.Core.App; using Microsoft.Extensions.DependencyInjection; @@ -11,6 +10,7 @@ using Plugin.Fingerprint; using QRBee.Core.Security; using QRBee.Droid.Services; using QRBee.Services; +using System; namespace QRBee.Droid { diff --git a/QRBee/QRBee.Android/Properties/AssemblyInfo.cs b/QRBee/QRBee.Android/Properties/AssemblyInfo.cs index bb9b550..4b86ad1 100644 --- a/QRBee/QRBee.Android/Properties/AssemblyInfo.cs +++ b/QRBee/QRBee.Android/Properties/AssemblyInfo.cs @@ -1,7 +1,6 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using Android.App; +using System.Reflection; using System.Runtime.InteropServices; -using Android.App; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/QRBee/QRBee.Android/Services/AndroidPrivateKeyHandler.cs b/QRBee/QRBee.Android/Services/AndroidPrivateKeyHandler.cs index 74ff2bb..372c12e 100644 --- a/QRBee/QRBee.Android/Services/AndroidPrivateKeyHandler.cs +++ b/QRBee/QRBee.Android/Services/AndroidPrivateKeyHandler.cs @@ -1,10 +1,9 @@ -using System; +using QRBee.Core.Security; +using System; using System.IO; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; -using Javax.Xml.Transform; -using QRBee.Core.Security; namespace QRBee.Droid.Services { diff --git a/QRBee/QRBee.Android/Services/AndroidSecurityService.cs b/QRBee/QRBee.Android/Services/AndroidSecurityService.cs index af1b040..4d1d9e2 100644 --- a/QRBee/QRBee.Android/Services/AndroidSecurityService.cs +++ b/QRBee/QRBee.Android/Services/AndroidSecurityService.cs @@ -1,8 +1,8 @@ -using System; +using QRBee.Core.Security; +using System; +using System.IO; using System.Security.Cryptography.X509Certificates; using System.Text; -using System.IO; -using QRBee.Core.Security; namespace QRBee.Droid.Services { diff --git a/QRBee/QRBee.Android/Services/CryptoHelper.cs b/QRBee/QRBee.Android/Services/CryptoHelper.cs index 6fa64a6..327f1a1 100644 --- a/QRBee/QRBee.Android/Services/CryptoHelper.cs +++ b/QRBee/QRBee.Android/Services/CryptoHelper.cs @@ -13,7 +13,7 @@ namespace QRBee.Droid.Services //password based encryption, it's probably safe enough as long as //it is truly uncommon. Also too much work to alter this answer otherwise. // Never use salt like this - private static byte[] _salt = System.Text.Encoding.UTF8.GetBytes("‘wÑÏU4)MÓvcvsª"); + private static readonly byte[] _salt = System.Text.Encoding.UTF8.GetBytes("‘wÑÏU4)MÓvcvsª"); /// /// Encrypt the given string using AES. The string can be decrypted using diff --git a/QRBee/QRBee.Android/Services/LocalSettings.cs b/QRBee/QRBee.Android/Services/LocalSettings.cs index cd1ab12..dbf55aa 100644 --- a/QRBee/QRBee.Android/Services/LocalSettings.cs +++ b/QRBee/QRBee.Android/Services/LocalSettings.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; -using Newtonsoft.Json; +using Newtonsoft.Json; using QRBee.Services; +using System.Threading.Tasks; using Xamarin.Forms; [assembly: Dependency(typeof(QRBee.Droid.Services.LocalSettings))] diff --git a/QRBee/QRBee.Android/Services/QRScannerService.cs b/QRBee/QRBee.Android/Services/QRScannerService.cs index 95a000d..47888fa 100644 --- a/QRBee/QRBee.Android/Services/QRScannerService.cs +++ b/QRBee/QRBee.Android/Services/QRScannerService.cs @@ -1,5 +1,5 @@ -using System.Threading.Tasks; -using QRBee.Services; +using QRBee.Services; +using System.Threading.Tasks; using Xamarin.Forms; using ZXing.Mobile; diff --git a/QRBee/QRBee/App.xaml.cs b/QRBee/QRBee/App.xaml.cs index b3c2eb8..0920ec4 100644 --- a/QRBee/QRBee/App.xaml.cs +++ b/QRBee/QRBee/App.xaml.cs @@ -1,9 +1,7 @@ -using QRBee.Services; -using QRBee.Views; -using System; -using Microsoft.Extensions.DependencyInjection; -using QRBee.Core.Security; +using Microsoft.Extensions.DependencyInjection; +using QRBee.Services; using QRBee.ViewModels; +using System; using Xamarin.Forms; namespace QRBee @@ -22,7 +20,7 @@ namespace QRBee } protected static IServiceProvider ServiceProvider { get; set; } - void SetupServices(Action addPlatformServices = null) + private void SetupServices(Action addPlatformServices = null) { var services = new ServiceCollection(); diff --git a/QRBee/QRBee/AppShell.xaml.cs b/QRBee/QRBee/AppShell.xaml.cs index 688cf57..1176b6d 100644 --- a/QRBee/QRBee/AppShell.xaml.cs +++ b/QRBee/QRBee/AppShell.xaml.cs @@ -1,7 +1,4 @@ -using QRBee.ViewModels; -using QRBee.Views; -using System; -using System.Collections.Generic; +using QRBee.Views; using Xamarin.Forms; namespace QRBee diff --git a/QRBee/QRBee/Models/Item.cs b/QRBee/QRBee/Models/Item.cs index 8888257..346bc40 100644 --- a/QRBee/QRBee/Models/Item.cs +++ b/QRBee/QRBee/Models/Item.cs @@ -1,6 +1,4 @@ -using System; - -namespace QRBee.Models +namespace QRBee.Models { public class Item { diff --git a/QRBee/QRBee/Services/IDataStore.cs b/QRBee/QRBee/Services/IDataStore.cs index dd0b173..00541b7 100644 --- a/QRBee/QRBee/Services/IDataStore.cs +++ b/QRBee/QRBee/Services/IDataStore.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; namespace QRBee.Services diff --git a/QRBee/QRBee/Services/ILocalSettings.cs b/QRBee/QRBee/Services/ILocalSettings.cs index c40ebec..0855980 100644 --- a/QRBee/QRBee/Services/ILocalSettings.cs +++ b/QRBee/QRBee/Services/ILocalSettings.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace QRBee.Services diff --git a/QRBee/QRBee/Services/IQRScanner.cs b/QRBee/QRBee/Services/IQRScanner.cs index 3d4c315..a93e80d 100644 --- a/QRBee/QRBee/Services/IQRScanner.cs +++ b/QRBee/QRBee/Services/IQRScanner.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; +using System.Threading.Tasks; namespace QRBee.Services { diff --git a/QRBee/QRBee/Services/MockDataStore.cs b/QRBee/QRBee/Services/MockDataStore.cs index 2c4d4cc..4906f34 100644 --- a/QRBee/QRBee/Services/MockDataStore.cs +++ b/QRBee/QRBee/Services/MockDataStore.cs @@ -8,7 +8,7 @@ namespace QRBee.Services { public class MockDataStore : IDataStore { - readonly List items; + private readonly List items; public MockDataStore() { diff --git a/QRBee/QRBee/ViewModels/BaseViewModel.cs b/QRBee/QRBee/ViewModels/BaseViewModel.cs index ffb4801..473dc0b 100644 --- a/QRBee/QRBee/ViewModels/BaseViewModel.cs +++ b/QRBee/QRBee/ViewModels/BaseViewModel.cs @@ -12,14 +12,14 @@ namespace QRBee.ViewModels { public IDataStore DataStore => DependencyService.Get>(); - bool isBusy = false; + private bool isBusy = false; public bool IsBusy { get { return isBusy; } set { SetProperty(ref isBusy, value); } } - string title = string.Empty; + private string title = string.Empty; public string Title { get { return title; } diff --git a/QRBee/QRBee/ViewModels/ClientPageViewModel.cs b/QRBee/QRBee/ViewModels/ClientPageViewModel.cs index ed6c7ba..d613e5e 100644 --- a/QRBee/QRBee/ViewModels/ClientPageViewModel.cs +++ b/QRBee/QRBee/ViewModels/ClientPageViewModel.cs @@ -1,9 +1,8 @@ -using System; -using System.Text; -using QRBee.Core.Data; +using QRBee.Core.Data; using QRBee.Core.Security; using QRBee.Services; -using QRBee.Views; +using System; +using System.Text; using Xamarin.Forms; namespace QRBee.ViewModels diff --git a/QRBee/QRBee/ViewModels/LoginViewModel.cs b/QRBee/QRBee/ViewModels/LoginViewModel.cs index 99f52b7..b626d90 100644 --- a/QRBee/QRBee/ViewModels/LoginViewModel.cs +++ b/QRBee/QRBee/ViewModels/LoginViewModel.cs @@ -1,8 +1,7 @@ -using System.Linq; -using QRBee.Views; -using Plugin.Fingerprint; +using Plugin.Fingerprint; using Plugin.Fingerprint.Abstractions; using QRBee.Services; +using QRBee.Views; using Xamarin.Forms; namespace QRBee.ViewModels diff --git a/QRBee/QRBee/ViewModels/MerchantPageViewModel.cs b/QRBee/QRBee/ViewModels/MerchantPageViewModel.cs index d59b077..7372de6 100644 --- a/QRBee/QRBee/ViewModels/MerchantPageViewModel.cs +++ b/QRBee/QRBee/ViewModels/MerchantPageViewModel.cs @@ -1,10 +1,9 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Text; -using QRBee.Core.Data; +using QRBee.Core.Data; using QRBee.Core.Security; using QRBee.Services; +using System; +using System.Net.Http; +using System.Text; using Xamarin.Forms; namespace QRBee.ViewModels @@ -85,12 +84,14 @@ namespace QRBee.ViewModels // the HttpClient object is constructed in a shared project. public HttpClientHandler GetInsecureHandler() { - var handler = new HttpClientHandler(); - handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => + var handler = new HttpClientHandler { - if (cert.Issuer.Equals("CN=localhost")) - return true; - return errors == System.Net.Security.SslPolicyErrors.None; + ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => + { + if (cert.Issuer.Equals("CN=localhost")) + return true; + return errors == System.Net.Security.SslPolicyErrors.None; + } }; return handler; } diff --git a/QRBee/QRBee/ViewModels/RegisterViewModel.cs b/QRBee/QRBee/ViewModels/RegisterViewModel.cs index e73afd5..c0d75e7 100644 --- a/QRBee/QRBee/ViewModels/RegisterViewModel.cs +++ b/QRBee/QRBee/ViewModels/RegisterViewModel.cs @@ -1,12 +1,11 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Text.RegularExpressions; -using QRBee.Core; -using QRBee.Core.Data; +using QRBee.Core.Data; using QRBee.Core.Security; using QRBee.Services; using QRBee.Views; +using System; +using System.Linq; +using System.Net.Http; +using System.Text.RegularExpressions; using Xamarin.Forms; namespace QRBee.ViewModels @@ -192,12 +191,14 @@ namespace QRBee.ViewModels // the HttpClient object is constructed in a shared project. public HttpClientHandler GetInsecureHandler() { - var handler = new HttpClientHandler(); - handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => + var handler = new HttpClientHandler { - if (cert.Issuer.Equals("CN=localhost")) - return true; - return errors == System.Net.Security.SslPolicyErrors.None; + ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => + { + if (cert.Issuer.Equals("CN=localhost")) + return true; + return errors == System.Net.Security.SslPolicyErrors.None; + } }; return handler; } diff --git a/QRBee/QRBee/Views/ClientPage.xaml.cs b/QRBee/QRBee/Views/ClientPage.xaml.cs index 167f30a..9652220 100644 --- a/QRBee/QRBee/Views/ClientPage.xaml.cs +++ b/QRBee/QRBee/Views/ClientPage.xaml.cs @@ -1,6 +1,4 @@ -using System; -using QRBee.Services; -using QRBee.ViewModels; +using QRBee.ViewModels; using Xamarin.Forms; using Xamarin.Forms.Xaml; diff --git a/QRBee/QRBee/Views/LoginPage.xaml.cs b/QRBee/QRBee/Views/LoginPage.xaml.cs index 5a7c40d..6bd096b 100644 --- a/QRBee/QRBee/Views/LoginPage.xaml.cs +++ b/QRBee/QRBee/Views/LoginPage.xaml.cs @@ -1,9 +1,4 @@ using QRBee.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Xamarin.Forms; using Xamarin.Forms.Xaml; diff --git a/QRBee/QRBee/Views/MerchantPage.xaml.cs b/QRBee/QRBee/Views/MerchantPage.xaml.cs index 5d09643..03be835 100644 --- a/QRBee/QRBee/Views/MerchantPage.xaml.cs +++ b/QRBee/QRBee/Views/MerchantPage.xaml.cs @@ -1,5 +1,5 @@ -using Xamarin.Forms.Xaml; -using QRBee.ViewModels; +using QRBee.ViewModels; +using Xamarin.Forms.Xaml; namespace QRBee.Views { diff --git a/QRBee/QRBee/Views/RegisterPage.xaml.cs b/QRBee/QRBee/Views/RegisterPage.xaml.cs index 5377ad3..a25a61e 100644 --- a/QRBee/QRBee/Views/RegisterPage.xaml.cs +++ b/QRBee/QRBee/Views/RegisterPage.xaml.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using QRBee.ViewModels; +using QRBee.ViewModels; using Xamarin.Forms; using Xamarin.Forms.Xaml; diff --git a/QRBeeApi/Controllers/QRBeeController.cs b/QRBeeApi/Controllers/QRBeeController.cs index a278377..ff67c19 100644 --- a/QRBeeApi/Controllers/QRBeeController.cs +++ b/QRBeeApi/Controllers/QRBeeController.cs @@ -1,7 +1,5 @@ using Microsoft.AspNetCore.Mvc; -using MongoDB.Driver; using QRBee.Api.Services; -using QRBee.Core; using QRBee.Core.Data; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 diff --git a/QRBeeApi/Services/Database/CertificateInfo.cs b/QRBeeApi/Services/Database/CertificateInfo.cs index 8c21e68..9d8dd0b 100644 --- a/QRBeeApi/Services/Database/CertificateInfo.cs +++ b/QRBeeApi/Services/Database/CertificateInfo.cs @@ -1,5 +1,4 @@ -using System.Security.Cryptography.X509Certificates; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; namespace QRBee.Api.Services.Database { diff --git a/QRBeeApi/Services/Database/Storage.cs b/QRBeeApi/Services/Database/Storage.cs index 44de1a9..c9276e0 100644 --- a/QRBeeApi/Services/Database/Storage.cs +++ b/QRBeeApi/Services/Database/Storage.cs @@ -1,7 +1,5 @@ -using System.Security.Cryptography.X509Certificates; -using Microsoft.Extensions.Options; +using Microsoft.Extensions.Options; using MongoDB.Driver; -using QRBee.Api.Controllers; namespace QRBee.Api.Services.Database { diff --git a/QRBeeApi/Services/Database/TransactionInfo.cs b/QRBeeApi/Services/Database/TransactionInfo.cs index 9339271..99f46bb 100644 --- a/QRBeeApi/Services/Database/TransactionInfo.cs +++ b/QRBeeApi/Services/Database/TransactionInfo.cs @@ -1,5 +1,4 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; using QRBee.Core.Data; namespace QRBee.Api.Services.Database diff --git a/QRBeeApi/Services/IQRBeeAPI.cs b/QRBeeApi/Services/IQRBeeAPI.cs index e3c6dc3..ada8c4a 100644 --- a/QRBeeApi/Services/IQRBeeAPI.cs +++ b/QRBeeApi/Services/IQRBeeAPI.cs @@ -1,7 +1,4 @@ -using System.Security.Cryptography.X509Certificates; -using Microsoft.AspNetCore.Mvc; -using QRBee.Core; -using QRBee.Core.Data; +using QRBee.Core.Data; namespace QRBee.Api.Services { diff --git a/QRBeeApi/Services/QRBeeAPIService.cs b/QRBeeApi/Services/QRBeeAPIService.cs index 01ef060..f47841d 100644 --- a/QRBeeApi/Services/QRBeeAPIService.cs +++ b/QRBeeApi/Services/QRBeeAPIService.cs @@ -1,13 +1,11 @@ -using System.Globalization; -using System.Runtime.CompilerServices; +using QRBee.Api.Services.Database; +using QRBee.Core.Data; +using QRBee.Core.Security; +using System.Globalization; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; -using QRBee.Api.Services.Database; -using QRBee.Core; -using QRBee.Core.Data; -using QRBee.Core.Security; namespace QRBee.Api.Services { diff --git a/QRBeeApi/Services/SecurityService.cs b/QRBeeApi/Services/SecurityService.cs index c915f64..896644c 100644 --- a/QRBeeApi/Services/SecurityService.cs +++ b/QRBeeApi/Services/SecurityService.cs @@ -1,9 +1,7 @@ -using System; +using QRBee.Core.Security; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; -using System.Text.RegularExpressions; -using QRBee.Core.Security; namespace QRBee.Api.Services { diff --git a/QRBeeApi/Services/ServerPrivateKeyHandler.cs b/QRBeeApi/Services/ServerPrivateKeyHandler.cs index 2857bd4..f1461ae 100644 --- a/QRBeeApi/Services/ServerPrivateKeyHandler.cs +++ b/QRBeeApi/Services/ServerPrivateKeyHandler.cs @@ -1,7 +1,7 @@ -using System.Security.Cryptography; +using QRBee.Core.Security; +using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; -using QRBee.Core.Security; namespace QRBee.Api.Services {