From e1cd8123cfdd0b662a49c128280dcea43ad02efc Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 24 May 2021 10:37:56 +0200 Subject: [PATCH 01/10] improve pCloud warning to close #796 --- src/keepass2android/Resources/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index df9347f9..19f618ce 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -586,7 +586,7 @@ 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. Google Drive 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. + 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. OneDrive OneDrive All files and shared files From 9d635781104e9b0729ebae069aaee498c09155d4 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sat, 3 Jul 2021 13:27:10 +0200 Subject: [PATCH 02/10] fix potential crash with invalid OTP strings --- src/keepass2android/Totp/Kp2aTotp.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/keepass2android/Totp/Kp2aTotp.cs b/src/keepass2android/Totp/Kp2aTotp.cs index d6b3128b..2b72d61f 100644 --- a/src/keepass2android/Totp/Kp2aTotp.cs +++ b/src/keepass2android/Totp/Kp2aTotp.cs @@ -40,14 +40,25 @@ namespace keepass2android { if (entry == null) return null; - foreach (ITotpPluginAdapter adapter in _pluginAdapters) + + try { - TotpData totpData = adapter.GetTotpData(App.Kp2a.LastOpenedEntry.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString()), Application.Context, false); - if (totpData.IsTotpEntry) + foreach (ITotpPluginAdapter adapter in _pluginAdapters) { - return adapter; + 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; } From 54eb65672693d5f603067e78fa18a4691d9017fc Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sat, 3 Jul 2021 13:27:38 +0200 Subject: [PATCH 03/10] 1.09a-r1 release manifest --- src/keepass2android/Properties/AndroidManifest_net.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index f1b577da..72051b08 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -1,7 +1,7 @@  From f017d3fdf2233b84c7ac5f34fc998d56e67ed381 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sat, 3 Jul 2021 13:27:54 +0200 Subject: [PATCH 04/10] remove intermediate file --- .../intermediates/gradle_project_sync_data.bin | Bin 588 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin diff --git a/src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin b/src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin deleted file mode 100644 index da4b2001bd8916f26f87b0c58f09eada7074cd81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmZ4UmVvdnh`~BJKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9&mGJS zfbfDV^O9W>OA^=Il)3f#Vc9Px24*h?$=phx#NrZ&LXe7(%-q!ClEmBs9|r#1O1I3M zROgJ;nz~*1^MK2^X0enA{k+ za`F>X+!B*Z@{2qfI7>2$Qj0V4b5be_>>U_DfTx@TND2TkTM2_eVnIPnQfX#R3e^9l zMGQ>QPHR4k|6t Date: Sat, 3 Jul 2021 14:37:15 +0200 Subject: [PATCH 05/10] New translations strings.xml (Spanish) --- .../app/src/main/res/values-es/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-es/strings.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-es/strings.xml index a1d6ab10..4352db06 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-es/strings.xml +++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-es/strings.xml @@ -84,9 +84,9 @@ Ocultar siempre - @string/modo-de-configuracion-de-clave-nombramiento-automatico - @string/modo-de-configuracion-de-clave-siempre-mostrar-nombre - @string/modo-de-configuracion-de-clave-siempre-ocultar-nombre + @string/settings_key_mode_auto_name + @string/settings_key_mode_always_show_name + @string/settings_key_mode_always_hide_name Sugerencias de bigramas From 438cf5793a569297c472a1ad0e1e6a30c01b1173 Mon Sep 17 00:00:00 2001 From: PhilippC Date: Sat, 3 Jul 2021 14:37:44 +0200 Subject: [PATCH 06/10] New translations strings.xml (Dutch) --- .../KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml index ddb590df..79213e19 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml +++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml @@ -86,7 +86,7 @@ \@ rij- instellingen-sleutel-wijze-automatisch-naam \@ rij- instellingen- sleutel-wijze-altijd-tonen-naam - \@rij-instellingen-sleutel-wijze-altijd-verberg-naam + @string/settings_key_mode_always_hide_name Digram-suggesties From 87cbf656546ad7eb71348d14f3cc394e67d866d7 Mon Sep 17 00:00:00 2001 From: PhilippC Date: Sat, 3 Jul 2021 14:45:24 +0200 Subject: [PATCH 07/10] New translations strings.xml (Dutch) --- .../KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml index 79213e19..46d95097 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml +++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml @@ -84,7 +84,7 @@ Altijd verbergen - \@ rij- instellingen-sleutel-wijze-automatisch-naam + @string/settings_key_mode_auto_name \@ rij- instellingen- sleutel-wijze-altijd-tonen-naam @string/settings_key_mode_always_hide_name From be8e8f9b0269de44c1381a353baa8b0c02867dde Mon Sep 17 00:00:00 2001 From: PhilippC Date: Sat, 3 Jul 2021 14:49:44 +0200 Subject: [PATCH 08/10] New translations strings.xml (Dutch) --- .../KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml index 46d95097..b63707ef 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml +++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-nl/strings.xml @@ -85,7 +85,7 @@ @string/settings_key_mode_auto_name - \@ rij- instellingen- sleutel-wijze-altijd-tonen-naam + @string/settings_key_mode_always_show_name @string/settings_key_mode_always_hide_name From e7b4cfe53ea706545ff897457f31ac1bf6d47ab1 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sun, 22 Aug 2021 17:40:57 +0200 Subject: [PATCH 09/10] Manifest for 1.09a-r3 --- src/keepass2android/Properties/AndroidManifest_net.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index 72051b08..01f4a014 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -1,7 +1,7 @@  From f33ad9e403c996d602bc6ca59f039e0ca884d2e6 Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Tue, 14 Sep 2021 18:16:41 -0400 Subject: [PATCH 10/10] Allow autofill in prerelease Brave browser. Propose adding the Beta and Nightly versions for Brave. I assume prerelease is fair game since Chrome Canary is on there. --- src/keepass2android/Resources/xml/autofillservice.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/keepass2android/Resources/xml/autofillservice.xml b/src/keepass2android/Resources/xml/autofillservice.xml index e9206092..bacbcec4 100644 --- a/src/keepass2android/Resources/xml/autofillservice.xml +++ b/src/keepass2android/Resources/xml/autofillservice.xml @@ -62,6 +62,12 @@ + +