Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyrodan committed Jan 28, 2016
2 parents 893f9f3 + dc9e882 commit a6d2be3
Show file tree
Hide file tree
Showing 31 changed files with 774 additions and 73 deletions.
32 changes: 16 additions & 16 deletions KeeAnywhere/Forms/SettingsForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions KeeAnywhere/Forms/SettingsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public partial class SettingsForm : Form
public SettingsForm()
{
InitializeComponent();

m_tcSettings.TabPages.Remove(m_tabGeneral);
}

public void InitEx(ConfigurationService configService, UIService uiService)
Expand Down
20 changes: 16 additions & 4 deletions KeeAnywhere/KeeAnywhere.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
<Compile Include="OAuth2\OAuth2Form.Designer.cs">
<DependentUpon>OAuth2Form.cs</DependentUpon>
</Compile>
<Compile Include="OAuth2\OAuth2Token.cs" />
<Compile Include="PluginResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand All @@ -176,6 +177,14 @@
<Compile Include="StorageProviders\GoogleDrive\GoogleDriveHelper.cs" />
<Compile Include="StorageProviders\GoogleDrive\GoogleDriveStorageConfigurator.cs" />
<Compile Include="StorageProviders\GoogleDrive\GoogleDriveStorageProvider.cs" />
<Compile Include="StorageProviders\HubiC\HubiCAccount.cs" />
<Compile Include="StorageProviders\HubiC\HubiCCredentials.cs" />
<Compile Include="StorageProviders\HubiC\HubiCHelper.cs" />
<Compile Include="StorageProviders\HubiC\HubiCStorageConfigurator.cs" />
<Compile Include="StorageProviders\HubiC\HubiCStorageProvider.cs" />
<Compile Include="StorageProviders\HubiC\SwiftContainer.cs" />
<Compile Include="StorageProviders\HubiC\SwiftClient.cs" />
<Compile Include="StorageProviders\HubiC\SwiftObject.cs" />
<Compile Include="StorageProviders\IStorageConfigurator.cs" />
<Compile Include="StorageProviders\IStorageProvider.cs" />
<Compile Include="StorageProviders\OneDrive\OneDriveAuthenticationForm.cs">
Expand Down Expand Up @@ -229,10 +238,12 @@
<ItemGroup>
<None Include="app.config">
<ExcludeFromPlgx />
<SubType>Designer</SubType>
</None>
<None Include="KeePass.exe.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<ExcludeFromPlgx />
<SubType>Designer</SubType>
</None>
<None Include="packages.config">
<ExcludeFromPlgx />
Expand All @@ -244,9 +255,10 @@
<None Include="Resources\Dropbox_16x16.png" />
<Content Include="Resources\Folder_16x16.png" />
<None Include="Resources\GoogleDrive_16x16.png" />
<Content Include="Resources\Icon_CloudDrive_16x16.ico" />
<Content Include="Resources\CloudDrive_16x16.png" />
<Content Include="Resources\CloudDrive_48x48.png" />
<None Include="Resources\HubiC_16x16.png" />
<Content Include="Resources\Icon_KeeAnywhere_16x16.ico" />
<Content Include="Resources\KeeAnywhere_16x16.png" />
<Content Include="Resources\KeeAnywhere_48x48.png" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand All @@ -258,7 +270,7 @@
<PropertyGroup>
<PlgxConfiguration>
<Prerequisites>
<!--<KeePassVersion>2.19</KeePassVersion>-->
<KeePassVersion>2.31</KeePassVersion>
<OS>Windows</OS>
<DotNetVersion>4.5</DotNetVersion>
</Prerequisites>
Expand Down
14 changes: 11 additions & 3 deletions KeeAnywhere/KeeAnywhereExt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,21 @@ private static void FixGoogleApiDependencyLoading()
var httpasm = Assembly.Load("System.Net.Http.Primitives");
var httpver = new Version(1, 5, 0, 0);

var jsonasm = Assembly.Load("Newtonsoft.Json");
var jsonver = new Version(6, 0, 0, 0);


AppDomain.CurrentDomain.AssemblyResolve += (s, a) =>
{
var requestedAssembly = new AssemblyName(a.Name);
if (requestedAssembly.Name != "System.Net.Http.Primitives" || requestedAssembly.Version != httpver)
return null;

return httpasm;
if (requestedAssembly.Name == "System.Net.Http.Primitives" && requestedAssembly.Version == httpver)
return httpasm;

//if (requestedAssembly.Name == "Newtonsoft.Json" && requestedAssembly.Version == jsonver)
// return jsonasm;

return null;
};
}
}
Expand Down
41 changes: 20 additions & 21 deletions KeeAnywhere/KeePass.exe.config
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.5" />
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="KeePass"
<startup>
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="KeePass"
publicKeyToken="fed2ed7716aecf5c"
culture="neutral" />
<bindingRedirect oldVersion="2.0.9.0-2.30.0.0"
newVersion="2.30.0.15916" />
</dependentAssembly>
</assemblyBinding>
<enforceFIPSPolicy enabled="false" />
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
</appSettings>
</configuration>
<bindingRedirect oldVersion="2.0.9.0-2.31.0.0"
newVersion="2.31.0.27913" />
</dependentAssembly>
</assemblyBinding>
<enforceFIPSPolicy enabled="false" />
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
</appSettings>
</configuration>
1 change: 1 addition & 0 deletions KeeAnywhere/OAuth2/OAuth2Form.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion KeeAnywhere/OAuth2/OAuth2Form.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private async void OnNavigated(object sender, WebBrowserNavigatedEventArgs e)
}
}

private void OnNavigating(object sender, WebBrowserNavigatingEventArgs e)
private async void OnNavigating(object sender, WebBrowserNavigatingEventArgs e)
{
Debug.WriteLine("Navigating " + e.Url);
}
Expand Down
36 changes: 36 additions & 0 deletions KeeAnywhere/OAuth2/OAuth2Token.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using System.Runtime.Serialization;

namespace KeeAnywhere.OAuth2
{
[DataContract]
public class OAuth2Token
{
public OAuth2Token()
{
}

internal OAuth2Token(string accessToken, string tokenType, int? expiresIn = null, string refreshToken = null)
{
if (string.IsNullOrEmpty(accessToken))
throw new ArgumentException("Invalid OAuth 2.0 response, missing access_token.");

AccessToken = accessToken;
ExpiresIn = expiresIn;
TokenType = tokenType;
RefreshToken = refreshToken;
}

[DataMember(Name = "access_token")]
public string AccessToken { get; set; }

[DataMember(Name = "expires_in")]
public int? ExpiresIn { get; set; }

[DataMember(Name = "token_type")]
public string TokenType { get; set; }

[DataMember(Name = "refresh_token")]
public string RefreshToken { get; set; }
}
}
10 changes: 10 additions & 0 deletions KeeAnywhere/PluginResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions KeeAnywhere/PluginResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,17 @@
<data name="GoogleDrive_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\GoogleDrive_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HubiC_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\HubiC_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Icon_OneDrive_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Icon_CloudDrive_16x16.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Resources\Icon_KeeAnywhere_16x16.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="KeeAnywhere_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\CloudDrive_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Resources\KeeAnywhere_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="KeeAnywhere_48x48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\CloudDrive_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Resources\KeeAnywhere_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OneDrive_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\OneDrive_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Expand Down
6 changes: 3 additions & 3 deletions KeeAnywhere/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
//[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyVersion("0.2.0.0")]
[assembly: AssemblyFileVersion("0.2.0.0")]
[assembly: AssemblyInformationalVersion("0.2.0-alpha")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
Binary file added KeeAnywhere/Resources/HubiC_16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
17 changes: 17 additions & 0 deletions KeeAnywhere/StorageProviders/HubiC/HubiCAccount.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Runtime.Serialization;

namespace KeeAnywhere.StorageProviders.HubiC
{
[DataContract]
internal class HubiCAccount
{
[DataMember(Name="email")]
public string EMail { get; set; }

[DataMember(Name = "firstname")]
public string FirstName { get; set; }

[DataMember(Name = "lastname")]
public string LastName { get; set; }
}
}
18 changes: 18 additions & 0 deletions KeeAnywhere/StorageProviders/HubiC/HubiCCredentials.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System;
using System.Runtime.Serialization;

namespace KeeAnywhere.StorageProviders.HubiC
{
[DataContract]
public class HubiCCredentials
{
[DataMember(Name = "token")]
public string Token { get; set; }

[DataMember(Name = "endpoint")]
public string Endpoint { get; set; }

[DataMember(Name = "expires")]
public DateTime Exprires { get; set; }
}
}
Loading

0 comments on commit a6d2be3

Please sign in to comment.