fixed problems in certificate validation code (updates in Mono?) Also disabled linking in release to avoid problems.

src/Kp2aBusinessLogic/IKp2aApp.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using Android.App;
 using System.IO;
 using Android.Content;
@@ -14,8 +16,8 @@ namespace keepass2android
 	/// Interface through which Activities and the logic layer can access some app specific functionalities and Application static data
 	/// </summary>
 	/// This also contains methods which are UI specific and should be replacable for testing.
-    public interface IKp2aApp
-    {
+	public interface IKp2aApp
+	{
 		/// <summary>
 		/// Locks the currently open database, quicklocking if available (unless false is passed for allowQuickUnlock)
 		/// </summary>
@@ -24,51 +26,52 @@ namespace keepass2android
 		/// <summary>
 		/// Loads the specified data as the currently open database, as unlocked.
 		/// </summary>
-		void LoadDatabase(IOConnectionInfo ioConnectionInfo, MemoryStream memoryStream, CompositeKey compKey, ProgressDialogStatusLogger statusLogger, IDatabaseLoader databaseLoader);
+		void LoadDatabase(IOConnectionInfo ioConnectionInfo, MemoryStream memoryStream, CompositeKey compKey,
+		                  ProgressDialogStatusLogger statusLogger, IDatabaseLoader databaseLoader);
 
 		/// <summary>
 		/// Returns the current database
 		/// </summary>
-        Database GetDb();
+		Database GetDb();
 
 		/// <summary>
 		/// Tell the app that the file from ioc was opened with keyfile.
 		/// </summary>
-        void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile);
+		void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile);
 
 		/// <summary>
 		/// Creates a new database and returns it
 		/// </summary>
-        Database CreateNewDatabase();
+		Database CreateNewDatabase();
 
 		/// <summary>
 		/// Returns the user-displayable string identified by stringKey
 		/// </summary>
-        string GetResourceString(UiStringKey stringKey);
+		string GetResourceString(UiStringKey stringKey);
 
 		/// <summary>
 		/// Returns the value from the preferences corresponding to key
 		/// </summary>
-        bool GetBooleanPreference(PreferenceKey key);
+		bool GetBooleanPreference(PreferenceKey key);
 
 		/// <summary>
 		/// Asks the user the question "messageKey" with the options Yes/No/Cancel, calls the handler corresponding to the answer.
 		/// </summary>
-        void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey, 
-            EventHandler<DialogClickEventArgs> yesHandler, 
-            EventHandler<DialogClickEventArgs> noHandler, 
-            EventHandler<DialogClickEventArgs> cancelHandler, 
-            Context ctx);
+		void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
+		                    EventHandler<DialogClickEventArgs> yesHandler,
+		                    EventHandler<DialogClickEventArgs> noHandler,
+		                    EventHandler<DialogClickEventArgs> cancelHandler,
+		                    Context ctx);
 
 		/// <summary>
 		/// Asks the user the question "messageKey" with the options Yes/No/Cancel, but the yes/no strings can be selected freely, calls the handler corresponding to the answer.
 		/// </summary>
 		void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
-			UiStringKey yesString, UiStringKey noString,
-			EventHandler<DialogClickEventArgs> yesHandler,
-            EventHandler<DialogClickEventArgs> noHandler,
-            EventHandler<DialogClickEventArgs> cancelHandler,
-            Context ctx);
+		                    UiStringKey yesString, UiStringKey noString,
+		                    EventHandler<DialogClickEventArgs> yesHandler,
+		                    EventHandler<DialogClickEventArgs> noHandler,
+		                    EventHandler<DialogClickEventArgs> cancelHandler,
+		                    Context ctx);
 
 		/// <summary>
 		/// Returns a Handler object which can run tasks on the UI thread
@@ -84,6 +87,8 @@ namespace keepass2android
 		/// Handles a failed certificate validation. Returns true if the users wants to continue, false otherwise.
 		/// see http://msdn.microsoft.com/en-us/library/system.net.icertificatepolicy(v=vs.110).aspx
 		/// </summary>
-		bool OnServerCertificateError(int certificateProblem);
-    }
+		//bool OnServerCertificateError(int certificateProblem);
+
+		RemoteCertificateValidationCallback CertificateValidationCallback { get; }
+	}
 }

src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs

@@ -37,31 +37,13 @@ namespace keepass2android.Io
 
 		private readonly IKp2aApp _app;
 
-		class CertificatePolicity: ICertificatePolicy 
-		{
-			private readonly IKp2aApp _app;
-
-			public CertificatePolicity(IKp2aApp app)
-			{
-				_app = app;
-			}
-
-			public bool CheckValidationResult(ServicePoint srvPoint, System.Security.Cryptography.X509Certificates.X509Certificate certificate, WebRequest request,
-			                                  int certificateProblem)
-			{
-				if (certificateProblem == 0) //ok
-					return true;
-				return _app.OnServerCertificateError(certificateProblem);
-			}
-		}
-
-
 		public BuiltInFileStorage(IKp2aApp app)
 		{
 			_app = app;
 			//use the obsolute CertificatePolicy because the ServerCertificateValidationCallback isn't called in Mono for Android (?)
-			ServicePointManager.CertificatePolicy = new CertificatePolicity(app);
-			
+			//ServicePointManager.CertificatePolicy = new CertificatePolicity(app);
+			IOConnection.CertificateValidationCallback = app.CertificateValidationCallback;
+
 		}
 
 		public IEnumerable<string> SupportedProtocols 

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;INCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -112,10 +112,22 @@
     <Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
+      <Project>{48574278-4779-4b3a-a9e4-9cf1bc285d0b}</Project>
+      <Name>JavaFileStorageBindings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
       <Project>{545b4a6b-8bba-4fbe-92fc-4ac060122a54}</Project>
       <Name>KeePassLib2Android</Name>
     </ProjectReference>
+    <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj">
+      <Project>{70d3844a-d9fa-4a64-b205-a84c6a822196}</Project>
+      <Name>KP2AKdbLibraryBinding</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj">
+      <Project>{5cf675a5-9bee-4720-bed9-d5bf14a2ebf9}</Project>
+      <Name>TwofishCipher</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.