Prepare 0.3.2

Author: bitbeans

SimpleDnsCrypt/Config/Global.cs

@@ -107,22 +107,22 @@ public static class Global
         /// <summary>
         ///     The default pimary resolver, if no resolver is set (on start up)
         /// </summary>
-        public const string DefaultPrimaryResolverName = "dnscrypt.me";
+        public const string DefaultPrimaryResolverName = "dnscrypt.org-fr";
 
         /// <summary>
         ///     The backup primary resolver, if DefaultPrimaryResolverName is not in the list.
         /// </summary>
-        public const string DefaultPrimaryBackupResolverName = "dnscrypt.org-fr";
+        public const string DefaultPrimaryBackupResolverName = "d0wn-random-ns1";
 
         /// <summary>
         ///     The default secondary resolver, if no resolver is set (on start up)
         /// </summary>
-        public const string DefaultSecondaryResolverName = "d0wn-random-ns1";
+        public const string DefaultSecondaryResolverName = "d0wn-random-ns2";
 
         /// <summary>
         ///     The backup secondary resolver, if DefaultSecondaryResolverName is not in the list.
         /// </summary>
-        public const string DefaultSecondaryBackupResolverName = "dnscrypt.org-fr";
+        public const string DefaultSecondaryBackupResolverName = "dnscrypt.eu-nl";
 
         /// <summary>
         ///     Time we wait on a service restart (ms).

SimpleDnsCrypt/Images/bytejail_logo.png

@@ -276,13 +276,13 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="dnscrypt-proxy\dnscrypt-resolvers.csv.minisig">
+    <Content Include="dnscrypt-proxy\dnscrypt-resolvers.csv.minisig">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
     <None Include="Properties\app.manifest" />
-    <None Include="dnscrypt-proxy\dnscrypt-resolvers.csv">
+    <Content Include="dnscrypt-proxy\dnscrypt-resolvers.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -329,6 +329,7 @@
     <Content Include="dnscrypt-proxy\libwinpthread-1.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Images\bytejail_logo.png" />
     <Resource Include="Resources\Entypo-license.txt" />
     <Resource Include="Resources\WindowsIcons-license.txt" />
     <Resource Include="FodyWeavers.xml" />
@@ -341,9 +342,8 @@
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
   <UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
     <ParameterGroup>
       <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
@@ -380,6 +380,7 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
+  <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SimpleDnsCrypt/SimpleDnsCrypt.csproj

@@ -58,6 +58,7 @@ public bool IsDnsCryptProxyInstalled()
         /// <returns><c>true</c> if the service is running, otherwise <c>false</c></returns>
         public bool IsDnsCryptProxyRunning()
         {
+	        if (DnsCryptProxy.DisplayName == null) return false;
             try
             {
                 if (!DnsCryptProxy.IsReady) return false;

SimpleDnsCrypt/Tools/DnscryptProxyManager.cs

@@ -15,7 +15,6 @@
 using SimpleDnsCrypt.Config;
 using SimpleDnsCrypt.Models;
 using SimpleDnsCrypt.Tools;
-using Sodium;
 using WPFLocalizeExtension.Engine;
 
 namespace SimpleDnsCrypt.ViewModels
@@ -725,7 +724,7 @@ public static bool IsAdministrator()
 		/// <summary>
 		///     Check the dnscrypt-proxy directory on completeness.
 		/// </summary>
-		/// <returns><c>true</c> if alle files are available, otherwise <c>false</c></returns>
+		/// <returns><c>true</c> if all files are available, otherwise <c>false</c></returns>
 		private static bool ValidateDnsCryptProxyFolder()
 		{
 			foreach (var proxyFile in Global.DnsCryptProxyFiles)

SimpleDnsCrypt/ViewModels/MainViewModel.cs

@@ -887,7 +887,7 @@
                                                 The MIT License (MIT)
                                                 <LineBreak />
                                                 <LineBreak />
-                                                Copyright (c) 2015 Christian Hermann
+                                                Copyright (c) 2015 - 2016 Christian Hermann
                                                 <LineBreak />
                                                 <LineBreak />
                                                 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -925,6 +925,8 @@
                                             <TextBlock FontSize="14" Foreground="#FF575757" Margin="0,3,0,0" Width="450"
                                                        TextWrapping="Wrap"
                                                        tools:NavigationService.Text="{lex:Loc Key=about_thanks_bytejail_text}" />
+                                            
+                                            <Image Source="/SimpleDnsCrypt;component/Images/bytejail_logo.png" Width="250" Stretch="UniformToFill" Margin="0,30,0,0"/>
                                         </StackPanel>
                                     </StackPanel>
                                 </Border>