build process: add previously missing change; fix error in build.yml, more verbose output in release.yml

several updates for V1.12

.github/workflows/build.yml

@@ -78,7 +78,7 @@ jobs:
 
   #   - name: Build keepass2android (net)
   #     run: |
-  #       make msbuild Flavor=Net
+  #       make dotnetbuild Flavor=Net
 
   #   - name: Build APK (net)
   #     run: |
@@ -96,7 +96,7 @@ jobs:
 
   #   - name: Build keepass2android (nonet)
   #     run: |
-  #       make msbuild Flavor=NoNet
+  #       make dotnetbuild Flavor=NoNet
 
   #   - name: Build APK (nonet)
   #     run: |
@@ -212,7 +212,7 @@ jobs:
 
   #   - name: Build keepass2android (net)
   #     run: |
-  #       make msbuild Flavor=Net
+  #       make dotnetbuild Flavor=Net
 
   #   - name: Build APK (net)
   #     run: |
@@ -230,7 +230,7 @@ jobs:
 
   #   - name: Build keepass2android (nonet)
   #     run: |
-  #       make msbuild Flavor=NoNet
+  #       make dotnetbuild Flavor=NoNet
 
   #   - name: Build APK (nonet)
   #     run: |
@@ -279,7 +279,7 @@ jobs:
       with:
         minimum-size: 8GB
 
-    - name: Add msbuild to PATH
+    - name: Add dotnetbuild to PATH
       uses: microsoft/setup-msbuild@v2
       # If we want to also have nmake, use this instead
       #uses: ilammy/msvc-dev-cmd@v1
@@ -309,12 +309,20 @@ jobs:
       run: |
         make java
 
+    - name: Update dotnet workloads
+      run: |
+        dotnet workload update        
+
+    - name: Select the manifest
+      run: |
+        make manifestlink Flavor=Net
+
     - name: Install NuGet dependencies (net)
       run: make nuget Flavor=Net
 
     - name: Build keepass2android (net)
       run: |
-        make msbuild Flavor=Net
+        make dotnetbuild Flavor=Net
 
     - name: Build APK (net)
       run: |
@@ -327,12 +335,17 @@ jobs:
         path: |
           src/keepass2android/bin/*/*-Signed.apk
 
+    - name: Select the manifest
+      run: |
+        make manifestlink Flavor=NoNet
+
     - name: Install NuGet dependencies (nonet)
       run: make nuget Flavor=NoNet
 
     - name: Build keepass2android (nonet)
       run: |
-        make msbuild Flavor=NoNet
+        make dotnetbuild Flavor=NoNet
+
     - name: Test Autofill
       working-directory: ./src/Kp2aAutofillParser.Tests
       run: dotnet test
@@ -348,5 +361,3 @@ jobs:
         path: |
           src/keepass2android/bin/*/*-Signed.apk
 
-    - name: Perform "make distclean"
-      run: make distclean

.github/workflows/release.yml

@@ -0,0 +1,144 @@
+name: Create keepass2android release
+env:
+  NAME: 'Release'
+
+on:
+  push:
+    tags:
+      - "v1.*"
+jobs:
+
+  build-release:
+
+    runs-on: windows-2022
+
+    strategy:
+      matrix:
+        flavor: [Net, NoNet]
+        target: [apk, apk_split]
+
+    steps:
+    
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Extract key store
+      env: 
+        KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        
+      shell: bash
+      run: |
+        echo $KeyStore
+        echo $KEYSTORE_BASE64 | base64 --decode > $KeyStore
+
+        
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
+        restore-keys: |
+          ${{ runner.os }}-nuget-
+
+    # Workaround an issue when building on windows-2022. Error was
+    #       D8 : OpenJDK 64-Bit Server VM warning : INFO: os::commit_memory(0x00000000ae400000, 330301440, 0) failed; error='The paging file is too small for this operation to complete' (DOS error/errno=1455) [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
+    #       C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.D8.targets(81,5): error MSB6006: "java.exe" exited with code 1. [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
+    - name: Configure Pagefile
+      uses: al-cheb/configure-pagefile-action@a3b6ebd6b634da88790d9c58d4b37a7f4a7b8708 # v1.4
+      with:
+        minimum-size: 8GB
+
+    - name: Add msbuild/dotnet to PATH
+      uses: microsoft/setup-msbuild@v2
+      # If we want to also have nmake, use this instead
+      #uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Switch to JDK-17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Display java version
+      run: java -version
+
+    - name: Build native dependencies
+      shell: cmd
+      run: |
+        make native
+
+    - name: Build java dependencies
+      shell: cmd
+      run: |
+        make java
+
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+      
+    - name: Update dotnet workloads
+      run: |
+        dotnet workload update        
+
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+
+
+    - name: Select the manifest
+      run: |
+        make manifestlink Flavor=${{ matrix.flavor }}
+    
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+
+
+    - name: Install NuGet dependencies
+      run: make nuget Flavor=${{ matrix.flavor }}
+
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+
+    - name: Build APK (net)
+      env:
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        MyAndroidSigningStorePass: ${{ secrets.KEY_STORE_PASSWORD }}
+        MyAndroidSigningKeyPass: ${{ secrets.KEY_PASSWORD }}
+        DropboxAppKey: ${{ secrets.DROPBOX_APP_KEY }}
+        DropboxAppSecret: ${{ secrets.DROPBOX_APP_SECRET }}
+        DropboxAppFolderAppKey: ${{ secrets.DROPBOX_APP_FOLDER_APP_KEY }}
+        DropboxAppFolderAppSecret: ${{ secrets.DROPBOX_APP_FOLDER_APP_SECRET }}
+
+      run: |
+        make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}
+    
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+    
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: keepass2android_${{ matrix.target }}_${{ matrix.flavor }}
+        path: |
+          src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk
+    
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+      
+    #- name: Upload APK to GitHub Release
+    #  uses: softprops/action-gh-release@v2
+    #  if: github.ref_type == 'tag'
+    #  with:
+    #    files: |
+    #        src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk

.gitignore

@@ -64,7 +64,7 @@ Thumbs.db
 /src/java/android-filechooser/code/projectzip/project.zip
 /src/java/android-filechooser/code/unused.txt
 
-/src/Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs
+/src/Kp2aBusinessLogic/Io/DropboxFileStorage.g.cs
 
 /src/java/workspace/DriveTest
 

Makefile

@@ -4,10 +4,10 @@
 # This Makefile can be used on both unix-like (use make) & windows (with GNU make)
 #
 # append the Configuration variable to 'make' call with value to use in '/p:Configuration='
-# of msbuild command.
+# of dotnetbuild command.
 #
 # append the Flavor variable to 'make' call with value to use in '/p:Flavor='
-# of msbuild command.
+# of dotnetbuild command.
 #
 # Example:
 #    make Configuration=Release Flavor=NoNet
@@ -18,7 +18,7 @@
 #  - native: build the native libs
 #  - java: build the java libs
 #  - nuget: restore NuGet packages
-#  - msbuild: build the project
+#  - dotnetbuild: build the project
 #  - apk: same as all
 #  - manifestlink: creates a symlink (to be used in building) to the AndroidManifest corresponding to the selected Flavor
 #
@@ -27,7 +27,7 @@
 #  - clean_native: clean native lib
 #  - clean_java: call clean target of java libs
 #  - clean_nuget: cleanup the 'nuget restore'
-#  - clean_msbuild: call clean target of msbuild
+#  - clean_dotnet: call clean target of dotnetbuild
 #
 #
 #
@@ -60,45 +60,23 @@ $(info MAKESHELL: $(MAKESHELL))
 $(info SHELL: $(SHELL))
 $(info )
 
-# On linux use xabuild, on Windows use MSBuild.exe, otherwise (macos?) use msbuild.
 ifeq ($(detected_OS),Linux)
-  MSBUILD_binary := xabuild
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary))
+  DOTNET_binary := dotnet
+  DOTNET := $(shell $(WHICH) $(DOTNET_binary))
 else ifeq ($(detected_OS),Windows)
-  MSBUILD_binary := MSBuild.exe
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary) 2> nul)
-  ifeq ($(MSBUILD),)
-    # Additional heuristic to find MSBUILD_BINARY on Windows
-    VSWHERE := "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-    VSWHERE_CHECK := $(shell @echo off & $(VSWHERE) 2> nul || echo VSWHERE_NOT_FOUND)
-    ifneq ($(VSWHERE_CHECK),VSWHERE_NOT_FOUND)
-      MSBUILD := $(shell @echo off & $(VSWHERE) -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe)
-      VS_INSTALL_PATH := $(shell @echo off & $(VSWHERE) -property installationPath)
-    endif
-  endif
+  DOTNET_binary := dotnet
+  DOTNET := $(shell $(WHICH) $(DOTNET_binary) 2> nul)
 else
-  MSBUILD_binary := msbuild
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary))
+  DOTNET_binary := dotnet
+  DOTNET := $(shell $(WHICH) $(DOTNET_binary))
 endif
 
-ifeq ($(MSBUILD),)
+ifeq ($(DOTNET),)
   $(info )
-  $(info '$(MSBUILD_binary)' binary could not be found. Check it is in your PATH.)
-  ifeq ($(detected_OS),Windows)
-  ifneq ($(VSWHERE_CHECK),VSWHERE_NOT_FOUND)
-    $(info )
-    $(info You may retry after running in the command prompt:)
-    $(info )
-    $(info "$(VS_INSTALL_PATH)\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64)
-    $(info )
-    $(info If this doesn't work, install/find the location of vcvarsall.bat)
-    $(info or install and add msbuild.exe to your PATH)
-    $(info )
-  endif
-  endif
+  $(info '$(DOTNET_binary)' binary could not be found. Check it is in your PATH.)
   $(error )
 endif
-$(info MSBUILD: $(MSBUILD))
+$(info DOTNET: $(DOTNET))
 $(info )
 
 ifeq ($(ANDROID_SDK_ROOT),)
@@ -117,7 +95,7 @@ endif
 $(info ANDROID_NDK_ROOT: $(ANDROID_NDK_ROOT))
 
 ifneq ($(Configuration),)
-  MSBUILD_PARAM = -p:Configuration="$(Configuration)"
+  DOTNET_PARAM = -p:Configuration="$(Configuration)"
 else
   $(warning Configuration environment variable not set.)
 endif
@@ -127,7 +105,7 @@ CREATE_MANIFEST_LINK :=
 
 MANIFEST_FILE := 
 ifneq ($(Flavor),)
-  MSBUILD_PARAM += -p:Flavor="$(Flavor)"
+  DOTNET_PARAM += -p:Flavor="$(Flavor)"
   ifneq ($(Flavor),)
 		ifeq ($(Flavor),Debug)
 			MANIFEST_FILE := AndroidManifest_debug.xml
@@ -152,7 +130,7 @@ else
 endif
 
 ifneq ($(KeyStore),)
-  MSBUILD_PARAM += -p:AndroidKeyStore=True -p:AndroidSigningKeyStore="$(KeyStore)" -p:AndroidSigningStorePass=env:MyAndroidSigningStorePass -p:AndroidSigningKeyPass=env:MyAndroidSigningKeyPass -p:AndroidSigningKeyAlias="kp2a"
+  DOTNET_PARAM += -p:AndroidKeyStore=True -p:AndroidSigningKeyStore="$(KeyStore)" -p:AndroidSigningStorePass=env:MyAndroidSigningStorePass -p:AndroidSigningKeyPass=env:MyAndroidSigningKeyPass -p:AndroidSigningKeyAlias="kp2a"
 endif
 
 ifeq ($(detected_OS),Windows)
@@ -176,7 +154,7 @@ endif
 # Recursive wildcard: https://stackoverflow.com/a/18258352
 rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
 
-$(info MSBUILD_PARAM: $(MSBUILD_PARAM))
+$(info DOTNET_PARAM: $(DOTNET_PARAM))
 $(info nuget path: $(shell $(WHICH) nuget))
 $(info )
 
@@ -254,7 +232,7 @@ OUTPUT_PluginQR = src/java/Keepass2AndroidPluginSDK2/app/build/outputs/aar/Keepa
 .PHONY: native $(NATIVE_COMPONENTS) clean_native $(NATIVE_CLEAN_TARGETS) \
 	java $(JAVA_COMPONENTS) clean_java $(JAVA_CLEAN_TARGETS) \
 	nuget clean_nuget \
-	msbuild clean_msbuild \
+	dotnetbuild clean_dotnet \
 	apk all clean
 
 all: apk
@@ -303,7 +281,7 @@ ifeq ($(shell $(WHICH) nuget),)
 endif
 	$(RMFILE) stamp.nuget_*
 	nuget restore src/KeePass.sln
-	$(MSBUILD) src/KeePass.sln -t:restore $(MSBUILD_PARAM) -p:RestorePackagesConfig=true
+	$(DOTNET) restore src/KeePass.sln $(DOTNET_PARAM) -p:RestorePackagesConfig=true
 	@echo "" > stamp.nuget_$(Flavor)
 
 manifestlink:
@@ -312,20 +290,21 @@ manifestlink:
 	$(CREATE_MANIFEST_LINK)	
 
 #####
-src/Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs:
-ifeq ($(detected_OS),Windows)
-	$(CP) src\Kp2aBusinessLogic\Io\DropboxFileStorageKeysDummy.cs src\Kp2aBusinessLogic\Io\DropboxFileStorageKeys.cs
-else
-	$(CP) src/Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs $@
-endif
 
-msbuild: manifestlink native java nuget src/Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs
-	$(MSBUILD) src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(MSBUILD_PARAM) -p:Platform="Any CPU" -m
+dotnetbuild: manifestlink native java nuget 
+	$(DOTNET) build src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(DOTNET_PARAM) -p:Platform="Any CPU" -m
 
-apk: msbuild 
-	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m 
+apk: manifestlink native java nuget  
+	$(DOTNET) publish src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(DOTNET_PARAM) -p:Platform=AnyCPU -m 
 
-build_all: msbuild
+apk_split: manifestlink native java nuget 
+	$(DOTNET) publish src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(DOTNET_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm
+	$(DOTNET) publish src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(DOTNET_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm64
+	$(DOTNET) publish src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(DOTNET_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x86
+	$(DOTNET) publish src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(DOTNET_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x64
+	src/build-scripts/rename-output-apks.sh src/keepass2android-app/bin/Release/net8.0-android/
+
+build_all: dotnetbuild
 
 ##### Cleanup targets
 
@@ -369,10 +348,10 @@ else
 endif
 	$(RMFILE) stamp.nuget_*
 
-clean_msbuild:
-	$(MSBUILD) src/KeePass.sln -target:clean $(MSBUILD_PARAM)
+clean_dotnet:
+	$(DOTNET) clean src/KeePass.sln $(DOTNET_PARAM)
 
-clean: clean_native clean_java clean_nuget clean_msbuild
+clean: clean_native clean_java clean_nuget clean_dotnet
 
 distclean: clean
 ifneq ("$(wildcard ./allow_git_clean)","")

src/KeePassLib2Android/Kp2aLog.cs

@@ -116,12 +116,23 @@ namespace keepass2android
 				
 			Intent sendIntent = new Intent();
 			sendIntent.SetAction(Intent.ActionSend);
-			sendIntent.PutExtra(Intent.ExtraText, File.ReadAllText(LogFilename));
+            string logText = File.ReadAllText(LogFilename);
+
+            sendIntent.PutExtra(Intent.ExtraText, logText);
 			sendIntent.PutExtra(Intent.ExtraEmail, "crocoapps@gmail.com");
 			sendIntent.PutExtra(Intent.ExtraSubject, "Keepass2Android log");
 			sendIntent.SetType("text/plain");
-			ctx.StartActivity(Intent.CreateChooser(sendIntent, "Send log to..."));
-		}
+            try
+            {
+                ctx.StartActivity(Intent.CreateChooser(sendIntent, "Send log to..."));
+            }
+            catch (Exception e)
+            {
+				Toast.MakeText(ctx, $"Error sending log of length {logText.Length} bytes: " + e.Message, ToastLength.Long)?.Show();
+
+            }
+
+        }
 
         public static void LogTask(object task, string activityName)
         {

src/KeePassLib2Android/Serialization/KdbxFile.Read.cs

@@ -83,6 +83,7 @@ namespace KeePassLib.Serialization
 			if (m_bUsedOnce)
 				throw new InvalidOperationException("Do not reuse KdbxFile objects!");
 			m_bUsedOnce = true;
+			Kp2aLog.Log("Starting to load KDBX file...");
 
 #if KDBX_BENCHMARK
 			Stopwatch swTime = Stopwatch.StartNew();
@@ -257,7 +258,8 @@ namespace KeePassLib.Serialization
 			MessageService.ShowInfo("Loading KDBX took " +
 				swTime.ElapsedMilliseconds.ToString() + " ms.");
 #endif
-		}
+            Kp2aLog.Log("Finished loading KDBX file.");
+        }
 
 		private void CommonCleanUpRead(List<Stream> lStreams, HashingStreamEx sHashing)
 		{

src/Kp2aAutofillParser.Tests/AutofillTest.cs

@@ -95,7 +95,7 @@ namespace Kp2aAutofillParserTest
             StructureParserBase<TestInputField> parser =
                 new StructureParserBase<TestInputField>(new TestLogger(), new TestDalSourceTrustAll());
 
-            var result = parser.ParseForFill(false, autofillView);
+            var result = parser.ParseForFill(autofillView);
             if (expectedPackageName != null)
                 Assert.Equal(expectedPackageName, result.PackageName);
             if (expectedWebDomain != null)

src/Kp2aAutofillParser.Tests/com-servicenet-mobile-no-focus.json

@@ -58,7 +58,8 @@
       "IsFocused": false,
       "InputType": 97,
       "HtmlInfoTag": null,
-      "HtmlInfoTypeAttribute": null
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "username" ]
     },
     {
       "IdEntry": "password_text_input_layout",
@@ -81,6 +82,7 @@
       "InputType": 129,
       "HtmlInfoTag": null,
       "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "password" ]
 
     },
     {

src/Kp2aAutofillParser/AutofillParser.cs

@@ -476,8 +476,16 @@ namespace Kp2aAutofillParser
 
             foreach (var field in autofillFields.HintMap.Values.Distinct())
             {
+                if (field == null || field.AutofillHints == null)
+                {
+                    continue;
+                }
                 foreach (var hint in field.AutofillHints)
                 {
+                    if (hint == null)
+                    {
+                        continue;
+                    }
                     if (GetPartitionIndex(hint) == partitionIndex)
                     {
                         filteredCollection.Add(field);
@@ -793,14 +801,14 @@ namespace Kp2aAutofillParser
             }
         }
 
-        public AutofillTargetId ParseForFill(bool isManual, AutofillView<FieldT> autofillView)
+        public AutofillTargetId ParseForFill(AutofillView<FieldT> autofillView)
         {
-            return Parse(true, isManual, autofillView);
+            return Parse(true, autofillView);
         }
 
         public AutofillTargetId ParseForSave(AutofillView<FieldT> autofillView)
         {
-            return Parse(false, true, autofillView);
+            return Parse(false, autofillView);
         }
 
         /// <summary>
@@ -808,8 +816,7 @@ namespace Kp2aAutofillParser
         /// </summary>
         /// <returns>The parse.</returns>
         /// <param name="forFill">If set to <c>true</c> for fill.</param>
-        /// <param name="isManualRequest"></param>
-        protected virtual AutofillTargetId Parse(bool forFill, bool isManualRequest, AutofillView<FieldT> autofillView)
+        protected virtual AutofillTargetId Parse(bool forFill, AutofillView<FieldT> autofillView)
         {
             AutofillTargetId result = new AutofillTargetId()
             {
@@ -876,8 +883,9 @@ namespace Kp2aAutofillParser
                     
                 }
 
-                //for "heuristic determination" we demand that one of the filled fields is focused:
-                if (passwordFields.Concat(usernameFields).Any(f => f.IsFocused))
+                //for "heuristic determination" we demand that there is a password field or one of the username fields is focused:
+                //Note that "IsFocused" might be false even when tapping the field. It might require long-press to autofill.
+                if (passwordFields.Any() || usernameFields.Any(f => f.IsFocused))
                 {
                     foreach (var uf in usernameFields)
                         AddFieldToHintMap(uf, new string[] { AutofillHintsHelper.AutofillHintUsername });

src/Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs

@@ -1,13 +0,0 @@
-namespace keepass2android.Io
-{
-	public partial class DropboxFileStorage
-	{
-		private const string AppKey = "dummy";
-		private const string AppSecret = "dummy";
-	}
-	public partial class DropboxAppFolderFileStorage
-	{
-		private const string AppKey = "dummy";
-		private const string AppSecret = "dummy";
-	}
-}

src/Kp2aBusinessLogic/Io/GenerateSecrets.targets

@@ -0,0 +1,27 @@
+<Project>
+  <Target Name="GenerateDropboxSecrets" BeforeTargets="BeforeCompile"
+  Inputs="@(DropboxSecretLines)"
+  Outputs="DropboxFileStorage.g.cs">
+
+    <WriteLinesToFile
+    File="Io/DropboxFileStorage.g.cs"
+      Lines="@(DropboxSecretLines->'%(Text)')"
+      Overwrite="true"
+      />
+  </Target>
+
+  <ItemGroup>
+    <DropboxSecretLines Include="GeneratedDropboxSecrets">
+      <Text>namespace keepass2android.Io {
+    public partial class DropboxFileStorage {
+      private const string AppKey = "$(DropboxAppKey)";
+      private const string AppSecret = "$(DropboxAppSecret)";
+    }
+    public partial class DropboxAppFolderFileStorage {
+      private const string AppKey = "$(DropboxAppFolderAppKey)";
+      private const string AppSecret = "$(DropboxAppFolderAppSecret)";
+    }
+  }</Text>
+    </DropboxSecretLines>
+  </ItemGroup>
+</Project>

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -4,30 +4,43 @@
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <DefineConstants Condition="'$(Flavor)'=='NoNet'">NO_QR_SCANNER;EXCLUDE_JAVAFILESTORAGE;NoNet</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentFTP" Version="51.1.0" />
-    <PackageReference Include="MegaApiClient" Version="1.10.4" />
-    <PackageReference Include="Microsoft.Graph" Version="5.68.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.67.1" />
+    <PackageReference Include="FluentFTP" Version="51.1.0" Condition="'$(Flavor)'!='NoNet'"/>
+    <PackageReference Include="MegaApiClient" Version="1.10.4"  Condition="'$(Flavor)'!='NoNet'"/>
+    <PackageReference Include="Microsoft.Graph" Version="5.68.0" Condition="'$(Flavor)'!='NoNet'"/>
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.67.1" Condition="'$(Flavor)'!='NoNet'"/>
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0" />
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.13.1.5" />
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBinding\AndroidFileChooserBinding.csproj" />
-    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" />
+    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" Condition="'$(Flavor)'!='NoNet'"  />
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj" />
     <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj" />
     <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj" />
   </ItemGroup>
   <ItemGroup>
-  <None Remove="Io/DropboxFileStorageKeysDummy.cs" />
-  <Compile Remove="Io/DropboxFileStorageKeysDummy.cs" />
-  <Content Remove="Io/DropboxFileStorageKeysDummy.cs" />
+
 </ItemGroup>
+<ItemGroup  Condition="'$(Flavor)'=='NoNet'">
+  <None Remove="Io/OneDrive2FileStorage.cs" />
+  <Compile Remove="Io/OneDrive2FileStorage.cs" />
+  <Content Remove="Io/OneDrive2FileStorage.cs" />
+  <None Remove="Io/MegaFileStorage.cs" />
+  <Compile Remove="Io/MegaFileStorage.cs" />
+  <Content Remove="Io/MegaFileStorage.cs" />
+</ItemGroup>
+
+<Import Project="Io/GenerateSecrets.targets" />
+<ItemGroup>
+<Compile Include="Io/DropboxFileStorage.g.cs" />
+</ItemGroup>
+
   
 </Project>

src/Kp2aBusinessLogic/Utils/ExceptionUtil.cs

@@ -15,7 +15,14 @@ namespace KeePass.Util
             string errorMessage = e.Message;
             if (e is Java.Lang.Exception javaException)
             {
-                errorMessage = javaException.LocalizedMessage ?? javaException.Message ?? errorMessage;
+                try
+                {
+                    errorMessage = javaException.LocalizedMessage ?? javaException.Message ?? errorMessage;
+                }
+                finally
+                {
+
+                }
             }
 
             return errorMessage;

src/Kp2aBusinessLogic/database/Database.cs

@@ -90,9 +90,12 @@ namespace keepass2android
 			PwDatabase pwDatabase = new PwDatabase();
 
 			IFileStorage fileStorage = _app.GetFileStorage(iocInfo);
-			Stream s = databaseData ?? fileStorage.OpenFileForRead(iocInfo);
-			var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo);
-			PopulateDatabaseFromStream(pwDatabase, s, iocInfo, compositeKey, status, databaseFormat);
+            Kp2aLog.Log("LoadData: Retrieving stream");
+            Stream s = databaseData ?? fileStorage.OpenFileForRead(iocInfo);
+            Kp2aLog.Log("LoadData: GetCurrentFileVersion");
+            var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo);
+            Kp2aLog.Log("LoadData: PopulateDatabaseFromStream");
+            PopulateDatabaseFromStream(pwDatabase, s, iocInfo, compositeKey, status, databaseFormat);
 		    LastFileVersion = fileVersion;
 
 		    status.UpdateSubMessage("");

src/Kp2aBusinessLogic/database/edit/LoadDB.cs

@@ -138,6 +138,7 @@ namespace keepass2android
 
 		Database TryLoad(MemoryStream databaseStream)
 		{
+			Kp2aLog.Log("LoadDb: Copying database in memory");
 			//create a copy of the stream so we can try again if we get an exception which indicates we should change parameters
 			//This is not optimal in terms of (short-time) memory usage but is hard to avoid because the Keepass library closes streams also in case of errors.
 			//Alternatives would involve increased traffic (if file is on remote) and slower loading times, so this seems to be the best choice.
@@ -146,8 +147,9 @@ namespace keepass2android
 			workingCopy.Seek(0, SeekOrigin.Begin);
 			//reset stream if we need to reuse it later:
 			databaseStream.Seek(0, SeekOrigin.Begin);
-			//now let's go:
-			try
+            Kp2aLog.Log("LoadDb: Ready to start loading");
+            //now let's go:
+            try
 			{
                 Database newDb = _app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _format, _makeCurrent);
 				Kp2aLog.Log("LoadDB OK");

src/build-scripts/linux-build.md

@@ -20,7 +20,6 @@ git clone --recurse-submodules https://github.com/PhilippC/keepass2android.git
 cd keepass2android/src/build-scripts
 ./build-java.sh && ./build-native.sh
 cd ..
-cp Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs
 cd keepass2android-app
 ln -s Manifests/AndroidManifest_debug.xml AndroidManifest.xml
 dotnet workload restore

src/build-scripts/rename-output-apks.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+BASE_DIR="${1}"
+
+for arch_dir in "$BASE_DIR"/android-*/; do
+  arch=$(basename "$arch_dir")
+  arch=${arch#android-}
+  APK_DIR="${arch_dir}publish"
+  if [[ -d "$APK_DIR" ]]; then
+    apk_path=$(find "$APK_DIR" -maxdepth 1 -type f -name "*.apk" | head -n1)
+    if [[ -n "$apk_path" ]]; then
+      base=$(basename "$apk_path" .apk)
+      new_path="$APK_DIR/${base}-${arch}.apk"
+      mv "$apk_path" "$new_path"
+      echo "Renamed $apk_path to $new_path"
+    else
+      echo "No APK found in $APK_DIR"
+    fi
+  else
+    echo "Directory $APK_DIR does not exist"
+  fi
+done

src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml

@@ -6,8 +6,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:supportsRtl="true">
         <activity android:name="com.crocoapps.javafilestoragetest2.MainActivity"
                   android:exported="true">
             <intent-filter>

src/java/android-filechooser-AS/app/src/main/res/values-it/strings.xml

@@ -56,15 +56,15 @@
     <string name="afc_title_sort_by">Ordina per…</string>
     <string name="afc_yesterday">Ieri</string>
     <plurals name="afc_title_choose_directories">
-        <item quantity="one">Scegli la cartella&#8230;</item>
-        <item quantity="other">Scegli le cartelle&#8230;</item>
+        <item quantity="one">Scegli cartella...</item>
+        <item quantity="other">Scegli le cartelle...</item>
     </plurals>
     <plurals name="afc_title_choose_files">
-        <item quantity="one">Scegli il file&#8230;</item>
-        <item quantity="other">Scegli i file&#8230;</item>
+        <item quantity="one">Scegli il file</item>
+        <item quantity="other">Scegli i file</item>
     </plurals>
     <plurals name="afc_title_choose_files_directories">
-        <item quantity="one">Scegli file/ cartella&#8230;</item>
-        <item quantity="other">Scegli file/ cartelle&#8230;</item>
+        <item quantity="one">Scegli file/cartella</item>
+        <item quantity="other">Scegli file/cartelle</item>
     </plurals>
 </resources>

src/keepass2android-app/AppKilledInfo.cs

@@ -14,7 +14,7 @@ using keepass2android;
 
 namespace keepass2android
 {
-	[Activity(Label = AppNames.AppName)]
+	[Activity(Label = AppNames.AppName, Theme = "@style/Kp2aTheme_BlueNoActionBar")]
 	public class AppKilledInfo : Activity, IDialogInterfaceOnDismissListener
 	{
 		protected override void OnCreate(Bundle bundle)

src/keepass2android-app/DisableAutofillForQueryActivity.cs

@@ -19,7 +19,7 @@ using keepass2android.services.AutofillBase;
 
 namespace keepass2android
 {
-    [Activity(Label = "DisableAutofillForQueryActivity")]
+    [Activity(Label = "DisableAutofillForQueryActivity", Theme = "@style/Kp2aTheme_ActionBar")]
     public class DisableAutofillForQueryActivity : Activity
     {
         public IAutofillIntentBuilder IntentBuilder = new Kp2aAutofillIntentBuilder();
@@ -63,8 +63,6 @@ namespace keepass2android
 
             prefs.Edit().PutStringSet("AutoFillDisabledQueries", disabledValues).Commit();
 
-            bool isManual = Intent.GetBooleanExtra(ChooseForAutofillActivityBase.ExtraIsManualRequest, false);
-            
             Intent reply = new Intent();
             FillResponse.Builder builder = new FillResponse.Builder();
             AssistStructure structure = (AssistStructure)Intent.GetParcelableExtra(AutofillManager.ExtraAssistStructure);
@@ -77,7 +75,7 @@ namespace keepass2android
             StructureParser parser = new StructureParser(this, structure);
             try
             {
-                parser.ParseForFill(isManual);
+                parser.ParseForFill();
 
             }
             catch (Java.Lang.SecurityException e)

src/keepass2android-app/EntryEditActivity.cs

@@ -37,8 +37,10 @@ using System.Net;
 using System.Text;
 using Android.Content.Res;
 using Android.Database;
+#if !NO_QR_SCANNER
 using Android.Gms.Common;
 using Android.Gms.Tasks;
+#endif
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Runtime;
@@ -55,10 +57,11 @@ using Object = Java.Lang.Object;
 using Uri = Android.Net.Uri;
 using Resource = keepass2android.Resource;
 using Google.Android.Material.TextField;
+#if !NO_QR_SCANNER
 using Xamarin.Google.MLKit.Vision.Barcode.Common;
 using Xamarin.Google.MLKit.Vision.CodeScanner;
+#endif
 using Console = System.Console;
-using Task = Android.Gms.Tasks.Task;
 
 namespace keepass2android
 {
@@ -331,13 +334,18 @@ namespace keepass2android
 
         }
 
-	    protected override void OnStart()
+        private bool hasRequestedKeyboardActivation = false;
+        protected override void OnStart()
 	    {
 	        base.OnStart();
 	        if (PreferenceManager.GetDefaultSharedPreferences(this)
-	            .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false))
+	            .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false)
+                && (!hasRequestedKeyboardActivation))
 	        {
-	            CopyToClipboardService.ActivateKeyboard(this);
+                //only try this once. if the user clicks cancel, we don't want to ask again
+				// (it may happen that the activity is restarted because of the NewTask flag immediately after the dialog)
+                hasRequestedKeyboardActivation = true;
+                CopyToClipboardService.ActivateKeyboard(this);
 	        }
         }
 
@@ -1153,8 +1161,10 @@ namespace keepass2android
             {
                 dlgView.FindViewById(Resource.Id.totp_custom_settings_group).Visibility = args.IsChecked ? ViewStates.Visible : ViewStates.Gone;
             };
-
-            dlgView.FindViewById<Button>(Resource.Id.totp_scan).Click += async (object o, EventArgs args) =>
+#if NO_QR_SCANNER
+            dlgView.FindViewById<Button>(Resource.Id.totp_scan).Visibility = ViewStates.Gone;
+#else
+			dlgView.FindViewById<Button>(Resource.Id.totp_scan).Click += async (object o, EventArgs args) =>
             {
                 if (GoogleApiAvailability.Instance.IsGooglePlayServicesAvailable(this) != ConnectionResult.Success)
                 {
@@ -1189,6 +1199,7 @@ namespace keepass2android
 
 
             };
+#endif
 
 			//copy values from entry into dialog
 			View ees = (View)sender.Parent;
@@ -1567,6 +1578,7 @@ namespace keepass2android
 
 		}
 	}
+#if !NO_QR_SCANNER
     public class SuccessListener : Object, IOnSuccessListener
     {
         private readonly Action<Barcode> _onSuccess;
@@ -1596,8 +1608,9 @@ namespace keepass2android
             _onFailure?.Invoke(e);
         }
     }
+#endif
 
-    public class DefaultEdit : EditModeBase
+	public class DefaultEdit : EditModeBase
 	{
 		
 	}

src/keepass2android-app/GroupBaseActivity.cs

@@ -894,9 +894,14 @@ namespace keepass2android
                     RegisterInfoTextDisplay(
                         "DbReadOnly"); //this ensures that we don't show the general info texts too soon
 
-                    FindViewById<TextView>(Resource.Id.dbreadonly_infotext_text).Text =
-                    (GetString(Resource.String.FileReadOnlyMessagePre) + " " +
-                     App.Kp2a.GetResourceString(reason.Result));
+                    var infotext_view = FindViewById<TextView>(Resource.Id.dbreadonly_infotext_text);
+                    if (infotext_view != null)
+                    {
+                        infotext_view.Text =
+                            (GetString(Resource.String.FileReadOnlyMessagePre) + " " +
+                             App.Kp2a.GetResourceString(reason.Result));
+                    }
+                    
                 }
             }
             UpdateBottomBarElementVisibility(Resource.Id.dbreadonly_infotext, canShow);

src/keepass2android-app/Manifests/AndroidManifest_net.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-			android:versionCode="206"
-			android:versionName="1.12-r5"
-			package="keepass2android.keepass2android"
-			xmlns:tools="http://schemas.android.com/tools"
-			android:installLocation="auto">
+      android:versionCode="217"
+      android:versionName="1.12-r9c"
+      package="keepass2android.keepass2android"
+      xmlns:tools="http://schemas.android.com/tools"
+      android:installLocation="auto">
 
 
   <queries>
@@ -46,13 +46,11 @@
 
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_launcher" android:label="KP2A entry search" android:name="keepass2android.keepass2android.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
-
   <application android:label="keepass2android"
-	android:icon="@mipmap/ic_launcher_online"
-	android:roundIcon="@mipmap/ic_launcher_online_round"
-	android:networkSecurityConfig="@xml/network_security_config"
-
-	>
+    android:icon="@mipmap/ic_launcher_online"
+    android:roundIcon="@mipmap/ic_launcher_online_round"
+    android:networkSecurityConfig="@xml/network_security_config"
+  >
 
     <meta-data
       android:name="com.google.mlkit.vision.DEPENDENCIES"
@@ -107,16 +105,15 @@
       </intent-filter>
     </activity>
     <activity android:name="keepass2android.softkeyboard.InputLanguageSelection"
-              
                android:exported="true">
-      <!-- android:label="@string/language_selection_title" TODO  -->
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <action android:name="keepass2android.softkeyboard.INPUT_LANGUAGE_SELECTION"/>
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
-    <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity"  android:windowSoftInputMode="adjustResize" android:exported="true">
+    <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity" android:windowSoftInputMode="adjustResize"
+    android:exported="true">
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="200" 
-			android:versionName="1.11-r0" 
-			package="keepass2android.keepass2android_nonet"
-			xmlns:tools="http://schemas.android.com/tools"
-			android:installLocation="auto">
-			
-			
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      android:versionCode="217"
+      android:versionName="1.12-r9c"
+      package="keepass2android.keepass2android_nonet"
+      xmlns:tools="http://schemas.android.com/tools"
+      android:installLocation="auto">
+
+
   <queries>
     <!-- Specific intents and packages we query for (required since Android 11) -->
     <package android:name="keepass2android.plugin.keyboardswap2" />
     <package android:name="keepass2android.AncientIconSet" />
-	<package android:name="com.dropbox.android" />
+    <package android:name="keepass2android.plugin.qr" />
+    <package android:name="it.andreacioni.kp2a.plugin.keelink" />
+    <package android:name="com.inputstick.apps.kp2aplugin" />
+    <package android:name="com.dropbox.android" />
+
+    <intent>
+      <action android:name="android.intent.action.OPEN_DOCUMENT" />
+      <data android:mimeType="*/*" />
+    </intent>
 
     <intent>
-        <action android:name="android.intent.action.OPEN_DOCUMENT" />
-        <data android:mimeType="*/*" />
-      </intent>
-	  
-	  <intent>
       <action android:name="android.intent.action.GET_DOCUMENT" />
       <data android:mimeType="*/*" />
     </intent>
@@ -36,59 +39,57 @@
     </intent>
 
     <intent>
-        <action android:name="android.intent.action.VIEW" />
-	  </intent>
-  </queries>			
-			
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
+      <action android:name="android.intent.action.VIEW" />
+    </intent>
+  </queries>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
+
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_launcher_offline" android:label="KP2A entry search" android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher_offline" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android_nonet.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
-	<application 
-		android:label="keepass2android" 
-		android:icon="@mipmap/ic_launcher_offline"
-		android:networkSecurityConfig="@xml/network_security_config"
-	>
+  <application android:label="keepass2android"
+    android:icon="@mipmap/ic_launcher_offline"
+    android:roundIcon="@mipmap/ic_launcher_offline_round"
+    android:networkSecurityConfig="@xml/network_security_config"
+  >
 
     <meta-data
       android:name="com.google.mlkit.vision.DEPENDENCIES"
       android:value="barcode_ui"/>
 
-		<uses-library
+    <uses-library
             android:name="org.apache.http.legacy"
             android:required="false"/>
-	
-		<provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" />
-		<provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.history" android:exported="false" />
-		<activity android:name="group.pals.android.lib.ui.filechooser.FileChooserActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:screenOrientation="user" android:theme="@style/Afc.Theme.Light">
-		</activity>
+  
+    <provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" />
+    <provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.history" android:exported="false" />
+    <activity android:name="group.pals.android.lib.ui.filechooser.FileChooserActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:screenOrientation="user" android:theme="@style/Afc.Theme.Light">
+    </activity>
 
-		<service android:name="keepass2android.softkeyboard.KP2AKeyboard" android:permission="android.permission.BIND_INPUT_METHOD" android:exported="true">
-			<intent-filter>
-				<action android:name="android.view.InputMethod" />
-			</intent-filter>
-			<meta-data android:name="android.view.im" android:resource="@xml/method" />
-		</service>
-		<activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="@string/english_ime_settings" android:exported="true">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="keepass2android.softkeyboard.LatinIMESettings" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-		 <activity android:name="keepass2android.softkeyboard.InputLanguageSelection"
-                android:label="@string/language_selection_title"
-                android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <action android:name="keepass2android.softkeyboard.INPUT_LANGUAGE_SELECTION"/>
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
- 
-		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity" android:windowSoftInputMode="adjustResize"
-              android:exported="true">
+    <service android:name="keepass2android.softkeyboard.KP2AKeyboard" android:permission="android.permission.BIND_INPUT_METHOD" android:exported="true">
+      <intent-filter>
+        <action android:name="android.view.InputMethod" />
+      </intent-filter>
+      <meta-data android:name="android.view.im" android:resource="@xml/method" />
+    </service>
+    <activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="@string/english_ime_settings" android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="keepass2android.softkeyboard.LatinIMESettings" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </activity>
+    <activity android:name="keepass2android.softkeyboard.InputLanguageSelection"
+               android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <action android:name="keepass2android.softkeyboard.INPUT_LANGUAGE_SELECTION"/>
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </activity>
+    <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity" android:windowSoftInputMode="adjustResize"
+    android:exported="true">
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -98,11 +99,11 @@
         <data android:host="*" />
       </intent-filter>
 
-	  <intent-filter>
+      <intent-filter>
         <action android:name="kp2a.action.SelectCurrentDbActivity" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
-	  
+
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.SEND" />
         <action android:name="android.intent.action.SEND_MULTIPLE" />
@@ -112,7 +113,7 @@
         <data android:mimeType="application/*" />
       </intent-filter>
 
-<!-- intent filter for opening database files 
+      <!-- intent filter for opening database files 
 Note that this stopped working nicely with Android 7, see e.g. https://stackoverflow.com/a/26635162/292233
 KP2A was using 
 <data android:scheme="content" />
@@ -126,7 +127,7 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
 -->
 
 
-<!-- This intent filter is for apps which use content with a URI containing the extension but no specific mimeType, e.g. ASTRO file manager -->
+      <!-- This intent filter is for apps which use content with a URI containing the extension but no specific mimeType, e.g. ASTRO file manager -->
 
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
@@ -168,7 +169,7 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
       </intent-filter>
 
       <!-- This intent filter is for apps which use content with a URI not containing the extension but at least specify mimeType=application/octet-stream, e.g. GoogleDrive or FolderSync -->
-<intent-filter android:label="@string/app_name">
+      <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
@@ -218,24 +219,15 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
       </intent-filter>
 
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data
-          android:scheme="https"
-          android:host="my.yubico.com"
-          android:pathPrefix="/neo"/>
+      <intent-filter android:label="@string/kp2a_findUrl">
+        <action android:name="android.intent.action.SEND" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:mimeType="text/plain" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="keepass2android.ACTION_START_WITH_TASK" />
+        <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
-	  
-			<intent-filter android:label="@string/kp2a_findUrl">
-				<action android:name="android.intent.action.SEND" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:mimeType="text/plain" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="keepass2android.ACTION_START_WITH_TASK" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -244,24 +236,28 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
         <data android:host="totp"/>
         <data android:host="hotp"/>
       </intent-filter>
-		</activity>
-		<uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
-		<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
-		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
-		<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="426.0dip" />
-		<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="360.0dip" />
-	</application>
-	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
-  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  
-  <uses-feature android:name="android.hardware.camera" android:required="false" />
-
+    </activity>
+    <uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
+    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="426.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="360.0dip" />
+  </application>
+  <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
   <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalFileBrowsing" />
   <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" />
+  <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+  <uses-feature android:name="android.hardware.camera" android:required="false" />
+
+  <!-- Samsung Pass permission -->
+  <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
-	
 </manifest>

src/keepass2android-app/PasswordActivity.cs

@@ -66,7 +66,6 @@ using Exception = System.Exception;
 using String = System.String;
 using Toolbar = AndroidX.AppCompat.Widget.Toolbar;
 using AndroidX.Core.Content;
-using Google.Android.Material.Snackbar;
 
 namespace keepass2android
 {
@@ -132,7 +131,8 @@ namespace keepass2android
 		ISharedPreferences _prefs;
 
 		private bool _starting;
-		private OtpInfo _otpInfo;
+        private bool _resumeCompleted;
+        private OtpInfo _otpInfo;
 		private IOConnectionInfo _otpAuxIoc;
         private ChallengeInfo _chalInfo;
         private byte[] _challengeSecret;
@@ -420,8 +420,14 @@ namespace keepass2android
 							try
 							{
 								var iocAux = GetDefaultAuxLocation();
-								LoadFile(iocAux);
-							}
+                                LoadFile(iocAux);
+
+                                if (Activity._chalInfo == null)
+                                {
+                                    throw new Java.Lang.Exception("Failed to load challenge aux file");
+                                }
+
+                            }
 							catch (Exception e)
 							{
 								//this can happen e.g. if the file storage does not support GetParentPath
@@ -801,8 +807,6 @@ namespace keepass2android
 
             _password = i.GetStringExtra(KeyPassword) ?? "";
             if (!KeyProviderTypes.Any())
-
-
             {
                 SetKeyProviderFromString(LoadKeyProviderStringForIoc(_ioConnection.Path));
             }
@@ -1255,7 +1259,7 @@ namespace keepass2android
 							case 6:
 							    KeyProviderTypes.Add(KeyProviders.ChallengeXC);
 							    break;
-						        case 7:
+                            case 7:
 						            //don't set to "" to prevent losing the filename. (ItemSelected is also called during recreation!)
 							    Kp2aLog.Log("key file length before: " + _keyFile?.Length);
 						            _keyFile = (FindViewById(Resource.Id.label_keyfilename).Tag ?? "").ToString();
@@ -1570,15 +1574,21 @@ namespace keepass2android
 
             base.OnPause();
 		}
-		protected override void OnStart()
+
+        private bool hasRequestedKeyboardActivation = false;
+        
+
+        protected override void OnStart()
 		{
 			base.OnStart();
 			_starting = true;
 
 		    if (PreferenceManager.GetDefaultSharedPreferences(this)
-		        .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false))
-		    {
-		        CopyToClipboardService.ActivateKeyboard(this);
+		        .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false)
+                && !hasRequestedKeyboardActivation)
+            {
+                hasRequestedKeyboardActivation = true;
+                CopyToClipboardService.ActivateKeyboard(this);
 		    }
 
             DonateReminder.ShowDonateReminderIfAppropriate(this);
@@ -1643,60 +1653,65 @@ namespace keepass2android
             if (intent != null)
             {
 				if (intent.HasExtra(Intents.OtpExtraKey))
-                {
-                    string otp = intent.GetStringExtra(Intents.OtpExtraKey);
-                    _keepPasswordInOnResume = true;
-                    if (KeyProviderTypes.Contains(KeyProviders.Otp))
+				{
+					string otp = intent.GetStringExtra(Intents.OtpExtraKey);
+					_keepPasswordInOnResume = true;
+					if (KeyProviderTypes.Contains(KeyProviders.Otp))
+					{
+
+						if (_otpInfo == null)
+						{
+							//Entering OTPs not yet initialized:
+							_pendingOtps.Add(otp);
+							UpdateKeyProviderUiState();
+						}
+						else
+						{
+							//Entering OTPs is initialized. Write OTP into first empty field:
+							bool foundEmptyField = false;
+							foreach (int otpId in _otpTextViewIds)
+							{
+								EditText otpEdit = FindViewById<EditText>(otpId);
+								if ((otpEdit.Visibility == ViewStates.Visible) && String.IsNullOrEmpty(otpEdit.Text))
+								{
+									otpEdit.Text = otp;
+									foundEmptyField = true;
+									break;
+								}
+							}
+							//did we find a field?
+							if (!foundEmptyField)
+							{
+								App.Kp2a.ShowMessage(this, GetString(Resource.String.otp_discarded_no_space), MessageSeverity.Error);
+							}
+						}
+
+						Spinner passwordModeSpinner = FindViewById<Spinner>(Resource.Id.password_mode_spinner);
+						if (passwordModeSpinner.SelectedItemPosition != (int)KeyProviders.Otp)
+						{
+							passwordModeSpinner.SetSelection((int)KeyProviders.Otp);
+						}
+					}
+					else
+					{
+						//assume the key should be used as static password
+						FindViewById<EditText>(Resource.Id.password_edit).Text += otp;
+					}
+				}
+				else
+				{
+                    // if the activity is launched twice and the first initialization hasn't even finished, we cannot 
+                    // reset the state and re-initialize the activity.
+					// This can happen with autofill in some cases (#2869)
+                    if (_resumeCompleted)
                     {
-
-                        if (_otpInfo == null)
-                        {
-                            //Entering OTPs not yet initialized:
-                            _pendingOtps.Add(otp);
-                            UpdateKeyProviderUiState();
-                        }
-                        else
-                        {
-                            //Entering OTPs is initialized. Write OTP into first empty field:
-                            bool foundEmptyField = false;
-                            foreach (int otpId in _otpTextViewIds)
-                            {
-                                EditText otpEdit = FindViewById<EditText>(otpId);
-                                if ((otpEdit.Visibility == ViewStates.Visible) && String.IsNullOrEmpty(otpEdit.Text))
-                                {
-                                    otpEdit.Text = otp;
-                                    foundEmptyField = true;
-                                    break;
-                                }
-                            }
-                            //did we find a field?
-                            if (!foundEmptyField)
-                            {
-                                App.Kp2a.ShowMessage(this, GetString(Resource.String.otp_discarded_no_space),  MessageSeverity.Error);
-                            }
-                        }
-
-                        Spinner passwordModeSpinner = FindViewById<Spinner>(Resource.Id.password_mode_spinner);
-                        if (passwordModeSpinner.SelectedItemPosition != (int)KeyProviders.Otp)
-                        {
-                            passwordModeSpinner.SetSelection((int)KeyProviders.Otp);
-                        }
+                        ResetState();
+                        GetIocFromLaunchIntent(intent);
+                        InitializeAfterSetIoc();
+                        OnStart();
                     }
-                    else
-                    {
-                        //assume the key should be used as static password
-                        FindViewById<EditText>(Resource.Id.password_edit).Text += otp;
-                    }
-
-
-                }
-                else
-                {
-                    ResetState();
-                    GetIocFromLaunchIntent(intent);
-					InitializeAfterSetIoc();
-                    OnStart();
-                }
+					
+				}
 			}
 	
 		}
@@ -1735,185 +1750,150 @@ namespace keepass2android
 
         protected override View? SnackbarAnchorView => FindViewById(Resource.Id.main_content);
 
-        protected override void OnResume()
-        {
-            base.OnResume();
-            
-            _activityDesign.ReapplyTheme();
+		protected override void OnResume()
+		{
+			base.OnResume();
 
-            Kp2aLog.Log("starting: " + _starting + ", Finishing: " + IsFinishing + ", _performingLoad: " +
-                        _performingLoad);
+			_activityDesign.ReapplyTheme();
 
-            CheckBox cbOfflineMode = (CheckBox)FindViewById(Resource.Id.work_offline);
-            App.Kp2a.OfflineMode =
-                cbOfflineMode.Checked =
-                    App.Kp2a
-                        .OfflineModePreference; //this won't overwrite new user settings because every change is directly saved in settings
-            LinearLayout offlineModeContainer = FindViewById<LinearLayout>(Resource.Id.work_offline_container);
-            var cachingFileStorage = App.Kp2a.GetFileStorage(_ioConnection) as CachingFileStorage;
-            if ((cachingFileStorage != null) && cachingFileStorage.IsCached(_ioConnection))
-            {
-                offlineModeContainer.Visibility = ViewStates.Visible;
-            }
-            else
-            {
-                offlineModeContainer.Visibility = ViewStates.Gone;
-                App.Kp2a.OfflineMode = false;
-            }
+			Kp2aLog.Log("starting: " + _starting + ", Finishing: " + IsFinishing + ", _performingLoad: " +
+						_performingLoad);
 
-
-
-
-            View killButton = FindViewById(Resource.Id.kill_app);
-            if (PreferenceManager.GetDefaultSharedPreferences(this)
-                .GetBoolean(GetString(Resource.String.show_kill_app_key), false))
-            {
-                killButton.Click += (sender, args) =>
-                {
-                    _killOnDestroy = true;
-                    SetResult(Result.Canceled);
-                    Finish();
-
-                };
-                killButton.Visibility = ViewStates.Visible;
-
-            }
-            else
-            {
-                killButton.Visibility = ViewStates.Gone;
-            }
-
-            TryGetOtpFromClipboard();
-
-            if (!_keepPasswordInOnResume)
-            {
-                if (
-                    _lastOnPauseTime <
-                    DateTime.Now -
-                    TimeSpan.FromSeconds(
-                        5) //only clear when user left the app for more than 5 seconds (allows to use Yubiclip, also allows to switch shortly to another app)
-                    &&
-                    PreferenceManager.GetDefaultSharedPreferences(this)
-                        .GetBoolean(GetString(Resource.String.ClearPasswordOnLeave_key), true))
-                {
-                    ClearEnteredPassword();
-                }
-
-            }
-
-
-
-            _keepPasswordInOnResume = false;
-
-            MakePasswordMaskedOrVisible();
-
-            UpdateOkButtonState();
-
-            if (KeyProviderTypes.Contains(KeyProviders.Challenge))
-            {
-                FindViewById(Resource.Id.otpInitView).Visibility =
-                    _challengeSecret == null ? ViewStates.Visible : ViewStates.Gone;
-            }
-			/*
-            Snackbar snackbar = Snackbar
-                .Make(FindViewById(Resource.Id.main_content),
-                    "snack snack snack snack snack snack snack snack snack snack snack snack snack snack snacksnack snack snacksnack snack snacksnack snack snack snack snack snack snack snack snack snack snack snack snack snack snack snacksnack snack snacksnack snack snacksnack  snack snack snack snack snacksnack snack snack ",
-                    Snackbar.LengthLong);
-            snackbar.SetTextMaxLines(5);
-            snackbar.SetBackgroundTint(GetColor(Resource.Color.md_theme_secondaryContainer));
-            snackbar.SetTextColor(GetColor(Resource.Color.md_theme_onSecondaryContainer));
-            snackbar.SetAction("dismiss",
-                view => snackbar.SetBackgroundTint(GetColor(Resource.Color.md_theme_surfaceContainer)));
-
-            snackbar.Show();
-
-            new Handler().PostDelayed(() =>
-            {
-
-                Snackbar snackbar2 = Snackbar
-                    .Make(FindViewById(Resource.Id.main_content), "snack snack snack ",
-                        Snackbar.LengthLong);
-                snackbar2.SetTextMaxLines(5);
-                snackbar2.SetBackgroundTint(GetColor(Resource.Color.md_theme_errorContainer));
-                snackbar2.SetTextColor(GetColor(Resource.Color.md_theme_onErrorContainer));
-                snackbar2.Show();
-            }, 1500);
-
-
-            new Handler().PostDelayed(() =>
-            {
-
-                Snackbar snackbar2 = Snackbar
-                    .Make(FindViewById(Resource.Id.main_content), "snack snack warn ",
-                        Snackbar.LengthLong);
-                snackbar2.SetTextMaxLines(5);
-                snackbar2.SetBackgroundTint(GetColor(Resource.Color.md_theme_inverseSurface));
-                snackbar2.SetTextColor(GetColor(Resource.Color.md_theme_inverseOnSurface));
-                snackbar2.Show();
-            }, 2500);*/
-
-            //use !IsFinishing to make sure we're not starting another activity when we're already finishing (e.g. due to TaskComplete in OnActivityResult)
-            //use !performingLoad to make sure we're not already loading the database (after ActivityResult from File-Prepare-Activity; this would cause _loadDbFileTask to exist when we reload later!)
-            if ( !IsFinishing && !_performingLoad)  
+			CheckBox cbOfflineMode = (CheckBox)FindViewById(Resource.Id.work_offline);
+			App.Kp2a.OfflineMode =
+				cbOfflineMode.Checked =
+					App.Kp2a
+						.OfflineModePreference; //this won't overwrite new user settings because every change is directly saved in settings
+			LinearLayout offlineModeContainer = FindViewById<LinearLayout>(Resource.Id.work_offline_container);
+			var cachingFileStorage = App.Kp2a.GetFileStorage(_ioConnection) as CachingFileStorage;
+			if ((cachingFileStorage != null) && cachingFileStorage.IsCached(_ioConnection))
 			{
-				
-				
-			    // OnResume is run every time the activity comes to the foreground. This code should only run when the activity is started (OnStart), but must
-				// be run in OnResume rather than OnStart so that it always occurrs after OnActivityResult (when re-creating a killed activity, OnStart occurs before OnActivityResult)
-			    if (_starting)
-			    {
+				offlineModeContainer.Visibility = ViewStates.Visible;
+			}
+			else
+			{
+				offlineModeContainer.Visibility = ViewStates.Gone;
+				App.Kp2a.OfflineMode = false;
+			}
 
-			        _starting = false;
 
-			        //database not yet loaded.
 
-			        //check if pre-loading is enabled but wasn't started yet:
-			        if (_loadDbFileTask == null &&
-			            _prefs.GetBoolean(GetString(Resource.String.PreloadDatabaseEnabled_key), true))
-			        {
-			            // Create task to kick off file loading while the user enters the password
-			            _loadDbFileTask = Task.Factory.StartNew(PreloadDbFile);
-			            _loadDbTaskOffline = App.Kp2a.OfflineMode;
-			        }
-			    }
+
+			View killButton = FindViewById(Resource.Id.kill_app);
+			if (PreferenceManager.GetDefaultSharedPreferences(this)
+				.GetBoolean(GetString(Resource.String.show_kill_app_key), false))
+			{
+				killButton.Click += (sender, args) =>
+				{
+					_killOnDestroy = true;
+					SetResult(Result.Canceled);
+					Finish();
+
+				};
+				killButton.Visibility = ViewStates.Visible;
+
+			}
+			else
+			{
+				killButton.Visibility = ViewStates.Gone;
+			}
+
+			TryGetOtpFromClipboard();
+
+			if (!_keepPasswordInOnResume)
+			{
+				if (
+					_lastOnPauseTime <
+					DateTime.Now -
+					TimeSpan.FromSeconds(
+						5) //only clear when user left the app for more than 5 seconds (allows to use Yubiclip, also allows to switch shortly to another app)
+					&&
+					PreferenceManager.GetDefaultSharedPreferences(this)
+						.GetBoolean(GetString(Resource.String.ClearPasswordOnLeave_key), true))
+				{
+					ClearEnteredPassword();
+				}
 
 			}
 
-		    if (compositeKeyForImmediateLoad != null)
-		    {
-		        //reload the database (without most other stuff performed in PerformLoadDatabase.
-		        // We're assuming that the db file (and if appropriate also the key file) are still available 
-		        // and there's no need to re-init the file storage. if it is, loading will fail and the user has 
-		        // to retry with typing the full password, but that's intended to avoid showing the password to a 
-		        // a potentially unauthorized user (feature request https://keepass2android.codeplex.com/workitem/274)
-		        Handler handler = new Handler();
-		        OnFinish onFinish = new AfterLoad(handler, this, _ioConnection);
-		        _performingLoad = true;
-                LoadDb task = new LoadDb(this, App.Kp2a, _ioConnection, _loadDbFileTask, compositeKeyForImmediateLoad, GetKeyProviderString(),
-		            onFinish, false, _makeCurrent);
-		        _loadDbFileTask = null; // prevent accidental re-use
-		        new ProgressTask(App.Kp2a, this, task).Run();
-		        compositeKeyForImmediateLoad = null; //don't reuse or keep in memory
 
-		    }
-		    else
-		    {
-		        bool showKeyboard = true;
 
-		       
-		        EditText pwd = (EditText) FindViewById(Resource.Id.password_edit);
-		        pwd.PostDelayed(() =>
-		        {
-		            InputMethodManager keyboard = (InputMethodManager) GetSystemService(InputMethodService);
-                    if (showKeyboard)
-                    {
-                        pwd.RequestFocus();
-                        keyboard.ShowSoftInput(pwd, 0);
-                    }
-                    else
-		                keyboard.HideSoftInputFromWindow(pwd.WindowToken, HideSoftInputFlags.ImplicitOnly);
-		        }, 50);
-		    }
+			_keepPasswordInOnResume = false;
+
+			MakePasswordMaskedOrVisible();
+
+			UpdateOkButtonState();
+
+			if (KeyProviderTypes.Contains(KeyProviders.Challenge))
+			{
+				FindViewById(Resource.Id.otpInitView).Visibility =
+					_challengeSecret == null ? ViewStates.Visible : ViewStates.Gone;
+			}
+
+			//use !IsFinishing to make sure we're not starting another activity when we're already finishing (e.g. due to TaskComplete in OnActivityResult)
+			//use !performingLoad to make sure we're not already loading the database (after ActivityResult from File-Prepare-Activity; this would cause _loadDbFileTask to exist when we reload later!)
+			if (!IsFinishing && !_performingLoad)
+			{
+
+
+				// OnResume is run every time the activity comes to the foreground. This code should only run when the activity is started (OnStart), but must
+				// be run in OnResume rather than OnStart so that it always occurrs after OnActivityResult (when re-creating a killed activity, OnStart occurs before OnActivityResult)
+				if (_starting)
+				{
+
+					_starting = false;
+
+					//database not yet loaded.
+
+					//check if pre-loading is enabled but wasn't started yet:
+					if (_loadDbFileTask == null &&
+						_prefs.GetBoolean(GetString(Resource.String.PreloadDatabaseEnabled_key), true))
+					{
+						// Create task to kick off file loading while the user enters the password
+						_loadDbFileTask = Task.Factory.StartNew(PreloadDbFile);
+						_loadDbTaskOffline = App.Kp2a.OfflineMode;
+					}
+				}
+
+			}
+
+			if (compositeKeyForImmediateLoad != null)
+			{
+				//reload the database (without most other stuff performed in PerformLoadDatabase.
+				// We're assuming that the db file (and if appropriate also the key file) are still available 
+				// and there's no need to re-init the file storage. if it is, loading will fail and the user has 
+				// to retry with typing the full password, but that's intended to avoid showing the password to a 
+				// a potentially unauthorized user (feature request https://keepass2android.codeplex.com/workitem/274)
+				Handler handler = new Handler();
+				OnFinish onFinish = new AfterLoad(handler, this, _ioConnection);
+				_performingLoad = true;
+				LoadDb task = new LoadDb(this, App.Kp2a, _ioConnection, _loadDbFileTask, compositeKeyForImmediateLoad, GetKeyProviderString(),
+					onFinish, false, _makeCurrent);
+				_loadDbFileTask = null; // prevent accidental re-use
+				new ProgressTask(App.Kp2a, this, task).Run();
+				compositeKeyForImmediateLoad = null; //don't reuse or keep in memory
+
+			}
+			else
+			{
+				bool showKeyboard = true;
+
+
+				EditText pwd = (EditText)FindViewById(Resource.Id.password_edit);
+				pwd.PostDelayed(() =>
+				{
+					InputMethodManager keyboard = (InputMethodManager)GetSystemService(InputMethodService);
+					if (showKeyboard)
+					{
+						pwd.RequestFocus();
+						keyboard.ShowSoftInput(pwd, 0);
+					}
+					else
+						keyboard.HideSoftInputFromWindow(pwd.WindowToken, HideSoftInputFlags.ImplicitOnly);
+				}, 50);
+			}
+
+			_resumeCompleted = true;
         }
 
 	    private void TryGetOtpFromClipboard()

src/keepass2android-app/Resources/layout/switch_ime_activity_layout.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                     android:id="@+id/main_content"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent"
+                                                     android:fitsSystemWindows="true">
 <LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
                xmlns:tools="http://schemas.android.com/tools"
                android:orientation="vertical"
@@ -14,6 +19,7 @@
                android:text="@string/switch_ime_text" />
 
     <Button 
+      
       android:id="@+id/btn_reopen"
       android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -25,4 +31,51 @@
       android:layout_height="wrap_content"
       android:text="@string/cancel" />
 
+    <LinearLayout android:orientation="vertical"
+            android:paddingTop="64dp"
+            android:id="@+id/settings_notes_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+              android:paddingTop="12dp"
+                android:id="@+id/note_kp2a_switch_rooted"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/autoswitch_enabled_but_not_setup"
+                />
+
+            <TextView
+              android:paddingTop="12dp"
+              android:id="@+id/note_AutoFillTotp_prefs_ActivateKeyboard"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/switch_keyboard_for_totp_enabled"
+            />
+
+            <TextView
+              android:paddingTop="12dp"
+              android:id="@+id/note_UseKp2aKeyboardInKp2a"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/switch_keyboard_inside_kp2a_enabled"
+            />
+
+            <TextView
+                android:id="@+id/note_OpenKp2aKeyboardAutomatically"
+              android:paddingTop="12dp"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/switch_keyboard_on_search_enabled"
+            />
+            
+            <Button 
+              style="?attr/materialButtonOutlinedStyle"
+              android:id="@+id/btn_open_settings"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/IconVisibilityInfo_Android8_btnSettings" />
+
+            </LinearLayout>
+
 </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/keepass2android-app/Resources/values-cs/strings.xml

@@ -1169,4 +1169,8 @@ První veřejné vydání
   <string name="kp2a_switch_on_sendgodone_summary">Přepnout zpět při stisknutí tlačítka odeslat/pokračovat/ukončit</string>
   <string name="qr_scanning_error_no_google_play_services">Skenování QR kódu vyžaduje služby Google Play. Nainstalujte nebo aktualizujte služby Google Play ve svém zařízení.</string>
   <string name="english_ime_settings">Nastavení klávesnice Keepass2Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Poznámka: Máte povoleno Aplikace - Nastavení - Přístup k heslu - Přepínání klávesnice - Automatické přepínání klávesnice, ale nezdá se, že je správně nakonfigurováno.</string>
+  <string name="switch_keyboard_for_totp_enabled">Poznámka: Máte povoleno Aplikace - Přístup k heslu - Služba automatického vyplňování - Automatické vyplňování pro položky TOTP. To může způsobit, že se toto okno zobrazí, když otevřete položku s TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Poznámka: V aplikaci Keepass2Android jste povolili možnost Aplikace - Zabezpečení - Použít vestavěnou klávesnici. To může způsobit, že se toto okno zobrazí při otevření aplikace nebo úpravě položky.</string>
+  <string name="switch_keyboard_on_search_enabled">Poznámka: Máte povoleno Aplikace - Zabezpečení - Přístup k heslu - Přepínání klávesnice - Přepínání klávesnice. To může způsobit, že se toto okno zobrazí při vyhledávání položky z prohlížeče.</string>
 </resources>

src/keepass2android-app/Resources/values-de/strings.xml

@@ -164,7 +164,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="invalid_db_sig">Datenbank-Format wurde nicht erkannt.</string>
   <string name="keyfile_does_not_exist">Schlüssel-Datei existiert nicht.</string>
   <string name="no_keyfile_selected">Keine Schlüsseldatei ausgewählt.</string>
-  <string name="keyfile_is_empty">Schlüssel-Datei ist leer.</string>
+  <string name="keyfile_is_empty">Schlüsseldatei ist leer.</string>
   <string name="length">Länge</string>
   <string name="list_size_title">Größe der Gruppenliste</string>
   <string name="list_size_summary">Schriftgröße in der Gruppenliste</string>
@@ -378,7 +378,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="ActivateSearchViewOnStart_summary">Aktiviert das Suchfeld in der Gruppenansicht nach dem Entsperren oder wenn ein Eintrag gesucht wird.</string>
   <string name="NoDonateOption_title">Spenden-Option ausblenden</string>
   <string name="NoDonateOption_summary">Diese Einstellung ist ein Dankeschön an alle, die gespendet haben. Sie steht erst nach einer gewissen Zeit der Benutzung von Keepass2Android zur Verfügung.</string>
-  <string name="NoDonateOption_question">Ohne Spenden gäbe es diese App nicht und sie könnte nicht ständig verbessert werden! Wenn Sie noch nicht gespendet haben, sollten Sie dies jetzt in Betracht ziehen.</string>
+  <string name="NoDonateOption_question">Ohne Spenden würde diese App nicht existieren und ständig verbessert werden! Wenn du noch nicht gespendet hast, erwäge bitte, dies jetzt zu tun</string>
   <string name="NoDonationReminder_title">Nie um eine Spende bitten</string>
   <string name="NoDonationReminder_summary">Ich werde keinen Cent spenden oder habe bereits gespendet. Bitte niemals um eine Spende, nicht einmal am Geburtstag des Autors.</string>
   <string name="UseOfflineCache_title">Datenbank-Caching</string>
@@ -717,12 +717,12 @@ Anbei einige Tipps, die bei der Diagnose des Problems helfen können:\n
   <string name="CloseDbAfterFailedAttempts">Datenbank nach drei fehlgeschlagenen biometrischen Entsperrversuchen schließen.</string>
   <string name="WarnFingerprintInvalidated">Achtung! Die biometrische Authentifizierung kann von Android ungültig gemacht werden, z. B. nach dem Hinzufügen eines neuen Fingerabdrucks in den Geräteeinstellungen. Bitte sicherstellen, dass jederzeit klar ist, wie mit dem eigenen Hauptpasswort entsperrt werden kann!</string>
   <string-array name="ChangeLog_1_12">
-    <item>Upgraded from Xamarin Android to .net 8</item>
+    <item>Von Xamarin Android auf .NET 8 upgegradet</item>
     <item>Upgrade auf Target-SDK 34</item>
-    <item>Upgraded to Material 3 user interface</item>
-    <item>Improve autofill to work with Compose apps</item>
-    <item>Fix hostname matching in autofill and search</item>
-    <item>Fix issue with password generator</item>
+    <item>Auf MUI 3 upgegradet</item>
+    <item>Verbessertes automatisches Ausfüllen damit Compose-Apps funktionieren</item>
+    <item>Hostnamen-vergleiche im automatischen Ausfüllen und der Suche gefixt</item>
+    <item>Probleme mit dem Passwort Generator behoben</item>
   </string-array>
   <string-array name="ChangeLog_1_12_net">
     <item>OneDrive SDK auf Version 5.68 aktualisiert</item>
@@ -1145,7 +1145,7 @@ Erstes öffentliches Release</string>
   <string name="masterkey_infotext_head">Kennst du dein Master-Passwort?</string>
   <string name="masterkey_infotext_main">Bitte beachte, dass du deine Datenbank ohne den Hauptschlüssel nicht öffnen kannst. Es gibt keine Möglichkeit, das Hauptpasswort „zurückzusetzen“.</string>
   <string name="masterkey_infotext_fingerprint_note">Bitte auch bedenken, dass das Biometrische Entsperren über das Speichern des Hauptschlüssels im sicheren Speicher von Android funktioniert. Dieser Speicher kann von Android jederzeit gelöscht werden, z. B. wenn ein neuer Fingerabdruck in den Systemeinstellungen hinzugefügt wird. Daher sich nicht auf das biometrische Entsperren verlassen, sondern sich bitte das eigene Hauptpasswort merken!</string>
-  <string name="backup_infotext_head">Gibt es eine Sicherung der Datenbank?</string>
+  <string name="backup_infotext_head">Ist deine Datenbank gesichert?</string>
   <string name="backup_infotext_main">Keepass2Android speichert die Passwörter in einer Datei an einem frei wählbarem Speicherort.Ist sichergestellt, dass die Datei auch dann noch verfügbar ist, wenn das Telefon verloren geht oder gestohlen wird, oder wenn die Datei zerstört oder gelöscht wird? Bitte sicherstellen, dass immer eine aktuelle Kopie an einem sichern Ort aufbewahrt wird!</string>
   <string name="backup_infotext_note">Um jetzt eine Sicherung zu erstellen, nach %1$s &gt; %2$s &gt; %3$s gehen.</string>
   <string name="emergency_infotext_head">Hast du für Notfälle vorgesorgt?</string>
@@ -1162,4 +1162,5 @@ Erstes öffentliches Release</string>
   <string name="kp2a_switch_on_sendgodone_summary">Beim Drücken von Senden/Los/Fertig zurückschalten</string>
   <string name="qr_scanning_error_no_google_play_services">QR-Code-Scannen erfordert Google Play-Dienste. Bitte installiere oder aktualisiere Google Play-Dienste auf deinem Gerät.</string>
   <string name="english_ime_settings">Android-Tastatureinstellungen</string>
+  <string name="autoswitch_enabled_but_not_setup">Notiz: Du hast Einstellungen - Anwendung - Passwortzugriff - Wechsel der Eingabemethode - Auto-Umschalten der Tastatur eingeschaltet, aber sieht aus als würde es nicht funktionieren</string>
 </resources>

src/keepass2android-app/Resources/values-es/strings.xml

@@ -1178,4 +1178,5 @@
   <string name="kp2a_switch_on_sendgodone">Volver cuando termine</string>
   <string name="kp2a_switch_on_sendgodone_summary">Volver cuando se presione enviar/ir/finalizado</string>
   <string name="english_ime_settings">Ajustes del teclado de Keepass2Android</string>
+  <string name="switch_keyboard_on_search_enabled">Nota: Ha habilitado la aplicación - Seguridad - Acceso a la contraseña - Interruptor de teclado - Cambiar teclado. Esto puede causar que esta ventana se muestre cuando busque una entrada desde el navegador.</string>
 </resources>

src/keepass2android-app/Resources/values-fr/strings.xml

@@ -546,6 +546,7 @@
   <string name="filestoragename_dropboxKP2A">Dropbox (dossier KP2A)</string>
   <string name="filestoragehelp_dropboxKP2A">Si vous ne voulez pas donner l\'accès KP2A à votre espace Dropbox complet, vous pouvez sélectionner cette option. Seul l\'accès au dossier Apps/Keepass2Android sera demandé. Ceci est particulièrement adapté lorsque vous créez une nouvelle base de données. Si vous avez déjà une base de données, cliquez sur cette option pour créer le dossier, puis placez votre fichier dans le dossier (à partir de votre PC) et puis sélectionnez à nouveau cette option pour ouvrir le fichier.</string>
   <string name="filestoragename_gdrive">Google Drive</string>
+  <string name="filestoragehelp_gdrive">Attention : Google restreint l\'accès à Google Drive depuis les applications pour un nombre grandissant d\'utilisateurs. Si l\'intégration de Google Drive ne fonctionne pas, utilisez plutôt le sélecteur de fichiers système et sélectionnez Google Drive !</string>
   <string name="filestoragename_gdriveKP2A">Google Drive (fichiers KP2A)</string>
   <string name="filestoragehelp_gdriveKP2A">Si vous ne voulez pas donner à KP2A un accès complet à Google Drive, vous pouvez sélectionner cette option. Notez que vous devez d\'abord créer un fichier de base de données, les fichiers existants ne sont pas visibles pour l\'application. Choisissez cette option dans l\'écran Créer une base de données ou, si vous avez déjà ouvert une base de données, en exportant la base de données en choisissant cette option.</string>
   <string name="filestoragename_pcloud">PCloud (dossier KP2A)</string>
@@ -723,9 +724,15 @@
     <item>Mise à niveau de Xamarin Android vers. net 8</item>
     <item>Mise à niveau vers Target SDK 34</item>
     <item>Mise à niveau vers l\'interface utilisateur Material 3</item>
-    <item>Improve autofill to work with Compose apps</item>
+    <item>Amélioration de la saisie automatique pour fonctionner avec les applications Compose</item>
     <item>Fix hostname matching in autofill and search</item>
-    <item>Fix issue with password generator</item>
+    <item>Corriger le problème avec le générateur de mot de passe</item>
+  </string-array>
+  <string-array name="ChangeLog_1_12_net">
+    <item>Mise à jour de OneDrive SDK vers la version 5.68</item>
+    <item>Mise à jour du SDK Dropbox vers la version 7.0.0</item>
+    <item>Mise à jour Gradle, NewtonsoftJson, FluentFTP, MegaApiClient et okhttp</item>
+    <item>Correction de bugs dans la sélection de fichiers WebDav</item>
   </string-array>
   <string-array name="ChangeLog_1_11">
     <item>Ajout de boutons d\'action flottants pour la recherche et l\'aperçu TOTP (si des entrées TOTP sont présentes).</item>
@@ -821,6 +828,89 @@
     * Nouvelle implémentation pour OneDrive : inclut la prise en charge de OneDrive Entreprise, des fichiers partagés, des périmètres d\'accès sélectionnables, des comptes multiples et des corrections de problèmes d\'accès en mode hors-ligne\n
     * Corrections d\'anomalies
   </string>
+  <string name="ChangeLog_1_07">    Version 1.07\n
+    * Corrige les crashs sur les Samsung avec Android 9\n
+    * Permet d\'ouvrir plus d\'une base de données, compatible avec KeeAutoExec\n
+    * SFTP : permet l\'authentification avec clé publique, vérifie si la clé de l\'hôte a changé\n
+    * Introduction du support pCloud - merci à gilbsgilbs !\n
+    * Mise en place explicite du support Nextcloud\n
+    * Améliore l\'enregistrement et la mise à jour des pièces jointes des entrées\n
+    * Plus d\'options pour adapter le comportement aux préférences personnelles\n
+    * SSL : acceptation et confiance avec les certificats utilisateur\n
+    * Améliore la saisie automatique (fonctionne maintenant avec Firefox, permet de réduire les popups)\n
+    * Résolution de bugs\n
+  </string>
+  <string name="ChangeLog_1_06">Version 1.06\n
+* Changement vers ykDroid au lieu de YubiChallenge comme application pour le défi-réponse de Yubikey.\n
+* implémentation du support de défi-réponse compatible KeepassXC. Note : Le format de base de données doit être KDBX4 !\n
+* Blocage du chargement de fichiers supprimés depuis Google Drive\n
+* Changement d\'implémentation TLS pour FTPS, ajout d\'un contournement du bug JSch avec les serveurs compatibles avec gssapi-with-mic\n
+* Correction de bugs\n  </string>
+  <string name="ChangeLog_1_05">    Version 1.05\n * Utilisation des canaux de notification Android 8, ce qui permet la configuration via les paramètres système\n * Affichage de l’icône entrée dans la notification\n * Utilisation d\'icônes adaptatifs pour Android 8, utilisez l\'icône arrondi du lanceur pour Android 7\n * Permet d’activer la recherche au déverrouillage (voir réglages) \n * Modification de comment les fichiers sont écrits en utilisant le framework Storage Access, corrections de problèmes sur les mises à jour des fichiers ouvert sur Google Drive avec le sélecteur du système fichier\n * Ajout de textes d’informations afin d’éviter certaines incompréhensions commune \n * Création de sauvegardes locales pour les bases ouvertes avec succès pour réduire le risque de perte de donnée\n * Mise à jour de JSch pour supporté les derniers chiffrements SSH\n * Permettre la modification des paramètres de connexion, par exemple lorsque le mot de passe WebDav a changé\n * Ajout du support pour mot de passe statique Yubikey Neo\n * Permettre de désactiver les suggestions automatiques\n * Correction des fuites de données vers logcat\n * Corrections d\'anomalies\n
+  </string>
+  <string name="ChangeLog_1_04b">    Version 1.04b\n * Évite les plantages lorsque l’utilisateur essaie d’activer la fonctionnalité de remplissage automatique sur les appareils Huawei.\n
+  </string>
+  <string name="ChangeLog_1_04">Version 1.04
+* Ajout du service de saisie automatique pour Android 8.0 et plus. 
+* Mise à niveau des librairies, des outils de build et de la version du sdk cible
+  </string>
+  <string name="ChangeLog_1_03">Version 1.03
+* Suppression du service d\'accessibilité pour le remplissage automatique tel que demandé par Google. Voir les paramètres d’accès mot de passe pour trouver un plugin reproduisant la fonctionnalité précédente.
+* Ajout d\'applications tierces comme option de stockage
+* Visionneuse intégrée pour le voir des images jointes sans les transférer sur d’autres applications
+* OkHttp mis à jour pour résoudre certains problèmes de connexion
+* Support des entrées de KeeTrayTOTP, supporte désormais les entrées Steam</string>
+  <string name="ChangeLog_1_02">    Version 1.02\n
+    * Quelques améliorations liées à la sécurité. Merci beaucoup pour le rapport jean-baptiste.cayrou@thalesgroup.com et vincent.fargues@thalesgroup.com et aussi pour votre collaboration !\n
+    * Support de KeyboardSwapPlugin (voir les paramètres d\'accès aux mots de passe) : permet de changer de méthode de saisie automatiquement sur les appareils sans « root ». Merci à Mishaal Rahman d\'XDA-Developers de l\'avoir rendu possible.\n
+    * Correction pour les services d’accessibilité avec les versions récentes de Chrome\n
+    * Correction pour les nettoyages non nécessaires des données d\'empreintes digitales\n
+    * Correction de plantages mineurs\n
+    * Mise à jour du kit de développement Dropbox pour s\'assurer de la compatibilité future\n
+    * Suppression des rapports d\'erreur en utilisant Xamarin Insights\n
+    * Mise à jour des outils de compilation\n
+  </string>
+  <string name="ChangeLog_1_01g">    Version 1. 1-g\n
+    * Correction pour un plantage lorsque vous essayez de travailler hors ligne\n
+    * Correction pour un codage incorrect des identifiants FTP(S)\n
+    * Correction pour les plantages lors de l\'utilisation de OneDrive et des anciennes versions d\'Android\n
+    * Affiche les temps en temps local dans l\'écran d\'entrée\n
+  </string>
+  <string name="ChangeLog_1_01d">Version 1.01-d\n * Correction pour le listing des fichiers OneDrive\n * Possibilité d’ignorer les erreurs de certificat lorsque la vérification du nom de l’hôte échoue (non recommandé pour une utilisation en production) \n * Correction pour QuickUnlock qui parfois ne fonctionnait malgré la saisie correcte du code\n  </string>
+  <string name="ChangeLog_0_9_8c">Version 0.9.8c\n
+* Correctif pour la vulnérabilité SSL dans Microsoft Live SDK (utilisé lorsque vous accédez à des fichiers via OneDrive)\n
+* Bug fix : la version précédente contenait deux méthodes de saisie (l\'une des deux plante)\n  </string>
+  <string name="ChangeLog_1_01">Version 1.01\n * Ajout du support pour le nouveau format KDBX-4 (compatible avec Keepass 2.35) y compris la dérivation de clés Argon2 et ChaCha20 cryptage.\n * Nouvelle implémentation du stockage WebDav, il est maintenant possible de parcourir les fichiers et le stockage prend en charge un chiffrement moderne.\n * Nouvelle implémentation du stockage FTP qui permet maintenant de parcourir les fichiers et de prendre en charge le cryptage (FTPS).\n * Mise à jour du SDK OneDrive (le SDK Live précédemment utilisé n’est plus mis à jour).\n * Mise à jour du SDK Dropbox vers la version 2 (la version 1 n\'est plus supportée).\n * Ajout du support pour OwnCloud.\n *Demande d’autorisation de stockage avant d’ouvrir les fichiers locaux.  </string>
+  <string name="ChangeLog_1_0_0e">Version 1.0.0e\n 
+* Règle un problème avec le scaneur d\'empreintes digitales sur les anciens appareils Samsung tournant avec Android 6.\n 
+* Ajout d\'un support natif pour les processeurs x86.\n 
+* Permet d\'afficher ou cacher les caractères dans les champs texte de saisie si le scanner d\'empreinte digital a été activé. \n
+* Construction de mise à jour système  </string>
+  <string name="ChangeLog_1_0_0">Version 1.0.0\n * Déverrouiller par empreinte digitale (nécessite Android 6.0+ ou un appareil Samsung)\n * Ajout du service de saisie automatique (nécessite Android 5.0+)\n * Ajout du support pour l\'entrée templates\n * Ajout d\'un mode \"hors connexion\"\n * Possibilité de copier les entrées\n * Mode semi-automatique pour les champs noms\n * Possibilité de supprimer des éléments de liste des fichiers récents\n * Demande des autorisations à l\'exécution pour Android 6.0\n * Corrections de bugs (dans le clavier intégré, lorsque vous sélectionnez les icônes)\n * Ajout d\'une option pour envoyer des rapports d\'erreur\n * Ajouts de plusieurs messages d\'aide\n  </string>
+  <string name="ChangeLog_0_9_9">Version 0.9.9\n
+		* Refonte complète de l\'interface utilisateur. Merci beaucoup à Stefano Pignataro (http://www.spstudio.at) pour son aide!\n
+    * Permet l\'ajout d\'icônes personnalisées\n
+    * Support pour l\'affichage fractionné sur les appareils Samsung\n
+    * Nombre de rotation par défaut pour le chiffrement de nouvelle base de données\n
+    * Vérification des clés dupliquées des champs supplémentaires pour éviter la perte de données\n
+    </string>
+  <string name="ChangeLog_0_9_9c">    Version 0.9.9c
+    * Retour du thème sombre
+    * Vous pouvez installer d\'autres pack d\'icones (Icones Windows ancien sont disponibles sur le Play Store)
+    * Ajout d\'une confirmation lors d\'une suppression d\'éléments sans passer par la corbeille
+    * Correction de bugs (mauvais affichage de l\'encodage secret OTP, mauvaise icone de l\'application dans certains endroits)
+  </string>
+  <string name="ChangeLog_0_9_8b">Version 0.9.8b\n
+		* corrections de bugs (Sauvegarde a échoué pour certaines bases, exporter vers le périphérique local ne fonctionne pas, sélectionner certaines options de préférence crash l\'app)\n</string>
+  <string name="ChangeLog_0_9_8">Version 0.9.8\n
+		* Support du Storage Access Framework (permet l\'écriture sur carte SD et Google Drive dans KP2A Offline)\n
+		* Essai de détecter les erreurs de saisie dans les URL WebDAV (répertoire au lieu du fichier)\n
+		* Police de mot de passe modifié\n
+		* Autorise le changement de compte Dropbox\n
+		* correction de bug: maintenant se souvient du mot de passe OTP\n</string>
+  <string name="ChangeLog_0_9_7b">Version 0.9.7b\n
+		* traductions actualisées\n
+		* corrections de bugs : polices de mot de passe était manquant dans 0.9.7, trie par nom ne trie pas les groupes\n</string>
   <string name="ChangeLog_keptDonate">Possibilité élargie de faire un don d\'une bière ou autre chose</string>
   <string-array name="clipboard_timeout_options">
     <item>30 secondes</item>
@@ -912,5 +1002,10 @@
   <string name="AutofillWarning_Intro">Vous êtes sur le point d\'insérer des identifiants pour le domaine \"%1$s\" dans l\'application \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Si vous faites confiance à \"%2$s\" pour appartenir à \"%1$s\" ou que vous faites confiance à l\'application \"%2$s\" pour ne pas abuser des identifiants (ex. parce que c\'est une application de navigateur de confiance), il est possible de continuer. Si ce n\'est pas le cas, veuillez annuler.</string>
   <string name="AutofillWarning_trustAsBrowser">Accepter toujours dans \"%1$s\"</string>
+  <string name="qr_scanning_error_no_google_play_services">Le scan de QR Code requiert les Services Google Play. Veuillez installer ou mettre à jour les Services Google Play sur votre périphérique.</string>
   <string name="english_ime_settings">Paramètres du clavier Keepass2Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Note : Vous avez activé le changement automatique de clavier, mais il ne semble pas être correctement configuré (Paramètres - Appli - Accès aux mots de passe - Changement de clavier).</string>
+  <string name="switch_keyboard_for_totp_enabled">Note : Vous avez activé le remplissage automatique des entrées TOTP. Cela peut entrainer l\'apparition de cette fenêtre lorsque vous ouvrez une entrée avec un TOTP (Paramètres - Appli - Accès aux mots de passe - Service de saisie automatique).</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Note : Vous avez activé le clavier intégré dans Keepass2Android. Cela peut faire apparaitre cette fenêtre quand vous ouvrez l\'application, ou que vous éditez une entrée (Paramètres - Appli - Sécurité).</string>
+  <string name="switch_keyboard_on_search_enabled">Note : Vous avez activé le changement de clavier. Cela peut faire apparaitre cette fenêtre lorsque vous recherchez une entrée depuis le navigateur (Paramètres - Appli - Accès aux mots de passe - Changement de clavier).</string>
 </resources>

src/keepass2android-app/Resources/values-it/strings.xml

@@ -722,7 +722,7 @@ Ecco alcuni suggerimenti che ti potrebbero aiutare a diagnosticare il problema:\
     <item>Aggiornato all\'interfaccia utente Material 3</item>
     <item>Migliora l\'autofill per funzionare con le app Compose</item>
     <item>Corretta la corrispondenza con l\' hostname in riempimento automatico e ricerca</item>
-    <item>Fix issue with password generator</item>
+    <item>Corretto problema con il generatore di password</item>
   </string-array>
   <string-array name="ChangeLog_1_12_net">
     <item>Aggiornato OneDrive SDK alla versione 5.68</item>
@@ -944,7 +944,142 @@ Ecco alcuni suggerimenti che ti potrebbero aiutare a diagnosticare il problema:\
   <string name="ChangeLog_0_9_7b">Versione 0.9.7b\n
 * aggiornate le traduzioni\n
 * bugfix:  font Password mancante nella versione 0.9.7; ordina per nome non ordinava i gruppi\n</string>
+  <string name="ChangeLog_0_9_7">    Versione 0.9.\n
+    * scrivere il supporto per i database di Keepass 1 (kdb) (beta!\n
+    * meglio tornare alla tastiera precedente (funziona anche su dispositivi non rootati)\n
+    * supporto per KeeChallenge con sfide di lunghezza variabile\n
+    * evitare di prendere screenshot dalle schermate di QuickUnlock e password\n
+    * ordine inverso per Ordina per Modifica Data (ora discendente)\n
+    * correzioni di bug: Note ora aggiornate correttamente dopo le modifiche, Viste password ora nascondere correttamente la password su (si spera) tutti i dispositivi, problema fisso che ha permesso di aggiungere una voce due volte, problema fisso con la visualizzazione di un avviso UUID duplicato anche dopo aver risolto il database\n
+  </string>
+  <string name="ChangeLog_0_9_6">    Versione 0.9.\n
+    * consente di importare file chiave e/o file di database locale nella directory interna dell\'app (vedi impostazioni)\n
+    * consente diverse opzioni di ordinamento\n
+    * preferenze migliorate per il cambio automatico della tastiera\n
+    * logo e design di notifica aggiornati, design di Stefano Pignataro (http://www. pstudio. t)\n
+    * generatore di password ricorda le ultime impostazioni\n
+    * imposta visibilità di notifica per Android 5 schermata di blocco\n
+    * ora cancellare il campo password principale quando esce dall\'app senza toccare OK\n
+    * problema fisso con i linguaggi di input mancanti nell\'impostazione della tastiera su alcuni dispositivi\n
+    * problema fisso con l\'accensione automatica della tastiera su dispositivi radicati\n
+    * aggiunto controllo per database corrotti (UUID duplicati)\n
+    * ricaricare automaticamente il database quando è stato rilevato, risolve i timori di sicurezza per la rivelazione della master password\n
+    * migliore lucido piccolo layout della tastiera, tema impostazioni tastiera fissa (grazie a Wiktor Ławski)\n
+  </string>
+  <string name="ChangeLog_0_9_5"><b>Versione 0.9.5</b>\n
+* corregge i problemi con la navigazione delle cartelle (in particolare su Android 4.4)\n
+* risolve il problema con il caricamento dei file .kdb (Keepass 1) su Nexus 5 con Android Lollipop\n
+* aggiunge un\'opzione per impedire la cattura delle schermate e nascondere KP2A dalla lista delle App Recenti\n
+* risolve il problema con l\'archiviazione su Google Drive (edizione normale)\n
+* permette i file chiave sui tipi di storage voluti (edizione normale)\n
+* aggiornato SDK di Dropbox per includere un aggiornamento di sicurezza (edizione normale)\n
+* aggiornati i tool di sviluppo --&gt; aumentata dimensione apk :-(\n
+Avevo promesso alcune altre modifiche. Arriveranno con la prossima release - scusate. Ho voluto pubblicare queste correzioni il più presto possibile.</string>
+  <string name="ChangeLog_0_9_4"><b>Versione 0.9.4</b>\n
+* aggiunto supporto ai plug-in: guarda nelle impostazioni per scoprire come ottenerli!\n
+* pubblicato QR plug-in (scansiona password, mostra password come QR-code, trasferisci voci ad altri dispositivi KP2A)\n
+* pubblicato InputStick plug-in (trasferisci credenziali al PC via bluetooth - richiede chiavetta InputStick USB)\n
+* le applicazioni di terze parti ora possono interrogare facilmente KP2A per ottenere le credenziali. Sei uno sviluppatore? Per favore aggiungi il supporto alle tue applicazioni se ti sembra conveniente!\n
+* aggiunto supporto a TOTP (compatibile con KeeOTP e TrayTotp)\n
+* l\'app non dovrebbe più essere chiusa da Android quando il database è aperto\n
+* il database non viene più chiuso quando si abbandona l\'app tramite il pulsante \"indietro\" (vedi impostazioni)\n
+* mostra i nomi dei gruppi nei risultati di ricerca (*)\n
+* aggiungo un menu contestuale nei risultati di ricerca con l\'opzione \"Passa al gruppo superiore\" (*)\n
+* aggiunta un\'opzione per mostrare, nella visualizzazione di una voce, il nome del gruppo a cui la voce appartiene (*)\n
+* (*) un grazie a Matthieu per aver implementato queste funzioni!\n
+* aggiunto supporto a KeeChallenge (con Yubikey NEO). Grazie a Ben Rush per l\'implementazione del connettore!\n
+* migliorata l\'interfaccia utente\n
+* corretto un bug nell\'interfaccia di Google Drive\n
+* aggiunta un\'opzione per disabilitare la funzione \"donazione\"\n
+* l\'icona QuickUnlock ora è nascosta di default su dispositivi Android 4.2+\n</string>
+  <string name="ChangeLog_0_9_3_r5"><b>Versione 0.9.3 r5</b>\n 
+		* Incorporate correzioni da Xamarin: Keepass2Android è ora compatibile con ART su Android 4.4.2. Finalmente!\n 
+		* Correzioni di errori: errori in sincronizzazione (aggiornamento visualizzazione, corretto controllo per modifiche in http), errori su dispositivi Android 2.x, errori nelle implementazioni di archiviazione con Google Drive e OneDrive, pulizia degli appunti alla chiusura del database, errori in apertura allegati, problemi di visualizzazione della tastiera\n</string>
+  <string name="ChangeLog_0_9_3"><b>Versione 0.9.3</b>\n
+* Nuova tastiera con molti miglioramenti. Vedi le Impostazioni.\n
+* Supporto in sola lettura per file kdb (Keepass 1). Sperimentale!\n
+* Aggiunto supporto SFTP\n
+* Aggiunto soluzione temporanea per il bug con ART (Android 4.4.2)\n
+* Bugfix\n</string>
+  <string name="ChangeLog_0_9_2"><b>Versione 0.9.2</b>\n
+* Aggiunto supporto OTP (compatibile con il plugin OtpKeyProv)\n
+* Integrato supporto NFC per le OTP dal NEO YubiKey\n
+* Aggiornata l\'interfaccia utente\n
+* Integrata la libreria di Keepass 2.24\n
+* Aggiunta un\'opzione per terminare il processo dell\'app (vedi le Impostazioni)\n
+* Migliorata la validazione del certificato SSL\n
+* Corretti alcuni errori\n</string>
+  <string name="ChangeLog_0_9_1"><b>Versione 0.9.1</b>\n
+* Aggiunto il supporto per SkyDrive (solo nell\'edizione normale di Keepass2Android)\n
+* Corretti i problemi di integrazione con Google Drive\n
+* Aggiunto supporto NTLM</string>
+  <string name="ChangeLog_0_9"><b>Versione 0.9</b> \n
+* integrato supporto per Dropbox e Google Drive (database in lettura/scrittura; solo per Keepass2Android edizione regolare)\n
+* integrata la selezione dei file (basata su android-filechooser di HBA)\n
+* migliorata l\'interfaccia per la creazione di nuovi database\n
+* incluso il font DejaVu Sans Mono per la visualizzazione passwords\n
+* corretti alcuni errori</string>
+  <string name="ChangeLog_0_8_6"><b>Versione 0.8.6</b>\n
+* Supporto per cifratura Twofish\n
+* Consentita la modifica dei gruppi\n
+* Consentito lo spostamento di voci e gruppi\n
+* L\'icona QuickUnlock può essere resa trasparente (vedi le impostazioni)\n
+* Correzioni di errori</string>
+  <string name="ChangeLog_0_8_5"><b>Versione 0.8.5</b>\n
+* i file remoti vengono mantenuti nella cache locale dell\'applicazione per permetterne l\'uso offline (compresa la modifica e la successiva sincronizzazione). Vedi le impostazioni. \n
+* Icona di notifica per visualizzare lo stato del blocco del database (vedi Impostazioni)\n
+* Migliorato il rilevamento dello stato del blocco del database in alcune circostanze \n
+* I file dei database vengono caricati in memoria mentre stai digitando la password per aumentare la velocità di caricamento (vedi Impostazioni) \n
+* Le voci possono essere aggiunte al gruppo principale \n
+* Correzione di errori (risoluzione campi con riferimenti, problemi con la tastiera su dispositivi italiani e cinesi)</string>
+  <string name="ChangeLog_0_8_4"><b>Versione 0.8.4</b>\n
+* Le modifiche al database esterno vengono rilevate ed unite durante il salvataggio\n
+* Migliorate le performance durante il caricamento\n
+* Migliorata la barra di ricerca con suggerimenti\n
+* Nuovo logo dell\'App!\n
+* Aggiunto supporto al formato .kdbp per apertura e salvataggio più veloci\n
+* Migliorata la modifica delle stringhe aggiuntive e la visualizzazione nascosta quando sono protette\n
+Grazie ad Alex Vallat per il suo contributo al codice!\n
+Grazie a Niki Hüttner (www.close-cut.de) per il logo!\n</string>
+  <string name="ChangeLog_0_8_3"><b> Versione 0.8.3 </b>\n
+* Le voci nome utente e indice TAN vengono visualizzati nella lista delle voci di immissione (vedi le impostazioni)\n
+* Le voci possono essere create se la ricerca da browser non restituisce alcun risultato\n
+* La tastiera KP2A offre possibilità di ricercare le credenziali per l\'applicazione attuale\n
+* L\'applicazione si chiude automaticamente dopo aver selezionato una voce per l\'uso dalla tastiera\n
+* La finestra di selezione della tastiera si apre automaticamente dopo la ricerca di URL (vedi le impostazioni)\n
+* I segnaposto nei campi di immissione vengono sostituiti prima della copia (la maggior parte dei segnaposto sono supportati)\n
+* Correzioni di errori minori  </string>
+  <string name="ChangeLog_0_8_2"><b>Versione 0.8.2</b>\n
+* Supporto per la Digest Authentication in WebDAV\n
+* Correzione di errori (OI File manager, Open URL)</string>
+  <string name="ChangeLog_0_8_1"><b>Versione 0.8.1</b>\n
+* KP2A Offline e \"Online\" possono di nuovo essere installati insieme\n
+* Aggiunte nuove traduzioni (grazie a tutti i collaboratori!)</string>
+  <string name="ChangeLog_0_8"><b>Versione 0.8</b>\n
+* Migliorata l\'interfaccia utente in particolare per i dispositivi con Android 4.x\n
+* Consentito l\'utilizzo di gestori di file personali per selezionare file esistenti\n
+* Aggiunto un modo più sicuro per l\'apertura degli allegati (tramite cartella di cache)\n
+* sistemati alcuni errori nella finestra di modifica\n
+* probabilmente aggiunti nuovi errori :-)</string>
   <string name="ChangeLog_keptDonate">Estesa la possibilità di donare una birra o qualcos\'altro</string>
+  <string name="ChangeLog_0_7"><b>Versione 0.7</b>\n
+* Aumentata la velocità di caricamento: l\'elaborazione delle chiavi ora è 10 volte più veloce!\n
+* Aggiunta la tastiera virtuale di Keepass2Android: usa questa tastiera quando inserisci le credenziali. Ti metterà al riparo dagli sniffer delle password basati sugli appunti (disabilita le vecchie notifiche degli appunti nelle impostazioni)\n
+* Aggiunta l\'opzione per donare una birra o qualcos\'altro (vedi menu)</string>
+  <string name="ChangeLog"><b>Versione 0.6.2</b>\n
+* Integrazione con Google Drive/Dropbox/... : usa l\'app ufficiale di Google Drive o Dropbox App e apri un qualunque file \".kdbx\". In questo modo si aprirà KP2A.\n
+* Migliorato il dialogo di ricerca\n
+* Migliorati i risultati di ricerca per le URL condivise con sottodomini\n
+* Aggiunte al menu le opzioni per inviare feedback, valutazioni e per tradurre l\'app\n
+\n
+<b>Versione 0.6.1</b>\n
+* Aggiunto il rilevamento di modifiche in background (es.: dovute ad un\'app di sincronizzazione)\n
+* Migliorata la ricerca delle URL dal browser\n
+* Aggiunta una richiesta di conferma prima di annullare le modifiche\n
+\n
+<b>Versione 0.6</b>\n
+Prima release pubblica
+  </string>
   <string-array name="clipboard_timeout_options">
     <item>30 secondi</item>
     <item>1 minuto</item>
@@ -1039,4 +1174,7 @@ Ecco alcuni suggerimenti che ti potrebbero aiutare a diagnosticare il problema:\
   <string name="kp2a_switch_on_sendgodone_summary">Torna indietro quando premi invia/vai/fatto</string>
   <string name="qr_scanning_error_no_google_play_services">La scansione del codice QR richiede Google Play Services. Installa o aggiorna Google Play Services sul tuo dispositivo.</string>
   <string name="english_ime_settings">Impostazioni tastiera Keepass2Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Nota: Hai abilitato App - Impostazioni - Accesso password - Cambio di tastiera - Tastiera automatica, ma non sembra essere configurata correttamente.</string>
+  <string name="switch_keyboard_for_totp_enabled">Nota: Hai abilitato App - Accesso password - Servizio di autocompilazione - Autocompilazione per le voci TOTP. Questo può causare la visualizzazione di questa finestra quando si apre una voce con un TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Nota: Hai abilitato App - Sicurezza - Usa la tastiera integrata all\'interno di Keepass2Android. Questo può causare la visualizzazione di questa finestra quando si apre l\'app o si modifica una voce.</string>
 </resources>

src/keepass2android-app/Resources/values-pt-rBR/strings.xml

@@ -1203,4 +1203,8 @@
   <string name="kp2a_switch_on_sendgodone_summary">Voltar ao pressionar enviar/ir/concluído</string>
   <string name="qr_scanning_error_no_google_play_services">A leitura de código QR requer o Google Play Services. Instale ou atualize o Google Play Services no seu dispositivo.</string>
   <string name="english_ime_settings">Configurações do teclado Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Nota: Você ativou o Aplicativo - Configurações - Acesso por senha - Troca de teclado - Troca automática de teclado, mas não parece estar configurado corretamente.</string>
+  <string name="switch_keyboard_for_totp_enabled">Nota: você ativou o Aplicativo - Acesso por senha - Serviço de preenchimento automático - Preenchimento automático para entradas TOTP. Isso pode fazer com que essa janela seja exibida quando você abre uma entrada com um TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Nota: Você ativou o Aplicativo - Segurança - Usar o teclado embutido dentro do Keepass2Android. Isso pode fazer com que essa janela seja exibida quando você abre o aplicativo ou edita uma entrada.</string>
+  <string name="switch_keyboard_on_search_enabled">Nota: Você ativou o Aplicativo - Segurança - Acesso por senha - Troca de teclado - Alternar teclado. Isso pode fazer com que essa janela seja exibida quando você pesquisar uma entrada no navegador.</string>
 </resources>

src/keepass2android-app/Resources/values-ro/strings.xml

@@ -468,6 +468,7 @@
   <string name="NoOverwrite">Nu, suprascrie</string>
   <string name="UseOfflineMode">Funcționare doar cu cache intern</string>
   <string name="UseOnlineMode">Sincronizează copia cache cu sursa</string>
+  <string name="UseOfflineMode_Info">Baza de date este încărcată din memoria cache internă. Modificările sunt stocate doar în cache-ul intern și vor fi sincronizate numai atunci când selectezi Sincronizare copie cache cu sursa.</string>
   <string name="InOfflineMode">Funcționare doar cu cache intern.</string>
   <string name="SynchronizingCachedDatabase">Sincronizează baza de date din cache…</string>
   <string name="DownloadingRemoteFile">Se încarcă fișierul sursă…</string>
@@ -476,15 +477,21 @@
   <string name="FilesInSync">Fişierele sunt sincronizate.</string>
   <string name="SynchronizedDatabaseSuccessfully">Baza de date s-a sincronizat cu succes!</string>
   <string name="CheckingDatabaseForChanges">Se verifică baza de date pentru modificări…</string>
+  <string name="CouldNotSaveToRemote">Nu s-a putut salva în fișierul sursă: %1$s. Salvează din nou sau utilizează meniul Sincronizare atunci când fișierul este accesibil din nou.</string>
+  <string name="CouldNotLoadFromRemote">Nu s-a putut accesa fișierul sursă: %1$s. Fișier încărcat din cache-ul intern. Poți face în continuare modificări în baza de date și să le sincronizezi mai târziu.</string>
   <string name="UpdatedRemoteFileOnLoad">Fișier sursă actualizat.</string>
+  <string name="NotifyOpenFromLocalDueToConflict">S-a deschis fișierul cache intern din cauza conflictului cu modificările din fișierul sursă. Utilizează meniul Sincronizare pentru a fuziona.</string>
   <string name="LoadedFromRemoteInSync">Fișierul sursă și cache-ul sunt sincronizate.</string>
   <string name="UpdatedCachedFileOnLoad">S-a actualizat copia internă a cache-ului %1$s.</string>
   <string name="RemoteDatabaseUnchanged">Nu s-au detectat modificări.</string>
+  <string name="ResolvedCacheConflictByUsingRemoteOtpAux">S-a actualizat fișierul auxiliar OTP din cache : Contorul sursă a fost mai mare.</string>
+  <string name="ResolvedCacheConflictByUsingLocalOtpAux">S-a actualizat fișierul auxiliar OTP sursă: Contorul local a fost mai mare.</string>
   <string name="SynchronizingOtpAuxFile">Se sincronizează fișierul auxiliar OTP…</string>
   <string name="database_file">fișier bază de date</string>
   <string name="otp_aux_file">Fişier auxiliar OTP</string>
   <string name="ErrorOcurred">A apărut o eroare:</string>
   <string name="DuplicateUuidsError">Baza de date este coruptă: ID-uri duplicate au fost găsite. (Ai salvat cu Minikeepass?) Te rog să reimporți o bază de date nouă cu Keepass 2 pentru PC selectând \'Create new IDs\'.</string>
+  <string name="DuplicateUuidsErrorAdditional">Poți dezactiva acest mesaj de eroare în Setări/Setările aplicației/Gestionare fișiere/Verificare duplicat UUID-uri. Reține că este posibil te confrunți cu un comportament neașteptat. Este recomandat să repari baza de date.</string>
   <string name="synchronize_database_menu">Sincronizează baza de date…</string>
   <string name="CannotMoveGroupHere">Nu se poate muta grupul în acest grup.</string>
   <string name="donate_question">Astăzi este Oktoberfest! Dacă vă place Keepass2Android: nu ar fi azi o zi potrivită să-mi cumpăraţi o bere?</string>
@@ -518,6 +525,7 @@
   <string name="private_key_select">Selectează cheia privată</string>
   <string name="private_key_create_new">[Adaugă nou...]</string>
   <string name="hint_sftp_key_passphrase">Frază de acces pentru cheie (opțională)</string>
+  <string name="sftp_kex_title">Algoritmi de schimb de chei (KEX) (opțional)</string>
   <string name="enter_ftp_login_title">Introdu datele de conectare FTP:</string>
   <string name="select_storage_type">Selectaţi tipul de stocare:</string>
   <string name="filestoragename_file">Fişier local</string>

src/keepass2android-app/Resources/values-sk/strings.xml

@@ -726,7 +726,7 @@
     <item>Aktualizované na používateľské rozhranie Material 3</item>
     <item>Vylepšené automatické dopĺňanie kvôli fungovaniu s aplikáciami Compose</item>
     <item>Oprava zhody mena hostiteľa v automatickom dopĺňaní a vyhľadávaní</item>
-    <item>Fix issue with password generator</item>
+    <item>Oprava problému s generátorom hesiel</item>
   </string-array>
   <string-array name="ChangeLog_1_12_net">
     <item>Aktualizované na OneDrive SDK, verziu 5.68</item>
@@ -1203,4 +1203,8 @@
   <string name="kp2a_switch_on_sendgodone_summary">Po stlačení Odoslať/Prejsť/Hotovo prejsť späť</string>
   <string name="qr_scanning_error_no_google_play_services">Na skenovanie QR kódov sú potrebné služby Google Play. Nainštalujte alebo aktualizujte si ich vo vašom zariadení.</string>
   <string name="english_ime_settings">Nastavenia klávesnice Keepass2Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Poznámka: aktivovali ste automatické prepínanie klávesnice v sekcii Nastavenia aplikácie - Prístup k záznamu s heslom - Prepínanie klávesnice, ale zdá sa, že táto funkcia nie je správne nakonfigurovaná.</string>
+  <string name="switch_keyboard_for_totp_enabled">Poznámka: aktivovali ste automatické dopĺňanie pre záznamy TOTP, v sekcii Apl. - Prístup k záznamu s heslom - Služba automatického dopĺňania. Môže to spôsobiť zobrazenie tohto okna pri otvorení záznamu s TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Poznámka: aktivovali ste použitie klávesnice integrovanej v Keepass2Android, v sekcii Apl. - Zabezpečenie. Môže to spôsobiť zobrazenie tohto okna pri otvorení aplikácie alebo pri úprave záznamu.</string>
+  <string name="switch_keyboard_on_search_enabled">Poznámka: aktivovali ste prepínanie klávesnice v sekcii Apl. - Zabezpečenie - Prístup k záznamu s heslom - Prepínanie klávesnice. Môže to spôsobovať zobrazenie tohto okna pri vyhľadávaní nejakého záznamu z prehliadača.</string>
 </resources>

src/keepass2android-app/Resources/values-sl/strings.xml

@@ -1201,4 +1201,8 @@
   <string name="kp2a_switch_on_sendgodone_summary">Preklopi nazaj, ko pritisnete gumb za pošiljanje/prehajanje/končano</string>
   <string name="qr_scanning_error_no_google_play_services">Za optično branje kode QR so potrebne storitve Google Play. V svojo napravo namestite ali posodobite storitve Google Play.</string>
   <string name="english_ime_settings">Nastavitve tipkovnice Keepass2Android</string>
+  <string name="autoswitch_enabled_but_not_setup">Opomba: Omogočili ste Aplikacije - Nastavitve - Dostop z geslom - Preklop tipkovnice - Samodejni preklop tipkovnice, vendar se zdi, da ta ni pravilno konfigurirana.</string>
+  <string name="switch_keyboard_for_totp_enabled">Opomba: Omogočili ste Aplikacije - Dostop do gesla - Storitev samodejnega izpolnjevanja - Samodejno izpolnjevanje za vnose TOTP. To lahko povzroči, da se to okno prikaže, ko odprete vnos s TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Opomba: Omogočili ste Aplikacije - Varnost - Uporabi vgrajeno tipkovnico znotraj Keepass2Android. To lahko povzroči, da se to okno prikaže, ko odprete aplikacijo ali urejate vnos.</string>
+  <string name="switch_keyboard_on_search_enabled">Opomba: Omogočili ste možnost Aplikacija - Varnost - Dostop z geslom - Preklop tipkovnice - Preklop tipkovnice. To lahko povzroči, da se to okno prikaže, ko iščete vnos v brskalniku.</string>
 </resources>

src/keepass2android-app/Resources/values-tr/strings.xml

@@ -151,6 +151,7 @@
   <string name="hint_keyfile">Anahtar dosyası</string>
   <string name="hint_length">Uzunluk</string>
   <string name="hint_pass">parola</string>
+  <string name="hint_keyfile_path">SSH özel anahtar yolu</string>
   <string name="hint_login_pass">Parola</string>
   <string name="hint_title">Başlık</string>
   <string name="hint_url">URL</string>
@@ -300,6 +301,8 @@
   <string name="NoDalVerification_summary">Etki alanı ve uygulama paketinin eşleşip eşleşmediğini kontrol etmeyi devre dışı bırakır</string>
   <string name="InlineSuggestions_title">Klavye ile entegre et</string>
   <string name="InlineSuggestions_summary">Otomatik doldurma önerilerini klavyede satır içi seçenekler olarak gösterir (giriş yöntemi tarafından destekleniyorsa)</string>
+  <string name="LogAutofillView_title">Günlük otomatik doldurma görünümü</string>
+  <string name="LogAutofillView_summary">Otomatik doldurma görünümü hakkında ayrıntıları hata ayıklama günlüğüne yaz (eğer hata ayıklama günlüğü etkinse). Eğer otomatik doldurma beklendiği gibi çalışmıyorsa bu ayrıntılar geliştiriciye gönderilebilir.</string>
   <string name="requires_android11">Android 11 veya sonraki bir sürümünü gerektirir</string>
   <string name="kp2a_findUrl">Parola bul</string>
   <string name="excludeExpiredEntries">Hızlı aramalara süresi dolmuş kayıtlar katılmasın</string>
@@ -398,6 +401,11 @@
   <string name="ShowSeparateNotifications_summary">Kullanıcı adıyla parolayı panoya kopyalamak ve klavyeyi etkinleştirmek için bildirimleri göster.</string>
   <string name="AccServiceAutoFill_prefs">Otomatik Doldurma Erişilebilirlik Hizmeti</string>
   <string name="AutoFill_prefs">Otomatik Doldurma Hizmeti</string>
+  <string name="AutoFillTotp_prefs_ShowNotification_summary">Bir girişi TOTP ile otomatik doldururken, giriş bildirimini TOTP Kopyala düğmesiyle göster</string>
+  <string name="AutoFillTotp_prefs_ShowNotification_title">Giriş bildirimlerini göster</string>
+  <string name="AutoFillTotp_prefs_CopyTotpToClipboard_title">TOTP \'yi panoya kopyala</string>
+  <string name="AutoFillTotp_prefs_ActivateKeyboard_title">Yerleşik klavyeyi etkinleştir</string>
+  <string name="TotpCopiedToClipboard">TOTP panoya kopyalandı</string>
   <string name="ShowKp2aKeyboardNotification_title">KP2A klavye bildirimi</string>
   <string name="ShowKp2aKeyboardNotification_summary">Tam girişi KP2A klavyesinden erişilebilir yapın (önerilir).</string>
   <string name="OpenKp2aKeyboardAutomatically_title">Klavyeyi değiştir</string>
@@ -414,6 +422,7 @@
   <string name="ShowUnlockedNotification_summary">Veritabanı kilitli değilken devam eden bir bildirim gösterir.</string>
   <string name="IconVisibilityInfo_Android8_text">Android 8, bildirimler için yeni davranışlar getirdi. Keepass2Android\'in bildirimleri için simgeyi gizlemek istiyorsanız, lütfen bunu sistem ayarlarından yapılandırın. Bildirim kategorisinin önemini Minimum olarak ayarlayın.</string>
   <string name="IconVisibilityInfo_Android8_btnSettings">Ayarları aç</string>
+  <string name="PostNotificationsPermissionInfo_text">Keepass2Android bilgi bankanız kilitli değilken size bir sistem uyarısı görüntüler. Bunun çalışması için lütfen izin verin.</string>
   <string name="DontCare">Umrumda değil</string>
   <string name="DocumentAccessRevoked">Keepass2Android artık dosyaya erişemiyor. Dosya ya silindi yada erişim izinleri iptal edildi. Lütfen Veritabanını değiştir seçeneğiyle dosyayı yeniden açın.</string>
   <string name="PreloadDatabaseEnabled_title">Veritabanı dosyasını önceden yükleme</string>
@@ -498,9 +507,15 @@
   <string name="hint_sftp_host">sunucu (ör: 192.168.0.1)</string>
   <string name="hint_sftp_port">bağlantı noktası</string>
   <string name="initial_directory">Başlangıç dizini (isteğe bağlı):</string>
+  <string name="connect_timeout">Bağlantı zaman aşımı saniyesi (isteğe bağlı)</string>
   <string name="enter_sftp_login_title">SFTP oturum açma verilerini girin:</string>
   <string name="sftp_auth_mode">Kimlik doğrulama modu</string>
   <string name="send_public_key">Ortak anahtar gönder...</string>
+  <string name="select_private_keyfile">Özel anahtarı seç...</string>
+  <string name="hint_sftp_key_name">Yeni anahtar adı</string>
+  <string name="hint_sftp_key_content">Yeni anahtar içeriği</string>
+  <string name="private_key_saved">Özel anahtar kaydedildi</string>
+  <string name="private_key_save_failed">Özel anahtar kayıt edilemedi: %1$s</string>
   <string name="enter_ftp_login_title">FTP oturum açma verilerini girin:</string>
   <string name="enter_mega_login_title">MEGA hesap bilgilerinizi girin:</string>
   <string name="select_storage_type">Depolama türünü seçin:</string>

src/keepass2android-app/Resources/values-zh/strings.xml

@@ -720,6 +720,14 @@
   <string name="EntryChannel_desc">选定条目快速进入通知</string>
   <string name="CloseDbAfterFailedAttempts">三次失败的生物识别解锁后关闭数据库。</string>
   <string name="WarnFingerprintInvalidated">警告!生物识别认证可能会被Android系统作废，例如在你的设备设置中添加一个新的指纹后。确保你总是知道如何用你的主密码解锁！</string>
+  <string-array name="ChangeLog_1_12">
+    <item>Upgraded from Xamarin Android to .net 8</item>
+    <item></item>
+    <item>Upgraded to Material 3 user interface</item>
+    <item>Improve autofill to work with Compose apps</item>
+    <item>Fix hostname matching in autofill and search</item>
+    <item>Fix issue with password generator</item>
+  </string-array>
   <string-array name="ChangeLog_1_11">
     <item>添加了用于搜索和概览 TOTP 的浮动按钮（如果存在TOTP条目）</item>
     <item>通过添加超时指示器并突出显示，改进 TOTP 字段的显示效果</item>
@@ -1161,4 +1169,8 @@ Initial public release
   <string name="kp2a_switch_on_sendgodone_summary">按下发送/转到/完成时切换回来</string>
   <string name="qr_scanning_error_no_google_play_services">二维码扫描需要 Google Play 服务。请在您的设备上安装或更新 Google Play 服务。</string>
   <string name="english_ime_settings">键盘设置</string>
+  <string name="autoswitch_enabled_but_not_setup">注意：您已启用应用-设置-密码访问-键盘切换-自动切换键盘，但它似乎配置不正确。</string>
+  <string name="switch_keyboard_for_totp_enabled">注意：您已启用应用 - 密码访问-自动填充服务 - TOTP 条目自动填充。 当您打开一条有TOTP的条目时，这会导致此窗口显示。</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">注意：您已经启用了应用 - 安全性 - 使用 Keepass2Android 中的内置键盘。 当您打开应用或编辑条目时，这会导致此窗口显示。</string>
+  <string name="switch_keyboard_on_search_enabled">注意: 您已经启用了应用-安全性-密码访问-键盘切换-切换键盘。当您从浏览器搜索条目时，这会导致此窗口显示。</string>
 </resources>

src/keepass2android-app/Resources/values/config.xml

@@ -200,7 +200,7 @@
     <item>System</item>
 	</string-array>
 	
-	<string name="AcceptAllServerCertificates_default">WARN</string>
+	<string name="AcceptAllServerCertificates_default">ERROR</string>
 	<string-array name="AcceptAllServerCertificates_values">
 		<item>IGNORE</item>
 		<item>WARN</item>

src/keepass2android-app/Resources/values/strings.xml

@@ -1249,5 +1249,9 @@
   <string name="kp2a_switch_on_sendgodone_summary">Switch back when pressing send/go/done</string>
   <string name="qr_scanning_error_no_google_play_services">QR code scanning requires Google Play Services. Please install or update Google Play Services on your device.</string>
 <string name="english_ime_settings">Android keyboard settings</string>
-    
-    </resources>
+  <string name="autoswitch_enabled_but_not_setup">Note: You have enabled App - Settings - Password access - Keyboard switching - Auto-switch keyboard, but it doesn\'t seem to be configured correctly.</string>
+  <string name="switch_keyboard_for_totp_enabled">Note: You have enabled App - Password access - Autofill-Service - Autofill for TOTP entries. This can cause this window to show when you open an entry with a TOTP.</string>
+  <string name="switch_keyboard_inside_kp2a_enabled">Note: You have enabled App - Security - Use built-in keyboard inside Keepass2Android. This can cause this window to show when you open the app or edit an entry.</string>
+  <string name="switch_keyboard_on_search_enabled">Note: You have enabled App - Security - Password access - Keyboard switching - Switch keyboard. This can cause this window to show when you search for an entry from the browser.</string>
+  
+</resources>

src/keepass2android-app/SwitchImeActivity.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using Android.App;
 using Android.Content;
 using Android.OS;
+using Android.Preferences;
 using Android.Runtime;
 using Android.Util;
 using Android.Views;
@@ -15,8 +16,8 @@ using keepass2android;
 
 namespace keepass2android
 {
-    [Activity(Label = AppNames.AppName, TaskAffinity = "", NoHistory = true)]
-    public class SwitchImeActivity : Activity
+    [Activity(Label = AppNames.AppName, Theme = "@style/Kp2aTheme_BlueActionBar")]
+    public class SwitchImeActivity : AndroidX.AppCompat.App.AppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -24,7 +25,26 @@ namespace keepass2android
             SetContentView(Resource.Layout.switch_ime_activity_layout);
             FindViewById<Button>(Resource.Id.btn_reopen).Click += (sender, args) => TrySwitchKeyboard();
             FindViewById<Button>(Resource.Id.btn_cancel).Click += (sender, args) => Finish();
+            FindViewById<Button>(Resource.Id.btn_open_settings).Click += (sender, args) => AppSettingsActivity.Launch(this);
+
+            var prefs = PreferenceManager.GetDefaultSharedPreferences(LocaleManager.LocalizedAppContext);
+
+            bool useKp2aKeyboardInKp2a = prefs.GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false);
+            bool kp2a_switch_rooted = prefs.GetBoolean("kp2a_switch_rooted", false);
+            bool AutoFillTotp_prefs_ActivateKeyboard = prefs.GetBoolean("AutoFillTotp_prefs_ActivateKeyboard_key", false);
+            bool OpenKp2aKeyboardAutomatically = prefs.GetBoolean(GetString(Resource.String.OpenKp2aKeyboardAutomatically_key), Resources.GetBoolean(Resource.Boolean.OpenKp2aKeyboardAutomatically_default));
+
+            FindViewById(Resource.Id.note_UseKp2aKeyboardInKp2a).Visibility = useKp2aKeyboardInKp2a ? ViewStates.Visible : ViewStates.Gone;
+            FindViewById(Resource.Id.note_kp2a_switch_rooted).Visibility = kp2a_switch_rooted ? ViewStates.Visible : ViewStates.Gone;
+            FindViewById(Resource.Id.note_AutoFillTotp_prefs_ActivateKeyboard).Visibility = AutoFillTotp_prefs_ActivateKeyboard ? ViewStates.Visible : ViewStates.Gone;
+            FindViewById(Resource.Id.note_OpenKp2aKeyboardAutomatically).Visibility = OpenKp2aKeyboardAutomatically ? ViewStates.Visible : ViewStates.Gone;
+
+            bool hasNote = useKp2aKeyboardInKp2a || kp2a_switch_rooted || AutoFillTotp_prefs_ActivateKeyboard || OpenKp2aKeyboardAutomatically;
+            ((LinearLayout)FindViewById(Resource.Id.settings_notes_container)).Visibility = hasNote ? ViewStates.Visible : ViewStates.Gone;
+
         }
+
+
         private string Kp2aInputMethodName
         {
             get { return PackageName + "/keepass2android.softkeyboard.KP2AKeyboard"; }

src/keepass2android-app/SyncUtil.cs

@@ -56,7 +56,7 @@ namespace keepass2android
             OnFinish onFinish = new ActionOnFinish(_activity, (success, message, activity) =>
             {
                 if (!String.IsNullOrEmpty(message))
-                    App.Kp2a.ShowMessage(activity, message,  MessageSeverity.Error);
+                    App.Kp2a.ShowMessage(activity, message,  success ? MessageSeverity.Info : MessageSeverity.Error);
 
                 // Tell the adapter to refresh it's list
                 BaseAdapter adapter = (activity as GroupBaseActivity)?.ListAdapter;

src/keepass2android-app/Utils/Util.cs

@@ -803,13 +803,15 @@ namespace keepass2android
                 var hasUnsecureDisplay = HasUnsecureDisplay(context);
                 if (hasUnsecureDisplay)
                 {
+                    Kp2aLog.Log("Display is not secure");
                     var intent = new Intent(context, typeof(NoSecureDisplayActivity));
                     intent.AddFlags(ActivityFlags.SingleTop | ActivityFlags.ClearTop);
                     context.StartActivityForResult(intent, 9999);
                 }
-
+                Kp2aLog.Log("Setting FLAG_SECURE.");
                 context.Window.SetFlags(WindowManagerFlags.Secure, WindowManagerFlags.Secure);
             }
+            else Kp2aLog.Log("Secure display disabled by user preference.");
         }
 
         public static bool SecureDisplayConfigured(Activity context)

src/keepass2android-app/app/App.cs

@@ -191,8 +191,8 @@ namespace keepass2android
 	        var prefs = PreferenceManager.GetDefaultSharedPreferences(LocaleManager.LocalizedAppContext);
 	        var createBackup = prefs.GetBoolean(LocaleManager.LocalizedAppContext.GetString(Resource.String.CreateBackups_key), true)
                 && !(new LocalFileStorage(this).IsLocalBackup(ioConnectionInfo));
-
-	        MemoryStream backupCopy = new MemoryStream();
+            Kp2aLog.Log("LoadDb: Copying database for backup");
+            MemoryStream backupCopy = new MemoryStream();
 	        if (createBackup)
 	        {
 
@@ -201,6 +201,7 @@ namespace keepass2android
 	            //reset stream if we need to reuse it later:
 	            memoryStream.Seek(0, SeekOrigin.Begin);
 	        }
+            Kp2aLog.Log("LoadDb: Checking open databases");
 
             foreach (Database openDb in _openDatabases)
 	        {
@@ -918,14 +919,16 @@ namespace keepass2android
 		{
 			var prefs = PreferenceManager.GetDefaultSharedPreferences(LocaleManager.LocalizedAppContext);
 
-			ValidationMode validationMode = ValidationMode.Warn;
+			ValidationMode validationMode = ValidationMode.Error;
 
 			string strValMode = prefs.GetString(LocaleManager.LocalizedAppContext.Resources.GetString(Resource.String.AcceptAllServerCertificates_key),
 												 LocaleManager.LocalizedAppContext.Resources.GetString(Resource.String.AcceptAllServerCertificates_default));
 
 			if (strValMode == "IGNORE")
 				validationMode = ValidationMode.Ignore;
-			else if (strValMode == "ERROR")
+            else if (strValMode == "WARN")
+                validationMode = ValidationMode.Warn;
+            else if (strValMode == "ERROR")
 				validationMode = ValidationMode.Error;
 			return validationMode;
 		}
@@ -1242,7 +1245,7 @@ namespace keepass2android
 	    {
 	        var db = TryFindDatabaseForElement(element);
             if (db == null)
-                throw new Exception("Database element not found!");
+                throw new Exception($"Database element {element.Uuid} not found in any of {OpenDatabases.Count()} databases!");
 	        return db;
 	    }
 

src/keepass2android-app/app/AppTask.cs

@@ -15,6 +15,7 @@ using Android.Content.Res;
 using Android.Preferences;
 using Google.Android.Material.Dialog;
 using keepass2android;
+using PluginTOTP;
 
 namespace keepass2android
 {
@@ -638,19 +639,7 @@ namespace keepass2android
 
             if (CopyTotpToClipboard && isTotpEntry)
             {
-                Dictionary<string, string> entryFields = pwEntryOutput.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString());
-                var totpData= totpPluginAdapter.GetTotpData(entryFields, activity, true);
-                if (totpData.IsTotpEntry)
-                {
-                    TOTPProvider prov = new TOTPProvider(totpData);
-                    string totp = prov.GenerateByByte(totpData.TotpSecret);
-                    CopyToClipboardService.CopyValueToClipboardWithTimeout(activity, totp, true);
-
-                    App.Kp2a.ShowMessage(activity, activity.GetString(Resource.String.TotpCopiedToClipboard),
-                         MessageSeverity.Info);
-                }
-
-                
+                DoCopyTotpToClipboard(activity, pwEntryOutput, totpPluginAdapter);
             }
 
             if (CloseAfterCreate)
@@ -661,7 +650,23 @@ namespace keepass2android
                 activity.CloseAfterTaskComplete();	
 			}
 		}
-	}
+
+        private static void DoCopyTotpToClipboard(EntryActivity activity, PwEntryOutput pwEntryOutput,
+            ITotpPluginAdapter? totpPluginAdapter)
+        {
+            Dictionary<string, string> entryFields = pwEntryOutput.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString());
+            var totpData = totpPluginAdapter.GetTotpData(entryFields, activity, true);
+            if (totpData.IsTotpEntry)
+            {
+                TOTPProvider prov = new TOTPProvider(totpData);
+                string totp = prov.GenerateByByte(totpData.TotpSecret);
+                CopyToClipboardService.CopyValueToClipboardWithTimeout(activity, totp, true);
+
+                App.Kp2a.ShowMessage(activity, activity.GetString(Resource.String.TotpCopiedToClipboard),
+                    MessageSeverity.Info);
+            }
+        }
+    }
 
 
 	/// <summary>

src/keepass2android-app/keepass2android-app.csproj

@@ -10,6 +10,7 @@
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants Condition="'$(Flavor)'=='NoNet'">NO_QR_SCANNER;EXCLUDE_JAVAFILESTORAGE;NoNet</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\fontawesome-webfont.ttf" />
@@ -732,6 +733,12 @@
   <ItemGroup>
     <AndroidNativeLibrary Include="..\java\argon2\libs\armeabi-v7a\libargon2.so" Link="armeabi-v7a\libargon2.so" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidNativeLibrary Include="..\java\argon2\libs\x86\libargon2.so" Link="x86\libargon2.so" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidNativeLibrary Include="..\java\argon2\libs\x86_64\libargon2.so" Link="x86_64\libargon2.so" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
     <PackageReference Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.5" />
@@ -744,18 +751,18 @@
     <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.12" />
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
     <PackageReference Include="Xamarin.Google.Guava" Version="33.4.0.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.3.0.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.5.0.4" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.10" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.3.0.1" Condition="'$(Flavor)'!='NoNet'" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.5.0.4" Condition="'$(Flavor)'!='NoNet'" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.10" Condition="'$(Flavor)'!='NoNet'" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBinding\AndroidFileChooserBinding.csproj" />
-    <ProjectReference Include="..\DropboxBinding\DropboxBinding.csproj" />
-    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" />
+    <ProjectReference Include="..\DropboxBinding\DropboxBinding.csproj" Condition="'$(Flavor)'!='NoNet'" />
+    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" Condition="'$(Flavor)'!='NoNet'" />
     <ProjectReference Include="..\Kp2aAutofillParser\Kp2aAutofillParser.csproj" />
     <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj" />
     <ProjectReference Include="..\Kp2aKeyboardBinding\Kp2aKeyboardBinding.csproj" />
-    <ProjectReference Include="..\PCloudBindings\PCloudBindings.csproj" />
+    <ProjectReference Include="..\PCloudBindings\PCloudBindings.csproj" Condition="'$(Flavor)'!='NoNet'" />
     <ProjectReference Include="..\PluginSdkBinding\PluginSdkBinding.csproj" />
     <ProjectReference Include="..\ZlibAndroid\ZlibAndroid.csproj" />
     <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj" />

src/keepass2android-app/services/AutofillBase/AutofillServiceBase.cs

@@ -28,13 +28,11 @@ namespace keepass2android.services.AutofillBase
 {
     public interface IAutofillIntentBuilder
     {
-        PendingIntent GetAuthPendingIntentForResponse(Context context, string query, string queryDomain, string queryPackage,
-            bool isManualRequest, bool autoReturnFromQuery, AutofillServiceBase.DisplayWarning warning);
+        PendingIntent GetAuthPendingIntentForResponse(Context context, string query, string queryDomain, string queryPackage, bool autoReturnFromQuery, AutofillServiceBase.DisplayWarning warning);
 
         PendingIntent GetAuthPendingIntentForWarning(Context context, PwUuid entryUuid, AutofillServiceBase.DisplayWarning warning);
 
-        PendingIntent GetDisablePendingIntentForResponse(Context context, string query, 
-            bool isManualRequest, bool isDisable);
+        PendingIntent GetDisablePendingIntentForResponse(Context context, string query, bool isDisable);
         Intent GetRestartAppIntent(Context context);
 
         int AppIconResource { get; }
@@ -150,7 +148,7 @@ namespace keepass2android.services.AutofillBase
                 var parser = new StructureParser(this, structure);
                 try
                 {
-                    query = parser.ParseForFill(isManual);
+                    query = parser.ParseForFill();
 
                 }
                 catch (Java.Lang.SecurityException e)
@@ -213,16 +211,14 @@ namespace keepass2android.services.AutofillBase
                     {
                         if (query.WebDomain != null)
                             AddQueryDataset(query.WebDomain,
-                                query.WebDomain, query.PackageName,
-                                isManual, autofillIds, responseBuilder, !hasEntryDataset,
+                                query.WebDomain, query.PackageName, autofillIds, responseBuilder, !hasEntryDataset,
                                 query.IncompatiblePackageAndDomain
                                     ? DisplayWarning.FillDomainInUntrustedApp
                                     : DisplayWarning.None,
                                 AutofillHelper.ExtractSpec(inlinePresentationSpecs, entryDatasets.Count));
                         else
                             AddQueryDataset(query.PackageNameWithPseudoSchema,
-                                query.WebDomain, query.PackageName,
-                                isManual, autofillIds, responseBuilder, !hasEntryDataset, DisplayWarning.None,
+                                query.WebDomain, query.PackageName, autofillIds, responseBuilder, !hasEntryDataset, DisplayWarning.None,
                                 AutofillHelper.ExtractSpec(inlinePresentationSpecs, entryDatasets.Count));
                     }
 
@@ -340,9 +336,9 @@ namespace keepass2android.services.AutofillBase
             
         }
 
-        private void AddQueryDataset(string query, string queryDomain, string queryPackage, bool isManual, AutofillId[] autofillIds, FillResponse.Builder responseBuilder, bool autoReturnFromQuery, DisplayWarning warning, InlinePresentationSpec inlinePresentationSpec)
+        private void AddQueryDataset(string query, string queryDomain, string queryPackage, AutofillId[] autofillIds, FillResponse.Builder responseBuilder, bool autoReturnFromQuery, DisplayWarning warning, InlinePresentationSpec inlinePresentationSpec)
         {
-            PendingIntent pendingIntent = IntentBuilder.GetAuthPendingIntentForResponse(this, query, queryDomain, queryPackage, isManual, autoReturnFromQuery, warning);
+            PendingIntent pendingIntent = IntentBuilder.GetAuthPendingIntentForResponse(this, query, queryDomain, queryPackage, autoReturnFromQuery, warning);
             string text = GetString(Resource.String.autofill_sign_in_prompt);
             RemoteViews overlayPresentation = AutofillHelper.NewRemoteViews(base.PackageName,
                 text, AppNames.LauncherIcon);
@@ -396,7 +392,7 @@ namespace keepass2android.services.AutofillBase
             if (isQueryDisabled && !isManual)
                 return;
             bool isForDisable = !isQueryDisabled;
-            var pendingIntent = IntentBuilder.GetDisablePendingIntentForResponse(this, query, isManual, isForDisable);
+            var pendingIntent = IntentBuilder.GetDisablePendingIntentForResponse(this, query, isForDisable);
 
             string text = GetString(isForDisable ? Resource.String.autofill_disable : Resource.String.autofill_enable_for, new Java.Lang.Object[] { GetDisplayNameForQuery(query, this) });
             RemoteViews presentation = AutofillHelper.NewRemoteViews(base.PackageName,

src/keepass2android-app/services/AutofillBase/ChooseForAutofillActivityBase.cs

@@ -27,7 +27,6 @@ namespace keepass2android.services.AutofillBase
         public static string ExtraQueryPackageString => "EXTRA_QUERY_PACKAGE_STRING";
         public static string ExtraQueryDomainString => "EXTRA_QUERY_DOMAIN_STRING";
         public static string ExtraUseLastOpenedEntry => "EXTRA_USE_LAST_OPENED_ENTRY"; //if set to true, no query UI is displayed. Can be used to just show a warning
-        public static string ExtraIsManualRequest => "EXTRA_IS_MANUAL_REQUEST";
         public static string ExtraAutoReturnFromQuery => "EXTRA_AUTO_RETURN_FROM_QUERY";
         public static string ExtraDisplayWarning => "EXTRA_DISPLAY_WARNING";
 
@@ -185,18 +184,18 @@ namespace keepass2android.services.AutofillBase
             ReplyIntent = null;
         }
 
-        protected void OnSuccess(FilledAutofillFieldCollection<ViewNodeInputField> clientFormDataMap, bool isManual)
+        protected void OnSuccess(FilledAutofillFieldCollection<ViewNodeInputField> clientFormDataMap)
         {
             var intent = Intent;
             AssistStructure structure = (AssistStructure)intent.GetParcelableExtra(AutofillManager.ExtraAssistStructure);
-            if (structure == null)
+            if (structure == null || clientFormDataMap == null)
             {
                 SetResult(Result.Canceled);
                 Finish();
                 return;
             }
             StructureParser parser = new StructureParser(this, structure);
-            parser.ParseForFill(isManual);
+            parser.ParseForFill();
             AutofillFieldMetadataCollection autofillFields = parser.AutofillFields;
             var partitionData = AutofillHintsHelper.FilterForPartition(clientFormDataMap, parser.AutofillFields.FocusedAutofillCanonicalHints);
             
@@ -229,7 +228,7 @@ namespace keepass2android.services.AutofillBase
 
         private void ReturnSuccess()
         {
-            OnSuccess(GetDataset(), Intent.GetBooleanExtra(ExtraIsManualRequest, false));
+            OnSuccess(GetDataset());
             Finish();
         }
 

src/keepass2android-app/services/AutofillBase/StructureParser.cs

@@ -72,7 +72,7 @@ namespace keepass2android.services.AutofillBase
             domainSuffixParserCache = new PublicSuffixRuleCache(context);
         }
 
-        public AutofillView<ViewNodeInputField> GetAutofillView(bool isManualRequest)
+        public AutofillView<ViewNodeInputField> GetAutofillView()
         {
             AutofillView<ViewNodeInputField> autofillView = new AutofillView<ViewNodeInputField>();
             
@@ -83,7 +83,7 @@ namespace keepass2android.services.AutofillBase
                 var node = _structure.GetWindowNodeAt(i);
 
                 var view = node.RootViewNode;
-                ParseRecursive(autofillView, view, isManualRequest);
+                ParseRecursive(autofillView, view);
             }
 
             autofillView.PackageId = autofillView.PackageId ?? _structure.ActivityComponent.PackageName;
@@ -93,7 +93,7 @@ namespace keepass2android.services.AutofillBase
         }
 
 
-        void ParseRecursive(AutofillView<ViewNodeInputField> autofillView, AssistStructure.ViewNode viewNode, bool isManualRequest)
+        void ParseRecursive(AutofillView<ViewNodeInputField> autofillView, AssistStructure.ViewNode viewNode)
         {
             String webDomain = viewNode.WebDomain;
             if ((autofillView.PackageId == null) && (!string.IsNullOrWhiteSpace(viewNode.IdPackage)) &&
@@ -129,7 +129,7 @@ namespace keepass2android.services.AutofillBase
             {
                 for (int i = 0; i < childrenSize; i++)
                 {
-                    ParseRecursive(autofillView, viewNode.GetChildAt(i), isManualRequest);
+                    ParseRecursive(autofillView, viewNode.GetChildAt(i));
                 }
             }
         }
@@ -159,11 +159,11 @@ namespace keepass2android.services.AutofillBase
 
         }
 
-        protected override AutofillTargetId Parse(bool forFill, bool isManualRequest, AutofillView<ViewNodeInputField> autofillView)
+        protected override AutofillTargetId Parse(bool forFill, AutofillView<ViewNodeInputField> autofillView)
         {
             if (autofillView == null)
                 Kp2aLog.Log("Received null autofill view!");
-            var result = base.Parse(forFill, isManualRequest, autofillView);
+            var result = base.Parse(forFill, autofillView);
 
             Kp2aLog.Log("Parsing done");
 
@@ -185,14 +185,14 @@ namespace keepass2android.services.AutofillBase
 
         public AutofillTargetId ParseForSave()
         {
-            var autofillView = new AutofillViewFromAssistStructureFinder(_context, _structure).GetAutofillView(true);
-            return Parse(false, true, autofillView);
+            var autofillView = new AutofillViewFromAssistStructureFinder(_context, _structure).GetAutofillView();
+            return Parse(false, autofillView);
         }
 
-        public StructureParserBase<ViewNodeInputField>.AutofillTargetId ParseForFill(bool isManual)
+        public StructureParserBase<ViewNodeInputField>.AutofillTargetId ParseForFill()
         {
-            var autofillView = new AutofillViewFromAssistStructureFinder(_context, _structure).GetAutofillView(isManual);
-            return Parse(true, isManual, autofillView);
+            var autofillView = new AutofillViewFromAssistStructureFinder(_context, _structure).GetAutofillView();
+            return Parse(true, autofillView);
         }
         
 

src/keepass2android-app/services/Kp2aAutofillIntentBuilder.cs

@@ -17,14 +17,12 @@ namespace keepass2android.services
     {
         private static int _pendingIntentRequestCode = 0;
 
-        public PendingIntent GetAuthPendingIntentForResponse(Context context, string query, string queryDomain, string queryPackage,
-            bool isManualRequest, bool autoReturnFromQuery, AutofillServiceBase.DisplayWarning warning)
+        public PendingIntent GetAuthPendingIntentForResponse(Context context, string query, string queryDomain, string queryPackage, bool autoReturnFromQuery, AutofillServiceBase.DisplayWarning warning)
         {
             Intent intent = new Intent(context, typeof(ChooseForAutofillActivity));
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraQueryString, query);
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraQueryDomainString, queryDomain);
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraQueryPackageString, queryPackage);
-            intent.PutExtra(ChooseForAutofillActivityBase.ExtraIsManualRequest, isManualRequest);
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraAutoReturnFromQuery, autoReturnFromQuery);
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraDisplayWarning, (int)warning);
             return PendingIntent.GetActivity(context, _pendingIntentRequestCode++, intent, Util.AddMutabilityFlag(PendingIntentFlags.CancelCurrent, PendingIntentFlags.Mutable));
@@ -40,12 +38,10 @@ namespace keepass2android.services
             return PendingIntent.GetActivity(context, _pendingIntentRequestCode++, intent, Util.AddMutabilityFlag(PendingIntentFlags.CancelCurrent, PendingIntentFlags.Mutable));
         }
 
-        public PendingIntent GetDisablePendingIntentForResponse(Context context, string query,
-            bool isManualRequest, bool isDisable)
+        public PendingIntent GetDisablePendingIntentForResponse(Context context, string query, bool isDisable)
         {
             Intent intent = new Intent(context, typeof(DisableAutofillForQueryActivity));
             intent.PutExtra(ChooseForAutofillActivityBase.ExtraQueryString, query);
-            intent.PutExtra(ChooseForAutofillActivityBase.ExtraIsManualRequest, isManualRequest);
             intent.PutExtra(DisableAutofillForQueryActivity.ExtraIsDisable, isDisable);
 
             return PendingIntent.GetActivity(context, _pendingIntentRequestCode++, intent, Util.AddMutabilityFlag(PendingIntentFlags.CancelCurrent, PendingIntentFlags.Immutable));

src/keepass2android-app/settings/ExportKeyfileActivity.cs

@@ -9,7 +9,7 @@ using KeePassLib.Serialization;
 
 namespace keepass2android
 {
-    [Activity]
+    [Activity(Theme = "@style/Kp2aTheme_ActionBar")]
     public class ExportKeyfileActivity : LockCloseActivity
     {