qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.01-g offline release

Browse Source
This commit is contained in:
Philipp Crocoll
2017-03-22 07:22:47 +01:00
parent d41f8cdef5
commit dfbebd5d0d
17 changed files with 205 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kp2aBusinessLogic/IKp2aApp.cs
View File

@@ -9,7 +9,9 @@ using KeePassLib;
using KeePassLib.Keys;
using KeePassLib.Serialization;
using keepass2android.Io;
#if !NoNet
using Keepass2android.Javafilestorage;
#endif
namespace keepass2android
{
@@ -107,6 +109,8 @@ namespace keepass2android
bool CheckForDuplicateUuids { get; }
#if !NoNet
ICertificateErrorHandler CertificateErrorHandler { get; }
#endif
}
}

52
src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Security;
using Android;
using Android.App;
@@ -13,7 +13,7 @@ using Android.OS;
using Java.IO;
using KeePassLib.Serialization;
using KeePassLib.Utility;
using ModernHttpClient;
using File = System.IO.File;
using FileNotFoundException = System.IO.FileNotFoundException;
using IOException = System.IO.IOException;
@@ -416,6 +416,23 @@ namespace keepass2android.Io
}
}
public class LocalFileStorage : BuiltInFileStorage
{
public LocalFileStorage(IKp2aApp app)
: base(app)
{
}
public override IEnumerable<string> SupportedProtocols
{
get
{
yield return "file";
}
}
}
#if !NoNet
public class LegacyFtpStorage : BuiltInFileStorage
{
public LegacyFtpStorage(IKp2aApp app) : base(app)
@@ -426,9 +443,9 @@ namespace keepass2android.Io
{
get
{
#if !NoNet
yield return "ftp";
#endif
}
}
}
@@ -443,27 +460,14 @@ namespace keepass2android.Io
{
get
{
#if !NoNet
yield return "http";
yield return "https";
}
}
}
#endif
}
}
}
public class LocalFileStorage : BuiltInFileStorage
{
public LocalFileStorage(IKp2aApp app) : base(app)
{
}
public override IEnumerable<string> SupportedProtocols
{
get
{
yield return "file";
}
}
}
}

4
src/Kp2aBusinessLogic/Io/NetFtpFileStorage.cs
View File

@@ -1,3 +1,4 @@
#if !NoNet
using System;
using System.Collections.Generic;
using System.IO;
@@ -639,4 +640,5 @@ namespace keepass2android.Io
_stream.Close();
}
}
}
}
#endif

24
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@@ -47,23 +47,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ModernHttpClient">
<HintPath>..\Components\modernhttpclient-2.4.2\lib\android\ModernHttpClient.dll</HintPath>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="Mono.Security" />
<Reference Include="mscorlib" />
<Reference Include="OkHttp">
<HintPath>..\Components\modernhttpclient-2.4.2\lib\android\OkHttp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Xamarin.Insights">
<HintPath>..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="database\CheckDatabaseForChanges.cs" />
@@ -133,10 +123,6 @@
<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>
@@ -145,10 +131,6 @@
<Project>{70D3844A-D9FA-4A64-B205-A84C6A822196}</Project>
<Name>KP2AKdbLibraryBinding</Name>
</ProjectReference>
<ProjectReference Include="..\netftpandroid\System.Net.FtpClient\System.Net.FtpClient.Android.csproj">
<Project>{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}</Project>
<Name>System.Net.FtpClient.Android</Name>
</ProjectReference>
<ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj">
<Project>{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}</Project>
<Name>TwofishCipher</Name>
@@ -157,12 +139,6 @@
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<XamarinComponentReference Include="modernhttpclient">
<Visible>False</Visible>
<Version>2.4.2</Version>
</XamarinComponentReference>
</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.
Other similar extension points exist, see Microsoft.Common.targets.