Automated code cleanup.

QRBee.Core/Data/RegistrationResponse.cs

@@ -1,8 +1,4 @@
-using System;
+namespace QRBee.Core.Data
-using System.Collections.Generic;
-using System.Text;
-
-namespace QRBee.Core.Data
 {
     public record RegistrationResponse
     {

QRBee.Core/Security/ReadableCertificateRequest.cs

@@ -1,8 +1,4 @@
-using System;
+namespace QRBee.Core.Security
-using System.Collections.Generic;
-using System.Text;
-
-namespace QRBee.Core.Security
 {
     public class ReadableCertificateRequest
     {

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
 {

QRBee/QRBee.Android/Properties/AssemblyInfo.cs

@@ -1,7 +1,6 @@
-using System.Reflection;
+using Android.App;
-using System.Runtime.CompilerServices;
+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

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
 {

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
 {

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ª");
 
         /// <summary>
         /// Encrypt the given string using AES.  The string can be decrypted using 

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))]

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;
 

QRBee/QRBee/App.xaml.cs

@@ -1,9 +1,7 @@
-using QRBee.Services;
+using Microsoft.Extensions.DependencyInjection;
-using QRBee.Views;
+using QRBee.Services;
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using QRBee.Core.Security;
 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<IServiceCollection> addPlatformServices = null)
+        private void SetupServices(Action<IServiceCollection> addPlatformServices = null)
         {
             var services = new ServiceCollection();
 

QRBee/QRBee/AppShell.xaml.cs

@@ -1,7 +1,4 @@
-using QRBee.ViewModels;
+using QRBee.Views;
-using QRBee.Views;
-using System;
-using System.Collections.Generic;
 using Xamarin.Forms;
 
 namespace QRBee

QRBee/QRBee/Models/Item.cs

@@ -1,6 +1,4 @@
-using System;
+namespace QRBee.Models
-
-namespace QRBee.Models
 {
     public class Item
     {

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

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

QRBee/QRBee/Services/IQRScanner.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace QRBee.Services
 {

QRBee/QRBee/Services/MockDataStore.cs

@@ -8,7 +8,7 @@ namespace QRBee.Services
 {
     public class MockDataStore : IDataStore<Item>
     {
-        readonly List<Item> items;
+        private readonly List<Item> items;
 
         public MockDataStore()
         {

QRBee/QRBee/ViewModels/BaseViewModel.cs

@@ -12,14 +12,14 @@ namespace QRBee.ViewModels
     {
         public IDataStore<Item> DataStore => DependencyService.Get<IDataStore<Item>>();
 
-        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; }

QRBee/QRBee/ViewModels/ClientPageViewModel.cs

@@ -1,9 +1,8 @@
-using System;
+using QRBee.Core.Data;
-using System.Text;
-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

QRBee/QRBee/ViewModels/LoginViewModel.cs

@@ -1,8 +1,7 @@
-using System.Linq;
+using Plugin.Fingerprint;
-using QRBee.Views;
-using Plugin.Fingerprint;
 using Plugin.Fingerprint.Abstractions;
 using QRBee.Services;
+using QRBee.Views;
 using Xamarin.Forms;
 
 namespace QRBee.ViewModels

QRBee/QRBee/ViewModels/MerchantPageViewModel.cs

@@ -1,10 +1,9 @@
-using System;
+using QRBee.Core.Data;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-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();
+            var handler = new HttpClientHandler
-            handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) =>
+            {
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) =>
                 {
                     if (cert.Issuer.Equals("CN=localhost"))
                         return true;
                     return errors == System.Net.Security.SslPolicyErrors.None;
+                }
             };
             return handler;
         }

QRBee/QRBee/ViewModels/RegisterViewModel.cs

@@ -1,12 +1,11 @@
-using System;
+using QRBee.Core.Data;
-using System.Linq;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using QRBee.Core;
-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();
+            var handler = new HttpClientHandler
-            handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) =>
+            {
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) =>
                 {
                     if (cert.Issuer.Equals("CN=localhost"))
                         return true;
                     return errors == System.Net.Security.SslPolicyErrors.None;
+                }
             };
             return handler;
         }

QRBee/QRBee/Views/ClientPage.xaml.cs

@@ -1,6 +1,4 @@
-using System;
+using QRBee.ViewModels;
-using QRBee.Services;
-using QRBee.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 

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;
 

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
 {

QRBee/QRBee/Views/RegisterPage.xaml.cs

@@ -1,9 +1,4 @@
-using System;
+using QRBee.ViewModels;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using QRBee.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 

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

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
 {

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
 {

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

QRBeeApi/Services/IQRBeeAPI.cs

@@ -1,7 +1,4 @@
-using System.Security.Cryptography.X509Certificates;
+using QRBee.Core.Data;
-using Microsoft.AspNetCore.Mvc;
-using QRBee.Core;
-using QRBee.Core.Data;
 
 namespace QRBee.Api.Services
 {

QRBeeApi/Services/QRBeeAPIService.cs

@@ -1,13 +1,11 @@
-using System.Globalization;
+using QRBee.Api.Services.Database;
-using System.Runtime.CompilerServices;
+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
 {

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
 {

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
 {