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

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

@@ -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/settings_key_mode_auto_name</item>
-        <item>@string/modo-de-configuracion-de-clave-siempre-mostrar-nombre</item>
+        <item>@string/settings_key_mode_always_show_name</item>
-        <item>@string/modo-de-configuracion-de-clave-siempre-ocultar-nombre</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>

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

@@ -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>@string/settings_key_mode_auto_name</item>
-        <item>\@ rij- instellingen- sleutel-wijze-altijd-tonen-naam</item>
+        <item>@string/settings_key_mode_always_show_name</item>
-        <item>\@rij-instellingen-sleutel-wijze-altijd-verberg-naam</item>
+        <item>@string/settings_key_mode_always_hide_name</item>
     </string-array>
     <!-- Option to enable bigram completion -->
     <string name="bigram_suggestion">Digram-suggesties</string>

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -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:versionCode="173" 
-			android:versionName="1.09a-r0" 
+			android:versionName="1.09a-r3" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="29" />

src/keepass2android/Resources/values/strings.xml

@@ -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>

src/keepass2android/Resources/xml/autofillservice.xml

@@ -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"/>

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);
+                foreach (ITotpPluginAdapter adapter in _pluginAdapters)
-                if (totpData.IsTotpEntry)
                 {
-                    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;
         }