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
2021-10-25 12:49:00 +02:00
parent 0564a103e1 4a5a77de21
commit 2bb7a2065a
7 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-es/strings.xml
View File

@@ -84,9 +84,9 @@
<string name="settings_key_mode_always_hide_name">Ocultar siempre</string>
<!-- Array of the settings key modes -->
<string-array name="settings_key_modes">
<item>@string/modo-de-configuracion-de-clave-nombramiento-automatico</item>
<item>@string/modo-de-configuracion-de-clave-siempre-mostrar-nombre</item>
<item>@string/modo-de-configuracion-de-clave-siempre-ocultar-nombre</item>
<item>@string/settings_key_mode_auto_name</item>
<item>@string/settings_key_mode_always_show_name</item>
<item>@string/settings_key_mode_always_hide_name</item>
</string-array>
<!-- Option to enable bigram completion -->
<string name="bigram_suggestion">Sugerencias de bigramas</string>

6
src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml
View File

@@ -84,9 +84,9 @@
<string name="settings_key_mode_always_hide_name">Altijd verbergen</string>
<!-- Array of the settings key modes -->
<string-array name="settings_key_modes">
<item>\@ rij- instellingen-sleutel-wijze-automatisch-naam</item>
<item>\@ rij- instellingen- sleutel-wijze-altijd-tonen-naam</item>
<item>\@rij-instellingen-sleutel-wijze-altijd-verberg-naam</item>
<item>@string/settings_key_mode_auto_name</item>
<item>@string/settings_key_mode_always_show_name</item>
<item>@string/settings_key_mode_always_hide_name</item>
</string-array>
<!-- Option to enable bigram completion -->
<string name="bigram_suggestion">Digram-suggesties</string>

BIN
src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin
View File

Binary file not shown.

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="170"
android:versionName="1.09a-r0"
android:versionCode="173"
android:versionName="1.09a-r3"
package="keepass2android.keepass2android"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="29" />

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

@@ -586,7 +586,7 @@
<string name="filestoragehelp_dropboxKP2A">If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, select this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file.</string>
<string name="filestoragename_gdrive">Google Drive</string>
<string name="filestoragename_pcloud">PCloud</string>
<string name="filestoragehelp_pcloud">This storage type will only request access to the "Applications/Keepass2Android" folder. If you want to use an existing database from your PCloud account, please make sure the file is placed in this folder.</string>
<string name="filestoragehelp_pcloud">This storage type will only request access to the pCloud folder "Applications/Keepass2Android". If you want to use an existing database from your pCloud account, please make sure the file is placed in this pCloud folder.</string>
<string name="filestoragename_onedrive">OneDrive</string>
<string name="filestoragename_onedrive2">OneDrive</string>
<string name="filestoragename_onedrive2_full">All files and shared files</string>

6
src/keepass2android/Resources/xml/autofillservice.xml
View File

@@ -62,6 +62,12 @@
<compatibility-package
android:name="com.brave.browser"
android:maxLongVersionCode="10000000000"/>
<compatibility-package
android:name="com.brave.browser_beta"
android:maxLongVersionCode="10000000000"/>
<compatibility-package
android:name="com.brave.browser_nightly"
android:maxLongVersionCode="10000000000"/>
<compatibility-package
android:name="com.google.android.apps.chrome"
android:maxLongVersionCode="10000000000"/>

13
src/keepass2android/Totp/Kp2aTotp.cs
View File

@@ -40,14 +40,25 @@ namespace keepass2android
{
if (entry == null)
return null;
try
{
foreach (ITotpPluginAdapter adapter in _pluginAdapters)
{
TotpData totpData = adapter.GetTotpData(App.Kp2a.LastOpenedEntry.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString()), Application.Context, false);
TotpData totpData = adapter.GetTotpData(
App.Kp2a.LastOpenedEntry.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key),
pair => pair.Value.ReadString()), Application.Context, false);
if (totpData.IsTotpEntry)
{
return adapter;
}
}
}
catch (Exception e)
{
Kp2aLog.LogUnexpectedError(e);
}
return null;
}