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

Merge branch 'master' of https://github.com/PhilippC/keepass2android

Browse Source
This commit is contained in:
Philipp Crocoll
2018-12-09 08:23:18 +01:00
parent f0f3bb6ede 3695c04933
commit 14b7b8cec1
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PluginSdkBinding/PluginSdkBinding.csproj
View File

@@ -55,7 +55,7 @@
<ItemGroup> <ItemGroup>
<None Include="Jars\AboutJars.txt" /> <None Include="Jars\AboutJars.txt" />
<None Include="Additions\AboutAdditions.txt" /> <None Include="Additions\AboutAdditions.txt" />
<LibraryProjectZip Include="Jars\app-debug.aar" /> <LibraryProjectZip Include="Jars\app-release.aar" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<TransformFile Include="Transforms\Metadata.xml" /> <TransformFile Include="Transforms\Metadata.xml" />

3
src/keepass2android/PasswordActivity.cs
View File

@@ -695,8 +695,11 @@ namespace keepass2android
{ {
_keepPasswordInOnResume = true; _keepPasswordInOnResume = true;
} }
} }
App.Kp2a.RegisterOpenAttempt(_ioConnection);
SetContentView(Resource.Layout.password); SetContentView(Resource.Layout.password);
InitializeToolbar(); InitializeToolbar();

5
src/keepass2android/Resources/values/strings.xml
View File

@@ -775,9 +775,8 @@
<string name="ShowKeyboardDuringFingerprintAuth">Show soft keyboard for password input when fingerprint scan is active.</string> <string name="ShowKeyboardDuringFingerprintAuth">Show soft keyboard for password input when fingerprint scan is active.</string>
<string name="ChangeLog_1_07"> <string name="ChangeLog_1_07">
Version 1.07-pre1\n Version 1.07-pre2\n
!!! Caution! This release comes with major changes under the hood. Please report any undesired behavior changes to crocoapps@gmail.com !!!\n * Allow to open more than one database, compatible to KeeAutoExec\n
* Allow to open more than one database, allow to move entries between databases\n
* SFTP: Allow public key authentication, check if host key changed\n * SFTP: Allow public key authentication, check if host key changed\n
* Introduce pCloud support - thanks to gilbsgilbs!\n * Introduce pCloud support - thanks to gilbsgilbs!\n
* Make Nextcloud support explicit\n * Make Nextcloud support explicit\n

8
src/keepass2android/app/App.cs
View File

@@ -361,7 +361,13 @@ namespace keepass2android
public HashSet<PwGroup> DirtyGroups { get { return dirty; } } public HashSet<PwGroup> DirtyGroups { get { return dirty; } }
public bool AttemptedToOpenBefore(IOConnectionInfo ioc) public void RegisterOpenAttempt(IOConnectionInfo ioc)
{
_openAttempts.Add(ioc);
}
public bool AttemptedToOpenBefore(IOConnectionInfo ioc)
{ {
foreach (var attemptedIoc in _openAttempts) foreach (var attemptedIoc in _openAttempts)
{ {