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

add preference option to disable auto-return from queries with only one matching result (closes https://github.com/PhilippC/keepass2android/issues/544)

Browse Source
This commit is contained in:
Philipp Crocoll
2018-09-17 10:32:41 +02:00
parent 304a9d90d0
commit 262897fbf6
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/keepass2android/Resources/values/config.xml
View File

@@ -48,7 +48,8 @@
<!-- Preference settings -->
<string name="algorithm_key">algorithm</string>
<string name="AutoReturnFromQuery_key">AutoReturnFromQuery_key</string>
<string name="algorithm_key">algorithm</string>
<string name="app_key">app</string>
<string name="app_timeout_key">app_timeout_key</string>
<string name="show_kill_app_key">show_kill_app_key</string>

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

@@ -221,6 +221,8 @@
<string name="edit">Edit</string>
<string name="rijndael">Rijndael (AES)</string>
<string name="root">Root</string>
<string name="AutoReturnFromQuery_title">Automatically return from query screen</string>
<string name="AutoReturnFromQuery_summary">When looking up an entry for an app or website: automatically return from query screen if there is only one matching entry in the database.</string>
<string name="KeyDerivFunc">Key derivation function</string>

8
src/keepass2android/Resources/xml/preferences.xml
View File

@@ -402,6 +402,14 @@
</Preference>
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/AutoReturnFromQuery_summary"
android:defaultValue="true"
android:title="@string/AutoReturnFromQuery_title"
android:key="@string/AutoReturnFromQuery_key" />
</PreferenceScreen>
<PreferenceScreen
android:key="@string/QuickUnlock_prefs_key"

3
src/keepass2android/ShareUrlResults.cs
View File

@@ -25,6 +25,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
using Android.Content.PM;
using Android.Preferences;
using KeePassLib.Utility;
namespace keepass2android
@@ -134,7 +135,7 @@ namespace keepass2android
}
//if there is exactly one match: open the entry
if ((Group.Entries.Count() == 1) && autoReturnFromQuery)
if ((Group.Entries.Count() == 1) && autoReturnFromQuery && PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean(GetString(Resource.String.AutoReturnFromQuery_key),true))
{
LaunchActivityForEntry(Group.Entries.Single(),0);
return;