do not log folder name to fix #2466

New Crowdin updates

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,53 @@
+name: Bug Report
+description: Report a bug.
+title: "[BUG] "
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please check out the [FAQ section](https://github.com/PhilippC/keepass2android/blob/master/docs/Documentation.md#faq) and [search for open issues](https://github.com/PhilippC/keepass2android/issues?q=is%3Aopen+is%3Aissue+label%3Abug) first.
+  - type: checkboxes
+    attributes:
+      label: Checks
+      options:
+        - label: I have read the FAQ section, searched the open issues, and still think this is a new bug.
+          required: true
+  - type: textarea
+    id: bug
+    attributes:
+      label: "Describe the bug you encountered:"
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: "Describe what you expected to happen:"
+  - type: markdown
+    attributes:
+      value: |
+          Please follow these steps to find your app version:
+          1. Click the **⁝** icon in the top right corner
+          2. Select **Settings**
+          3. Click **About**
+          4. Find the "Version" information and provide it below
+  - type: input
+    id: version
+    attributes:
+      label: "What version of Keepass2Android are you using?"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        Please follow these steps to find your Android version:
+        1. Open your device's **Settings** app
+        2. Scroll down and select **About phone** or **About tablet**
+        3. Find the **Android version** section and provide it below
+  - type: input
+    id: os
+    attributes:
+      label: "Which version of Android are you on?"
+    validations:
+      required: true
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,8 @@
+---
+name: Feature Request
+about: Suggest an idea for this project.
+title: '[FEAT] '
+labels: enhancement
+assignees: ''
+
+---

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,16 @@
+---
+name: Question
+about: Ask a question about 'Keepass2Android'.
+title: '[QUESTION] '
+labels: question
+assignees: ''
+
+---
+
+**What version of Keepass2Android are you using?**
+Please follow these steps to find your app version:
+1. Click the **⁝** icon in the top right corner
+2. Select **Settings**
+3. Click **About**
+4. Find the "Version" information and provide it here:
+

.github/workflows/build.yml

@@ -3,109 +3,111 @@ name: Build keepass2android app
 on: [push, pull_request]
 
 jobs:
-  macos:
+  # macos:
+  # Disabled. Does not work, maybe due to nuget version, see https://github.com/PhilippC/keepass2android/actions/runs/4297640426/jobs/7490853348
+  # should work again when the Project solution is converted to sdk style .csproj files.
 
-    runs-on: macos-12
+  #   runs-on: macos-12
 
-    steps:
-    - uses: actions/checkout@v3
+  #   steps:
+  #   - uses: actions/checkout@v3
 
-    - name: Fetch submodules
-      run: git submodule init && git submodule update
+  #   - name: Fetch submodules
+  #     run: git submodule init && git submodule update
 
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+  #   - name: Setup Gradle
+  #     uses: gradle/gradle-build-action@v2
 
-    - name: Cache NuGet packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
+  #   - name: Cache NuGet packages
+  #     uses: actions/cache@v3
+  #     with:
+  #       path: ~/.nuget/packages
+  #       key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
+  #       restore-keys: |
+  #         ${{ runner.os }}-nuget-
 
-    # As per https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#visual-studio-for-mac
-    - name: Switch to Visual Studio 2019
-      if: ${{ false }} # Not needed. We stay with the default 'Visual Studio 2022' of macos-12 runner.
-      run: |
-        mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app"
-        mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
+  #   # As per https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#visual-studio-for-mac
+  #   - name: Switch to Visual Studio 2019
+  #     if: ${{ false }} # Not needed. We stay with the default 'Visual Studio 2022' of macos-12 runner.
+  #     run: |
+  #       mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app"
+  #       mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
 
-    # As of 2022-12-02, keepass2android doesn't build with Xamarin >= 12.1 because there is some issue with SamsungPass. Removing SamsungPass would make the build succeed.
-    - name: Set default Xamarin SDK versions
-      run: |
-        # If using the github runner 'macos-12'
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.3
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.1 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.2 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.3 # Build fails in this case, as of 2022-12-02
-        $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=13.1
+  #   # As of 2022-12-02, keepass2android doesn't build with Xamarin >= 12.1 because there is some issue with SamsungPass. Removing SamsungPass would make the build succeed.
+  #   - name: Set default Xamarin SDK versions
+  #     run: |
+  #       # If using the github runner 'macos-12'
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.3
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.1 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.2 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.3 # Build fails in this case, as of 2022-12-02
+  #       $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=13.1
 
-        # If using the github runner 'macos-11'
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.0
-        #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
+  #       # If using the github runner 'macos-11'
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.0
+  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
 
-        # If using the github runner 'macos-10.15'
-        # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
+  #       # If using the github runner 'macos-10.15'
+  #       # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
 
-    - name: Switch to JDK-11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
+  #   - name: Switch to JDK-11
+  #     uses: actions/setup-java@v3
+  #     with:
+  #       java-version: '11'
+  #       distribution: 'temurin'
 
-    - name: Display java version
-      run: java -version
+  #   - name: Display java version
+  #     run: java -version
 
-    # Some components of Keepass2Android currently target android API 26 which are not available on the runner
-    - name: Download android-26 API
-      run: $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-26"
+  #   # Some components of Keepass2Android currently target android API 26 which are not available on the runner
+  #   - name: Download android-26 API
+  #     run: $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-26"
 
-    - name: Build native dependencies
-      run: make native
+  #   - name: Build native dependencies
+  #     run: make native
 
-    - name: Build java dependencies
-      run: make java
+  #   - name: Build java dependencies
+  #     run: make java
 
-    - name: Install NuGet dependencies (net)
-      run: make nuget Flavor=Net
+  #   - name: Install NuGet dependencies (net)
+  #     run: make nuget Flavor=Net
 
-    - name: Build keepass2android (net)
-      run: |
-        make msbuild Flavor=Net
+  #   - name: Build keepass2android (net)
+  #     run: |
+  #       make msbuild Flavor=Net
 
-    - name: Build APK (net)
-      run: |
-        make apk Flavor=Net
+  #   - name: Build APK (net)
+  #     run: |
+  #       make apk Flavor=Net
 
-    - name: Archive production artifacts (net)
-      uses: actions/upload-artifact@v3
-      with:
-        name: signed APK ('net' built on ${{ github.job }})
-        path: |
-          src/keepass2android/bin/*/*-Signed.apk
+  #   - name: Archive production artifacts (net)
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: signed APK ('net' built on ${{ github.job }})
+  #       path: |
+  #         src/keepass2android/bin/*/*-Signed.apk
 
-    - name: Install NuGet dependencies (nonet)
-      run: make nuget Flavor=NoNet
+  #   - name: Install NuGet dependencies (nonet)
+  #     run: make nuget Flavor=NoNet
 
-    - name: Build keepass2android (nonet)
-      run: |
-        make msbuild Flavor=NoNet
+  #   - name: Build keepass2android (nonet)
+  #     run: |
+  #       make msbuild Flavor=NoNet
 
-    - name: Build APK (nonet)
-      run: |
-        make apk Flavor=NoNet
+  #   - name: Build APK (nonet)
+  #     run: |
+  #       make apk Flavor=NoNet
 
-    - name: Archive production artifacts (nonet)
-      uses: actions/upload-artifact@v3
-      with:
-        name: signed APK ('nonet' built on ${{ github.job }})
-        path: |
-          src/keepass2android/bin/*/*-Signed.apk
+  #   - name: Archive production artifacts (nonet)
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: signed APK ('nonet' built on ${{ github.job }})
+  #       path: |
+  #         src/keepass2android/bin/*/*-Signed.apk
 
-    - name: Perform "make distclean"
-      run: make distclean
+  #   - name: Perform "make distclean"
+  #     run: make distclean
 
   # linux:
   # disabled. 
@@ -330,6 +332,9 @@ jobs:
     - name: Build keepass2android (nonet)
       run: |
         make msbuild Flavor=NoNet
+    - name: Test Autofill
+      working-directory: ./src/Kp2aAutofillParserTest
+      run: dotnet test
 
     - name: Build APK (nonet)
       run: |

Makefile

@@ -314,6 +314,18 @@ clean_KP2AKdbLibrary:
 	cd src/java/KP2AKdbLibrary && $(GRADLEW) clean
 clean_PluginQR:
 	cd src/java/PluginQR && $(GRADLEW) clean
+clean_rm:
+	rm -rf src/*/obj
+	rm -rf src/*/bin
+	rm -rf src/java/*/app/build
+	rm -rf src/java/argon2/obj
+	rm -rf src/java/argon2/libs
+	rm -rf src/packages
+	rm -rf src/java/KP2AKdbLibrary/app/.cxx
+	rm -rf src/java/KP2ASoftkeyboard_AS/app/.cxx
+	rm -rf src/SamsungPass/Xamarin.SamsungPass/SamsungPass/bin
+	rm -rf src/SamsungPass/Xamarin.SamsungPass/SamsungPass/obj
+	
 
 # https://learn.microsoft.com/en-us/nuget/consume-packages/package-restore-troubleshooting#other-potential-conditions
 clean_nuget:

docs/Build.readme.md

@@ -43,7 +43,7 @@ By using the command line, you can build on Windows, macOS or Linux.
     - On Debian, after having added the repo from above, install with `apt install -t <repo_name> mono-devel msbuild`. A value for `<repo_name>` could be `stable-buster` for example, depending on which one you chose. You could also install the `mono-complete` package if you prefer.
 
 - Install Xamarin.Android
-  - Option 1: Use the mono-project [CI builds](https://dev.azure.com/xamarin/public/_build/latest?definitionId=48&branchName=main&stageName=Linux)
+  - ~~Option 1: Use the mono-project [CI builds](https://dev.azure.com/xamarin/public/_build/latest?definitionId=48&branchName=main&stageName=Linux)~~ **NOTE:** KP2A now requires Xamarin.Android v13, which is newer than the current CI build; until a more recent CI build is available, this option is unfortunately no longer viable.
   - Option 2: [Build it from source](https://github.com/xamarin/xamarin-android/blob/master/Documentation/README.md#building-from-source)
 
 - Install NuGet package of your distribution
@@ -64,9 +64,11 @@ This is done on the command line and requires the Android SDK & NDK and Java JDK
 ### On Windows
 - Setup your environment:
   - Set these environment variables for Android's SDK & NDK
-    - `ANDROID_HOME` (for example `set ANDROID_HOME=C:\PATH\TO\android-sdk\`)
-    - `ANDROID_SDK_ROOT` (for example `set ANDROID_SDK_ROOT=C:\PATH\TO\android-sdk\`)
-    - `ANDROID_NDK_ROOT` (for example `set ANDROID_NDK_ROOT=C:\PATH\TO\android-sdk\ndk\version\`)
+    - `ANDROID_HOME` (for example `set ANDROID_HOME=C:\PATH\TO\android-sdk`)
+    - `ANDROID_SDK_ROOT` (for example `set ANDROID_SDK_ROOT=C:\PATH\TO\android-sdk`)
+    - `ANDROID_NDK_ROOT` (for example `set ANDROID_NDK_ROOT=C:\PATH\TO\android-sdk\ndk\version`)
+    
+    **Note:** Care must be taken when setting the above variables to **not** include a trailing backslash in the path. A trailing backslash may cause `make` to fail.
 
     **Note**: If the path to the Android SDK contains spaces, you **must** do one of these:
     - either put the Android SDK into a path without spaces.
@@ -103,6 +105,10 @@ This is done on the command line and requires the Android SDK & NDK and Java JDK
 
  - For building the java parts, it is suggested to keep a short name (e.g. "c:\projects\keepass2android") for the root project directory. Otherwise the Windows path length limit might be hit when building.
  - Before building the java parts, make sure you have set the ANDROID_HOME variable or create a local.properties file inside the directories with a gradlew file. It is recommended to use the same SDK location as that of the Xamarin build.
+ - On some environments, `make` can fail to properly use the detected `MSBUILD` tools. This seems to be due to long pathnames and/or spaces in pathnames. It may be required to explicitly set the `MSBUILD` path using 8.3 "short" path notation:
+ 	- Determine the location of `MSBUILD` (e.g. `C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe`)
+ 	- [Generate the "short" path](https://superuser.com/a/728792) of that location (e.g.: `C:\PROGRA~1\MICROS~2\2022\COMMUN~1\MSBuild\Current\Bin\MSBuild.exe`)
+ 	- When running `make` specify the location of ``MSBUILD` explicitly (e.g.: `make MSBUILD="C:\PROGRA~1\MICROS~2\2022\COMMUN~1\MSBuild\Current\Bin\MSBuild.exe` 
 
 
 ### On Linux/macOS

docs/How-to-create-a-plug-in_.md

@@ -3,13 +3,13 @@
 Creating a plug-in for Keepass2Android or enabling your app to query credentials from Keepass2Android is pretty simple. Please follow the steps below to get started. In case you have any questions, please contact me.
 
 ## Preparations 
-First check out the source code and import the Keepass2AndroidPluginSDK from [https://keepass2android.codeplex.com/SourceControl/latest#src/java/Keepass2AndroidPluginSDK/](https://keepass2android.codeplex.com/SourceControl/latest#src/java/Keepass2AndroidPluginSDK/) into your workspace. You should be able to build this library project.
+First check out the source code and import the Keepass2AndroidPluginSDK from [https://github.com/PhilippC/keepass2android/tree/master/src/java/Keepass2AndroidPluginSDK2](https://github.com/PhilippC/keepass2android/tree/master/src/java/Keepass2AndroidPluginSDK2/) into your workspace. You should be able to build this library project.
 
 Now add a reference to the PluginSDK library from your existing app or add a new plug-in app and then add the reference. 
 
 ## Authorization
 
-Keepass2Android stores very sensitive user data and therefore implements a plug-in authorization scheme based on broadcasts sent between the plug-in and the host app (=Keepass2Android or Keepass2Android Offline). Before your app/plug-in gets any information from KP2A, the user will have to grant your app/plug-in access to KP2A. As not every app/plug-in requires access to all information, you must specify which scopes are required by your app. The implemented scopes can be found in [https://keepass2android.codeplex.com/SourceControl/latest#src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java](https://keepass2android.codeplex.com/SourceControl/latest#src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java).
+Keepass2Android stores very sensitive user data and therefore implements a plug-in authorization scheme based on broadcasts sent between the plug-in and the host app (=Keepass2Android or Keepass2Android Offline). Before your app/plug-in gets any information from KP2A, the user will have to grant your app/plug-in access to KP2A. As not every app/plug-in requires access to all information, you must specify which scopes are required by your app. The implemented scopes can be found in [https://github.com/PhilippC/keepass2android/tree/master/src/java/Keepass2AndroidPluginSDK2/src/keepass2android/pluginsdk/Strings.java](https://github.com/PhilippC/keepass2android/tree/master/src/java/Keepass2AndroidPluginSDK2/src/keepass2android/pluginsdk/Strings.java).
 
 To tell Kp2a that you're a plug-in, you need to add a simple BroadcastReceiver like this:
 
@@ -55,8 +55,8 @@ These strings will be displayed to the user when KP2A asks if access should be g
 
 ## Modifying the entry view
 You can add menu options for the full entry or for individual fields of the entry when displayed to the user. This is done, for example, by the QR plugin ([https://play.google.com/store/apps/details?id=keepass2android.plugin.qr](https://play.google.com/store/apps/details?id=keepass2android.plugin.qr)). 
-In addition, it is even possible to add new fields or modify existing fields. Please see the sample plugin "PluginA" in the KP2A repository for a simple example on how to do this:
-[https://keepass2android.codeplex.com/SourceControl/latest#src/java/PluginA/src/keepass2android/plugina/PluginAActionReceiver.java](https://keepass2android.codeplex.com/SourceControl/latest#src/java/PluginA/src/keepass2android/plugina/PluginAActionReceiver.java)
+In addition, it is even possible to add new fields or modify existing fields. Please see the sample plugin "PluginA" for a simple example on how to do this:
+[https://github.com/PhilippC/keepass2android-sampleplugin/blob/main/src/keepass2android/plugina/PluginAAccessReceiver.java](https://github.com/PhilippC/keepass2android-sampleplugin/blob/main/src/keepass2android/plugina/PluginAAccessReceiver.java)
 
 ## Querying credentials
 KP2A 0.9.4 adds a great opportunity for third party apps: Instead of prompting the user to enter credentials or a passphrase, the app should try to get the data from KP2A if it is installed: If the user grants (or previously granted) access for the app,  KP2A will automatically retrieve the matching entry. User action is only required if the KP2A database is locked (user will usually unlock it with the short QuickUnlock code) or if no matching entry is found (user can then create a new entry or select an existing one. in the latter case KP2A will offer to add entry information so that the entry will be found automatically next time).

docs/Privacy-Policy.md

@@ -18,6 +18,8 @@ Keepass2Android does not collect personal identifiable information. For debuggin
 * **Internet** (Keepass2Android regular only): Required to allow the user to read/store password databases or key files on remote locations, e.g. Dropbox or via WebDav.
 * **Contacts/Accounts** (Keepass2Android regular only): Required by the Google Drive SDK. If you want to access files on Google Drive, you are prompted to select one of the Google Accounts on your phone to use. The permission is required to query the list of Google accounts on the device. Keepass2Android does not access your personal contacts.
 * **Storage**: Required to allow the user to read/store password databases or key files on the device locally.
-* **Fingerprint**: Required if you want to use fingerprint unlock.
+* **Fingerprint/Biometric**: Required if you want to use biometric unlock.
 * **Vibrate**: Required by the built-in keyboard (vibrate on key press)
+* **Camera**: Required for scanning OTP QR Codes
+* **Foreground service**: Required to keep the app alive for QuickUnlock (so you don't need to enter your full master password repeatedly)
 

docs/SFTP-Credentials.md

@@ -0,0 +1,72 @@
+# SFTP Open/Create Database Credentials Documentation
+
+## Basic Settings
+* **Host** -- the hostname or IP address of the SFTP server to connect to
+* **Port** -- the listening TCP port of the SFTP server to connect to (default: 22)
+* **Username** -- the user/account name on the SFTP server that has access to the database
+* **Initial directory** -- The path on the SFTP server that will be used as a starting point when choosing the remote database file
+
+### Authentication Modes
+
+#### Password
+Authenticate using a password
+
+* **Password** -- the password associated with **username** used to log into the SFTP server
+
+#### K2A Private/Public Key
+Authenticate using a private/public key pair that is generated internally by KP2A
+
+* **SEND PUBLIC KEY...** -- Opens a standard Android "Share" screen containing the KP2A public key content. This allows for the public key to be sent via email, SMS, etc. This public key will need to be added to the SFTP server's user's "authorized keys" to allow private/public key authentication.
+
+#### Custom Private Key
+Authenticate using an existing private/public key pair. Use this option instead of *K2A Private/Public Key* if you wish to use a key pair that is already set up for this **username** on the SFTP server.
+
+* **Selected private key** -- a combo-box containing a list of custom private keys that KP2A knows about, and a special `[Add new...]` option.
+##### Add A New Private Key
+* Select `[Add new...]`
+* Enter a name for the new key in **New key name**
+* Enter the private key contents (text) into **New key content**. **TIP:** The easiest way to accomplish this is to open the private key file in a text editor on the device, **Select All**, **Copy** to the clipboard, and paste it into **New key content**.
+* Tap **SAVE PRIVATE KEY** to add the new key to the known list.
+
+##### Use An Existing Private Key
+* To use a private key that has already been imported into KP2A, simply select it from the list of keys.
+
+##### Remove An Existing Key
+* To remove a private that has been imported into KP2A, select it from the list and tap **DELETE PRIVATE KEY**.
+
+A **key passphrase** can be supplied (if the key pair requires it)
+
+## Advanced Settings
+* **Connection timeout seconds** -- the number of seconds to wait for a connection to the server before giving up and considering the server as unavailable/unreachable
+
+### Key Algorithm Manipulation
+**NOTE: It is very rare that these fields need to be (or should be) specified. Use at your own risk!**
+
+* **Key Exchange (KEX) Algorithm(s)** -- Explicitly set or modify the ordered list of Key Exchange algorithms that the SSH/SFTP client library will try to use
+* **Server Host Key Algorithm(s)** -- Explicitly set or modify the ordered list of Server Host Key algorithms that the SSH/SFTP client library will try to use
+
+#### How It Works
+The SSH/SFTP client has a pre-defined ordered list of algorithm names that it will use to negotiate with the server to handle key exchange. In rare cases there are compatibility issues where Android OS has not properly implemented full support for algorithms listed. This can result in a connection failure, even if there is a suitable algorithm available (of lesser priority in the list).
+
+The fields listed above allow these lists to be manipulated in the following ways to overcome/workaround such problems. The value is a comma-separated list of "algorithm spec" entries. Specs can be one of:
+
+* Direct replacement of values -- Ex: `primary_alg,secondary_alg`
+* Prepend to values -- Ex: `+try_first_alg`
+* Append to values -- Ex: `try_last_alg+`
+* Remove a specific value -- Ex: `-bad_alg`
+* Remove values matching prefix -- Ex: `-bad_starting_with*`
+* Remove values matching suffix -- Ex: `-*bad_ending_with`
+* Remove values matching substring -- Ex: `-*bad_middle*`
+* Remove values matching prefix and suffix -- Ex: `-alg_begin*end`
+
+For example, assume the system's KEX algorithm list is:
+`ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256`
+
+These are various outcomes (user KEX field -> result):
+
+* Prefix removal: `-ec*` --> `diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256`
+* Suffix removal, appending: `-*256,+first_alg,almost_last_alg+,last_alg+` --> `first_alg,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,almost_last_alg,last_alg`
+* Direct replacement: `first_alg,middle_alg,last_alg` --> `first_alg,middle_alg,last_alg`
+
+## Selecting A Database
+Once all applicable fields have been entered and/or options selected, tapping **OK** will attempt to connect to the SFTP server. First time connections may pop up a dialog window asking to accept the host's authenticity (tap **yes** if the host is trusted), as well as potentially creating a new `known_hosts` file (tap **yes** to do so). If the connection is successful, a remote file browser screen will open. Navigate and select the Keepass database to open.

src/KeePass.sln

@@ -25,6 +25,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCloudBindings", "PCloudBin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android-app", "keepass2android\keepass2android-app.csproj", "{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParser", "Kp2aAutofillParser\Kp2aAutofillParser.csproj", "{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aAutofillParserTest", "Kp2aAutofillParserTest\Kp2aAutofillParserTest.csproj", "{3D1560FF-86BB-4CB4-8367-80BA13B81C38}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -283,6 +287,54 @@ Global
 		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Win32.Build.0 = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|x64.Build.0 = Debug|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Win32.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Win32.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|x64.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|x64.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Win32.Build.0 = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Win32.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|x64.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/KeePassLib2Android/Kp2aLog.cs

@@ -58,12 +58,12 @@ namespace keepass2android
 
 		}
 
-		private static string LogFilename
+		public static string LogFilename
 		{
 			get { return Application.Context.FilesDir.CanonicalPath +"/keepass2android.log"; }
 		}
 
-		private static bool LogToFile
+		public static bool LogToFile
 		{
 			get
 			{

src/Kp2aAutofillParser/AutofillParser.cs

@@ -0,0 +1,987 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Newtonsoft.Json;
+using Formatting = System.Xml.Formatting;
+
+namespace Kp2aAutofillParser
+{
+    public class W3cHints
+    {
+
+        // Supported W3C autofill tokens (https://html.spec.whatwg.org/multipage/forms.html#autofill)
+        public const string HONORIFIC_PREFIX = "honorific-prefix";
+        public const string NAME = "name";
+        public const string GIVEN_NAME = "given-name";
+        public const string ADDITIONAL_NAME = "additional-name";
+        public const string FAMILY_NAME = "family-name";
+        public const string HONORIFIC_SUFFIX = "honorific-suffix";
+        public const string USERNAME = "username";
+        public const string NEW_PASSWORD = "new-password";
+        public const string CURRENT_PASSWORD = "current-password";
+        public const string ORGANIZATION_TITLE = "organization-title";
+        public const string ORGANIZATION = "organization";
+        public const string STREET_ADDRESS = "street-address";
+        public const string ADDRESS_LINE1 = "address-line1";
+        public const string ADDRESS_LINE2 = "address-line2";
+        public const string ADDRESS_LINE3 = "address-line3";
+        public const string ADDRESS_LEVEL4 = "address-level4";
+        public const string ADDRESS_LEVEL3 = "address-level3";
+        public const string ADDRESS_LEVEL2 = "address-level2";
+        public const string ADDRESS_LEVEL1 = "address-level1";
+        public const string COUNTRY = "country";
+        public const string COUNTRY_NAME = "country-name";
+        public const string POSTAL_CODE = "postal-code";
+        public const string CC_NAME = "cc-name";
+        public const string CC_GIVEN_NAME = "cc-given-name";
+        public const string CC_ADDITIONAL_NAME = "cc-additional-name";
+        public const string CC_FAMILY_NAME = "cc-family-name";
+        public const string CC_NUMBER = "cc-number";
+        public const string CC_EXPIRATION = "cc-exp";
+        public const string CC_EXPIRATION_MONTH = "cc-exp-month";
+        public const string CC_EXPIRATION_YEAR = "cc-exp-year";
+        public const string CC_CSC = "cc-csc";
+        public const string CC_TYPE = "cc-type";
+        public const string TRANSACTION_CURRENCY = "transaction-currency";
+        public const string TRANSACTION_AMOUNT = "transaction-amount";
+        public const string LANGUAGE = "language";
+        public const string BDAY = "bday";
+        public const string BDAY_DAY = "bday-day";
+        public const string BDAY_MONTH = "bday-month";
+        public const string BDAY_YEAR = "bday-year";
+        public const string SEX = "sex";
+        public const string URL = "url";
+        public const string PHOTO = "photo";
+        // Optional W3C prefixes
+        public const string PREFIX_SECTION = "section-";
+        public const string SHIPPING = "shipping";
+        public const string BILLING = "billing";
+        // W3C prefixes below...
+        public const string PREFIX_HOME = "home";
+        public const string PREFIX_WORK = "work";
+        public const string PREFIX_FAX = "fax";
+        public const string PREFIX_PAGER = "pager";
+        // ... require those suffix
+        public const string TEL = "tel";
+        public const string TEL_COUNTRY_CODE = "tel-country-code";
+        public const string TEL_NATIONAL = "tel-national";
+        public const string TEL_AREA_CODE = "tel-area-code";
+        public const string TEL_LOCAL = "tel-local";
+        public const string TEL_LOCAL_PREFIX = "tel-local-prefix";
+        public const string TEL_LOCAL_SUFFIX = "tel-local-suffix";
+        public const string TEL_EXTENSION = "tel_extension";
+        public const string EMAIL = "email";
+        public const string IMPP = "impp";
+
+        private W3cHints()
+        {
+        }
+
+
+
+        public static bool isW3cSectionPrefix(string hint)
+        {
+            return hint.ToLower().StartsWith(W3cHints.PREFIX_SECTION);
+        }
+
+        public static bool isW3cAddressType(string hint)
+        {
+            switch (hint.ToLower())
+            {
+                case W3cHints.SHIPPING:
+                case W3cHints.BILLING:
+                    return true;
+            }
+            return false;
+        }
+
+        public static bool isW3cTypePrefix(string hint)
+        {
+            switch (hint.ToLower())
+            {
+                case W3cHints.PREFIX_WORK:
+                case W3cHints.PREFIX_FAX:
+                case W3cHints.PREFIX_HOME:
+                case W3cHints.PREFIX_PAGER:
+                    return true;
+            }
+            return false;
+        }
+
+        public static bool isW3cTypeHint(string hint)
+        {
+            switch (hint.ToLower())
+            {
+                case W3cHints.TEL:
+                case W3cHints.TEL_COUNTRY_CODE:
+                case W3cHints.TEL_NATIONAL:
+                case W3cHints.TEL_AREA_CODE:
+                case W3cHints.TEL_LOCAL:
+                case W3cHints.TEL_LOCAL_PREFIX:
+                case W3cHints.TEL_LOCAL_SUFFIX:
+                case W3cHints.TEL_EXTENSION:
+                case W3cHints.EMAIL:
+                case W3cHints.IMPP:
+                    return true;
+            }
+            return false;
+        }
+    }
+    /// <summary>
+    /// FilledAutofillFieldCollection is the model that holds all of the data on a client app's page,
+    /// plus the dataset name associated with it.
+    /// </summary>
+    public class FilledAutofillFieldCollection<FieldT> where FieldT:InputField
+    {
+        public Dictionary<string, FilledAutofillField> HintMap { get; }
+        public string DatasetName { get; set; }
+
+        public FilledAutofillFieldCollection(Dictionary<string, FilledAutofillField> hintMap, string datasetName = "")
+        {
+            //recreate hint map making sure we compare case insensitive
+            HintMap = BuildHintMap();
+            foreach (var p in hintMap)
+                HintMap.Add(p.Key, p.Value);
+            DatasetName = datasetName;
+        }
+
+        public FilledAutofillFieldCollection() : this(BuildHintMap())
+        { }
+
+        private static Dictionary<string, FilledAutofillField> BuildHintMap()
+        {
+            return new Dictionary<string, FilledAutofillField>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Adds a filledAutofillField to the collection, indexed by all of its hints.
+        /// </summary>
+        /// <returns>The add.</returns>
+        /// <param name="filledAutofillField">Filled autofill field.</param>
+        public void Add(FilledAutofillField filledAutofillField)
+        {
+            foreach (string hint in filledAutofillField.AutofillHints)
+            {
+                if (AutofillHintsHelper.IsSupportedHint(hint))
+                {
+                    HintMap.TryAdd(hint, filledAutofillField);
+                }
+            }
+
+        }
+
+
+        
+
+        /// <summary>
+        /// Takes in a list of autofill hints (`autofillHints`), usually associated with a View or set of
+        /// Views. Returns whether any of the filled fields on the page have at least 1 of these
+        /// `autofillHint`s.
+        /// </summary>
+        /// <returns><c>true</c>, if with hints was helpsed, <c>false</c> otherwise.</returns>
+        /// <param name="autofillHints">Autofill hints.</param>
+        public bool HelpsWithHints(List<string> autofillHints)
+        {
+            for (int i = 0; i < autofillHints.Count; i++)
+            {
+                var autofillHint = autofillHints[i];
+                if (HintMap.ContainsKey(autofillHint) && !HintMap[autofillHint].IsNull())
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+    public class AutofillHintsHelper
+    {
+        public const string AutofillHint2faAppOtp = "2faAppOTPCode";
+        public const string AutofillHintBirthDateDay = "birthDateDay";
+        public const string AutofillHintBirthDateFull = "birthDateFull";
+        public const string AutofillHintBirthDateMonth = "birthDateMonth";
+        public const string AutofillHintBirthDateYear = "birthDateYear";
+        public const string AutofillHintCreditCardExpirationDate = "creditCardExpirationDate";
+        public const string AutofillHintCreditCardExpirationDay = "creditCardExpirationDay";
+        public const string AutofillHintCreditCardExpirationMonth = "creditCardExpirationMonth";
+        public const string AutofillHintCreditCardExpirationYear = "creditCardExpirationYear";
+        public const string AutofillHintCreditCardNumber = "creditCardNumber";
+        public const string AutofillHintCreditCardSecurityCode = "creditCardSecurityCode";
+        public const string AutofillHintEmailAddress = "emailAddress";
+        public const string AutofillHintEmailOtp = "emailOTPCode";
+        public const string AutofillHintGender = "gender";
+        public const string AutofillHintName = "name";
+        public const string AutofillHintNewPassword = "newPassword";
+        public const string AutofillHintNewUsername = "newUsername";
+        public const string AutofillHintNotApplicable = "notApplicable";
+        public const string AutofillHintPassword = "password";
+        public const string AutofillHintPersonName = "personName";
+        public const string AutofillHintPersonNameFAMILY = "personFamilyName";
+        public const string AutofillHintPersonNameGIVEN = "personGivenName";
+        public const string AutofillHintPersonNameMIDDLE = "personMiddleName";
+        public const string AutofillHintPersonNameMIDDLE_INITIAL = "personMiddleInitial";
+        public const string AutofillHintPersonNamePREFIX = "personNamePrefix";
+        public const string AutofillHintPersonNameSUFFIX = "personNameSuffix";
+        public const string AutofillHintPhone = "phone";
+        public const string AutofillHintPhoneContryCode = "phoneCountryCode";
+        public const string AutofillHintPostalAddressAPT_NUMBER = "aptNumber";
+        public const string AutofillHintPostalAddressCOUNTRY = "addressCountry";
+        public const string AutofillHintPostalAddressDEPENDENT_LOCALITY = "dependentLocality";
+        public const string AutofillHintPostalAddressEXTENDED_ADDRESS = "extendedAddress";
+        public const string AutofillHintPostalAddressEXTENDED_POSTAL_CODE = "extendedPostalCode";
+        public const string AutofillHintPostalAddressLOCALITY = "addressLocality";
+        public const string AutofillHintPostalAddressREGION = "addressRegion";
+        public const string AutofillHintPostalAddressSTREET_ADDRESS = "streetAddress";
+        public const string AutofillHintPostalCode = "postalCode";
+        public const string AutofillHintPromoCode = "promoCode";
+        public const string AutofillHintSMS_OTP = "smsOTPCode";
+        public const string AutofillHintUPI_VPA = "upiVirtualPaymentAddress";
+        public const string AutofillHintUsername = "username";
+        public const string AutofillHintWifiPassword = "wifiPassword";
+        public const string AutofillHintPhoneNational = "phoneNational";
+        public const string AutofillHintPhoneNumber = "phoneNumber";
+        public const string AutofillHintPhoneNumberDevice = "phoneNumberDevice";
+        public const string AutofillHintPostalAddress = "postalAddress";
+
+        private static readonly HashSet<string> _allSupportedHints = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            AutofillHintCreditCardExpirationDate,
+            AutofillHintCreditCardExpirationDay,
+            AutofillHintCreditCardExpirationMonth,
+            AutofillHintCreditCardExpirationYear,
+            AutofillHintCreditCardNumber,
+            AutofillHintCreditCardSecurityCode,
+            AutofillHintEmailAddress,
+            AutofillHintPhone,
+            AutofillHintName,
+            AutofillHintPassword,
+            AutofillHintPostalAddress,
+            AutofillHintPostalCode,
+            AutofillHintUsername,
+            W3cHints.HONORIFIC_PREFIX,
+            W3cHints.NAME,
+            W3cHints.GIVEN_NAME,
+            W3cHints.ADDITIONAL_NAME,
+            W3cHints.FAMILY_NAME,
+            W3cHints.HONORIFIC_SUFFIX,
+            W3cHints.USERNAME,
+            W3cHints.NEW_PASSWORD,
+            W3cHints.CURRENT_PASSWORD,
+            W3cHints.ORGANIZATION_TITLE,
+            W3cHints.ORGANIZATION,
+            W3cHints.STREET_ADDRESS,
+            W3cHints.ADDRESS_LINE1,
+            W3cHints.ADDRESS_LINE2,
+            W3cHints.ADDRESS_LINE3,
+            W3cHints.ADDRESS_LEVEL4,
+            W3cHints.ADDRESS_LEVEL3,
+            W3cHints.ADDRESS_LEVEL2,
+            W3cHints.ADDRESS_LEVEL1,
+            W3cHints.COUNTRY,
+            W3cHints.COUNTRY_NAME,
+            W3cHints.POSTAL_CODE,
+            W3cHints.CC_NAME,
+            W3cHints.CC_GIVEN_NAME,
+            W3cHints.CC_ADDITIONAL_NAME,
+            W3cHints.CC_FAMILY_NAME,
+            W3cHints.CC_NUMBER,
+            W3cHints.CC_EXPIRATION,
+            W3cHints.CC_EXPIRATION_MONTH,
+            W3cHints.CC_EXPIRATION_YEAR,
+            W3cHints.CC_CSC,
+            W3cHints.CC_TYPE,
+            W3cHints.TRANSACTION_CURRENCY,
+            W3cHints.TRANSACTION_AMOUNT,
+            W3cHints.LANGUAGE,
+            W3cHints.BDAY,
+            W3cHints.BDAY_DAY,
+            W3cHints.BDAY_MONTH,
+            W3cHints.BDAY_YEAR,
+            W3cHints.SEX,
+            W3cHints.URL,
+            W3cHints.PHOTO,
+            W3cHints.TEL,
+            W3cHints.TEL_COUNTRY_CODE,
+            W3cHints.TEL_NATIONAL,
+            W3cHints.TEL_AREA_CODE,
+            W3cHints.TEL_LOCAL,
+            W3cHints.TEL_LOCAL_PREFIX,
+            W3cHints.TEL_LOCAL_SUFFIX,
+            W3cHints.TEL_EXTENSION,
+            W3cHints.EMAIL,
+            W3cHints.IMPP,
+        };
+
+        private static readonly List<HashSet<string>> partitionsOfCanonicalHints = new List<HashSet<string>>()
+        {
+
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+            AutofillHintEmailAddress,
+            AutofillHintPhone,
+            AutofillHintName,
+            AutofillHintPassword,
+            AutofillHintUsername,
+            W3cHints.HONORIFIC_PREFIX,
+            W3cHints.EMAIL,
+            W3cHints.NAME,
+            W3cHints.GIVEN_NAME,
+            W3cHints.ADDITIONAL_NAME,
+            W3cHints.FAMILY_NAME,
+            W3cHints.HONORIFIC_SUFFIX,
+            W3cHints.ORGANIZATION_TITLE,
+            W3cHints.ORGANIZATION,
+            W3cHints.LANGUAGE,
+            W3cHints.BDAY,
+            W3cHints.BDAY_DAY,
+            W3cHints.BDAY_MONTH,
+            W3cHints.BDAY_YEAR,
+            W3cHints.SEX,
+            W3cHints.URL,
+            W3cHints.PHOTO,
+            W3cHints.TEL,
+            W3cHints.TEL_COUNTRY_CODE,
+            W3cHints.TEL_NATIONAL,
+            W3cHints.TEL_AREA_CODE,
+            W3cHints.TEL_LOCAL,
+            W3cHints.TEL_LOCAL_PREFIX,
+            W3cHints.TEL_LOCAL_SUFFIX,
+            W3cHints.TEL_EXTENSION,
+            W3cHints.IMPP,
+            },
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                AutofillHintPostalAddress,
+                AutofillHintPostalCode,
+
+                W3cHints.STREET_ADDRESS,
+                W3cHints.ADDRESS_LINE1,
+                W3cHints.ADDRESS_LINE2,
+                W3cHints.ADDRESS_LINE3,
+                W3cHints.ADDRESS_LEVEL4,
+                W3cHints.ADDRESS_LEVEL3,
+                W3cHints.ADDRESS_LEVEL2,
+                W3cHints.ADDRESS_LEVEL1,
+                W3cHints.COUNTRY,
+                W3cHints.COUNTRY_NAME
+            },
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                AutofillHintCreditCardExpirationDate,
+                AutofillHintCreditCardExpirationDay,
+                AutofillHintCreditCardExpirationMonth,
+                AutofillHintCreditCardExpirationYear,
+                AutofillHintCreditCardNumber,
+                AutofillHintCreditCardSecurityCode,
+
+                W3cHints.CC_NAME,
+                W3cHints.CC_GIVEN_NAME,
+                W3cHints.CC_ADDITIONAL_NAME,
+                W3cHints.CC_FAMILY_NAME,
+                W3cHints.CC_TYPE,
+                W3cHints.TRANSACTION_CURRENCY,
+                W3cHints.TRANSACTION_AMOUNT,
+            },
+
+                      };
+
+        private static readonly Dictionary<string, string> hintToCanonicalReplacement = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            {W3cHints.EMAIL, AutofillHintEmailAddress},
+            {W3cHints.USERNAME, AutofillHintUsername},
+            {W3cHints.CURRENT_PASSWORD, AutofillHintPassword},
+            {W3cHints.NEW_PASSWORD, AutofillHintPassword},
+            {W3cHints.CC_EXPIRATION_MONTH, AutofillHintCreditCardExpirationMonth },
+            {W3cHints.CC_EXPIRATION_YEAR, AutofillHintCreditCardExpirationYear },
+            {W3cHints.CC_EXPIRATION, AutofillHintCreditCardExpirationDate },
+            {W3cHints.CC_NUMBER, AutofillHintCreditCardNumber },
+            {W3cHints.CC_CSC, AutofillHintCreditCardSecurityCode },
+            {W3cHints.POSTAL_CODE, AutofillHintPostalCode },
+
+
+        };
+
+        public static bool IsSupportedHint(string hint)
+        {
+            return _allSupportedHints.Contains(hint);
+        }
+
+
+        public static string[] FilterForSupportedHints(string[] hints)
+        {
+            if (hints == null)
+                return Array.Empty<string>();
+            var filteredHints = new string[hints.Length];
+            int i = 0;
+            foreach (var hint in hints)
+            {
+                if (IsSupportedHint(hint))
+                {
+                    filteredHints[i++] = hint;
+                }
+                
+            }
+            var finalFilteredHints = new string[i];
+            Array.Copy(filteredHints, 0, finalFilteredHints, 0, i);
+            return finalFilteredHints;
+        }
+
+
+
+        /// <summary>
+        /// transforms hints by replacing some W3cHints by their Android counterparts and transforming everything to lowercase
+        /// </summary>
+        public static List<string> ConvertToCanonicalLowerCaseHints(string[] supportedHints)
+        {
+            List<string> result = new List<string>();
+            foreach (string hint in supportedHints)
+            {
+                var canonicalHint = ToCanonicalHint(hint);
+                result.Add(canonicalHint.ToLower());
+            }
+            return result;
+
+        }
+
+        public static string ToCanonicalHint(string hint)
+        {
+            string canonicalHint;
+            if (!hintToCanonicalReplacement.TryGetValue(hint, out canonicalHint))
+                canonicalHint = hint;
+            return canonicalHint;
+        }
+
+        public static int GetPartitionIndex(string hint)
+        {
+            for (int i = 0; i < partitionsOfCanonicalHints.Count; i++)
+            {
+                if (partitionsOfCanonicalHints[i].Contains(hint))
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        public static FilledAutofillFieldCollection<FieldT> FilterForPartition<FieldT>(FilledAutofillFieldCollection<FieldT> autofillFields, int partitionIndex) where FieldT: InputField
+        {
+            FilledAutofillFieldCollection<FieldT> filteredCollection =
+                new FilledAutofillFieldCollection<FieldT> { DatasetName = autofillFields.DatasetName };
+
+            if (partitionIndex == -1)
+                return filteredCollection;
+
+            foreach (var field in autofillFields.HintMap.Values.Distinct())
+            {
+                foreach (var hint in field.AutofillHints)
+                {
+                    if (GetPartitionIndex(hint) == partitionIndex)
+                    {
+                        filteredCollection.Add(field);
+                        break;
+                    }
+                }
+            }
+
+            return filteredCollection;
+        }
+
+        public static FilledAutofillFieldCollection<FieldT> FilterForPartition<FieldT>(FilledAutofillFieldCollection<FieldT> filledAutofillFieldCollection, List<string> autofillFieldsFocusedAutofillCanonicalHints) where FieldT: InputField
+        {
+
+            //only apply partition data if we have FocusedAutofillCanonicalHints. This may be empty on buggy Firefox.
+            if (autofillFieldsFocusedAutofillCanonicalHints.Any())
+            {
+                int partitionIndex = AutofillHintsHelper.GetPartitionIndex(autofillFieldsFocusedAutofillCanonicalHints.FirstOrDefault());
+                return AutofillHintsHelper.FilterForPartition(filledAutofillFieldCollection, partitionIndex);
+            }
+
+            return filledAutofillFieldCollection;
+        }
+    }
+    /// <summary>
+    /// This enum represents the Android.Text.InputTypes values. For testability, this is duplicated here.
+    /// </summary>
+    public enum InputTypes
+    {
+        ClassDatetime = 4,
+        ClassNumber = 2,
+        ClassPhone = 3,
+        ClassText = 1,
+        DatetimeVariationDate = 16,
+        DatetimeVariationNormal = 0,
+        DatetimeVariationTime = 32,
+        MaskClass = 15,
+        MaskFlags = 16773120,
+        MaskVariation = 4080,
+        Null = 0,
+        NumberFlagDecimal = 8192,
+        NumberFlagSigned = 4096,
+        NumberVariationNormal = 0,
+        NumberVariationPassword = 16,
+        TextFlagAutoComplete = 65536,
+        TextFlagAutoCorrect = 32768,
+        TextFlagCapCharacters = 4096,
+        TextFlagCapSentences = 16384,
+        TextFlagCapWords = 8192,
+        TextFlagEnableTextConversionSuggestions = 1048576,
+        TextFlagImeMultiLine = 262144,
+        TextFlagMultiLine = 131072,
+        TextFlagNoSuggestions = 524288,
+        TextVariationEmailAddress = 32,
+        TextVariationEmailSubject = 48,
+        TextVariationFilter = 176,
+        TextVariationLongMessage = 80,
+        TextVariationNormal = 0,
+        TextVariationPassword = 128,
+        TextVariationPersonName = 96,
+        TextVariationPhonetic = 192,
+        TextVariationPostalAddress = 112,
+        TextVariationShortMessage = 64,
+        TextVariationUri = 16,
+        TextVariationVisiblePassword = 144,
+        TextVariationWebEditText = 160,
+        TextVariationWebEmailAddress = 208,
+        TextVariationWebPassword = 224
+    }
+
+    public interface IKp2aDigitalAssetLinksDataSource
+    {
+        bool IsTrustedApp(string packageName);
+        bool IsTrustedLink(string domain, string targetPackage);
+        bool IsEnabled();
+
+    }
+
+    class TimeUtil
+    {
+        private static DateTime? m_dtUnixRoot = null;
+        public static DateTime ConvertUnixTime(double dtUnix)
+        {
+            try
+            {
+                if (!m_dtUnixRoot.HasValue)
+                    m_dtUnixRoot = (new DateTime(1970, 1, 1, 0, 0, 0, 0,
+                        DateTimeKind.Utc)).ToLocalTime();
+
+                return m_dtUnixRoot.Value.AddSeconds(dtUnix);
+            }
+            catch (Exception) { Debug.Assert(false); }
+
+            return DateTime.UtcNow;
+        }
+    }
+
+    public class FilledAutofillField
+    {
+        private string[] _autofillHints;
+        public string TextValue { get; set; }
+        public long? DateValue { get; set; }
+        public bool? ToggleValue { get; set; }
+
+        public string ValueToString()
+        {
+            if (DateValue != null)
+            {
+                return TimeUtil.ConvertUnixTime((long)DateValue / 1000.0).ToLongDateString();
+            }
+            if (ToggleValue != null)
+                return ToggleValue.ToString();
+            return TextValue;
+        }
+
+        /// <summary>
+        /// returns the autofill hints for the filled field. These are always lowercased for simpler string comparison.
+        /// </summary>
+	    public string[] AutofillHints
+        {
+            get
+            {
+                return _autofillHints;
+            }
+            set
+            {
+                _autofillHints = value;
+                for (int i = 0; i < _autofillHints.Length; i++)
+                    _autofillHints[i] = _autofillHints[i].ToLower();
+            }
+        }
+
+
+        public FilledAutofillField()
+        { }
+
+        public FilledAutofillField(InputField inputField) 
+            : this(inputField, inputField.AutofillHints)
+        {
+
+        }
+
+        public FilledAutofillField(InputField inputField, string[] hints)
+        {
+
+            string[] rawHints = AutofillHintsHelper.FilterForSupportedHints(hints);
+            List<string> hintList = new List<string>();
+
+            string nextHint = null;
+            for (int i = 0; i < rawHints.Length; i++)
+            {
+                string hint = rawHints[i];
+                if (i < rawHints.Length - 1)
+                {
+                    nextHint = rawHints[i + 1];
+                }
+                // First convert the compound W3C autofill hints
+                if (W3cHints.isW3cSectionPrefix(hint) && i < rawHints.Length - 1)
+                {
+                    hint = rawHints[++i];
+                    
+                    if (i < rawHints.Length - 1)
+                    {
+                        nextHint = rawHints[i + 1];
+                    }
+                }
+                if (W3cHints.isW3cTypePrefix(hint) && nextHint != null && W3cHints.isW3cTypeHint(nextHint))
+                {
+                    hint = nextHint;
+                    i++;
+                    
+                }
+                if (W3cHints.isW3cAddressType(hint) && nextHint != null)
+                {
+                    hint = nextHint;
+                    i++;
+                    
+                }
+
+                // Then check if the "actual" hint is supported.
+                if (AutofillHintsHelper.IsSupportedHint(hint))
+                {
+                    hintList.Add(hint);
+                }
+                else
+                {
+                    
+                }
+            }
+            AutofillHints = AutofillHintsHelper.ConvertToCanonicalLowerCaseHints(hintList.ToArray()).ToArray();
+            inputField.FillFilledAutofillValue(this);
+
+
+        }
+
+        public bool IsNull()
+        {
+            return TextValue == null && DateValue == null && ToggleValue == null;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            if (obj == null || GetType() != obj.GetType()) return false;
+
+            FilledAutofillField that = (FilledAutofillField)obj;
+
+            if (!TextValue?.Equals(that.TextValue) ?? that.TextValue != null)
+                return false;
+            if (DateValue != null ? !DateValue.Equals(that.DateValue) : that.DateValue != null)
+                return false;
+            return ToggleValue != null ? ToggleValue.Equals(that.ToggleValue) : that.ToggleValue == null;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var result = TextValue != null ? TextValue.GetHashCode() : 0;
+                result = 31 * result + (DateValue != null ? DateValue.GetHashCode() : 0);
+                result = 31 * result + (ToggleValue != null ? ToggleValue.GetHashCode() : 0);
+                return result;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Base class for everything that is (or could be) an input field which might (or might not) be autofilled.
+    /// For testability, this is independent from Android classes like ViewNode
+    /// </summary>
+    public abstract class InputField
+    {
+        public string? IdEntry { get; set; }
+        public string? Hint { get; set; }
+        public string ClassName { get; set; }
+        public string[] AutofillHints { get; set; }
+        public bool IsFocused { get; set; }
+
+        public InputTypes InputType { get; set; }
+
+        public string HtmlInfoTag { get; set; }
+        public string HtmlInfoTypeAttribute { get; set; }
+
+        public abstract void FillFilledAutofillValue(FilledAutofillField filledField);
+
+    }
+
+    /// <summary>
+    /// Serializable structure defining the contents of the current view (from an autofill perspective)
+    /// </summary>
+    /// <typeparam name="TField"></typeparam>
+    public class AutofillView<TField> where TField : InputField
+    {
+        public List<TField> InputFields { get; set; } = new List<TField>();
+
+        public string PackageId { get; set; } = null;
+        public string WebDomain { get; set; } = null;
+    }
+
+    public interface ILogger
+    {
+        void Log(string x);
+    }
+
+    public class StructureParserBase<FieldT> where FieldT: InputField
+    {
+        private readonly ILogger _log;
+        private readonly IKp2aDigitalAssetLinksDataSource _digitalAssetLinksDataSource;
+
+        private readonly List<string> _autofillHintsForLogin = new List<string>
+            {
+                AutofillHintsHelper.AutofillHintPassword,
+                AutofillHintsHelper.AutofillHintUsername,
+                AutofillHintsHelper.AutofillHintEmailAddress
+            };
+
+        public string PackageId { get; set; }
+
+        public Dictionary<FieldT, string[]> FieldsMappedToHints = new Dictionary<FieldT, string[]>();
+
+        public StructureParserBase(ILogger logger, IKp2aDigitalAssetLinksDataSource digitalAssetLinksDataSource)
+        {
+            _log = logger;
+            _digitalAssetLinksDataSource = digitalAssetLinksDataSource;
+        }
+
+        public class AutofillTargetId
+        {
+            public string PackageName { get; set; }
+
+            public string PackageNameWithPseudoSchema
+            {
+                get { return AndroidAppScheme + PackageName; }
+            }
+
+            public const string AndroidAppScheme = "androidapp://";
+
+            public string WebDomain { get; set; }
+
+            /// <summary>
+            /// If PackageName and WebDomain are not compatible (by DAL or because PackageName is a trusted browser in which case we treat all domains as "compatible"
+            /// we need to issue a warning. If we would fill credentials for the package, a malicious website could try to get credentials for the app.
+            /// If we would fill credentials for the domain, a malicious app could get credentials for the domain.
+            /// </summary>
+            public bool IncompatiblePackageAndDomain { get; set; }
+
+            public string DomainOrPackage
+            {
+                get
+                {
+                    return WebDomain ?? PackageNameWithPseudoSchema;
+                }
+            }
+        }
+
+        public AutofillTargetId ParseForFill(bool isManual, AutofillView<FieldT> autofillView)
+        {
+            return Parse(true, isManual, autofillView);
+        }
+
+        public AutofillTargetId ParseForSave(AutofillView<FieldT> autofillView)
+        {
+            return Parse(false, true, autofillView);
+        }
+
+        /// <summary>
+        /// Traverse AssistStructure and add ViewNode metadata to a flat list.
+        /// </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)
+        {
+            AutofillTargetId result = new AutofillTargetId()
+            {
+                PackageName = autofillView.PackageId,
+                WebDomain = autofillView.WebDomain
+            };
+            
+            _log.Log("parsing autofillStructure...");
+
+            if (LogAutofillView)
+            {
+                string debugInfo = JsonConvert.SerializeObject(autofillView, Newtonsoft.Json.Formatting.Indented);
+                _log.Log("This is the autofillStructure: \n\n " + debugInfo);
+            }
+
+
+            //go through each input field and determine username/password fields.
+            //Depending on the target this can require more or less heuristics.
+            // * if there is a valid & supported autofill hint, we assume that all fields which should be filled do have an appropriate Autofill hint
+            // * if there is no such autofill hint, we use IsPassword to 
+
+            HashSet<string> autofillHintsOfAllFields = autofillView.InputFields.Where(f => f.AutofillHints != null)
+                .SelectMany(f => f.AutofillHints).Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet();
+            bool hasLoginAutofillHints = autofillHintsOfAllFields.Intersect(_autofillHintsForLogin).Any();
+
+            if (hasLoginAutofillHints)
+            {
+                foreach (var viewNode in autofillView.InputFields)
+                {
+                    string[] viewHints = viewNode.AutofillHints;
+                    if (viewHints == null)
+                        continue;
+                    if (viewHints.Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any())
+                    {
+                        AddFieldToHintMap(viewNode, viewHints.Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray());
+                    }
+
+                }
+            }
+            else
+            {
+                //determine password fields, first by type, then by hint:
+                List<FieldT> editTexts = autofillView.InputFields.Where(f => IsEditText(f)).ToList();
+                List<FieldT> passwordFields = autofillView.InputFields.Where(f => IsEditText(f) && IsPassword(f)).ToList();
+                if (!passwordFields.Any())
+                {
+                    passwordFields = autofillView.InputFields.Where(f => IsEditText(f) && HasPasswordHint(f)).ToList();
+                }
+
+                //determine username fields. Try by hint, if that fails use the one before the password
+                List<FieldT> usernameFields = autofillView.InputFields.Where(f => IsEditText(f) && HasUsernameHint(f)).ToList();
+                if (!usernameFields.Any())
+                {
+                    foreach (var passwordField in passwordFields)
+                    {
+                        
+                        var lastInputBeforePassword = autofillView.InputFields.Where(IsEditText)
+                            .TakeWhile(f =>  f != passwordField && !passwordFields.Contains(f)).LastOrDefault();
+                        
+                        if (lastInputBeforePassword != null)
+                            usernameFields.Add(lastInputBeforePassword);
+                    }
+                    
+                }
+
+                //for "heuristic determination" we demand that one of the filled fields is focused:
+                if (passwordFields.Concat(usernameFields).Any(f => f.IsFocused))
+                {
+                    foreach (var uf in usernameFields)
+                        AddFieldToHintMap(uf, new string[] { AutofillHintsHelper.AutofillHintUsername });
+                    foreach (var pf in passwordFields.Except(usernameFields))
+                        AddFieldToHintMap(pf, new string[] { AutofillHintsHelper.AutofillHintPassword });
+                }
+            }
+            
+
+            if (!string.IsNullOrEmpty(autofillView.WebDomain) && _digitalAssetLinksDataSource.IsEnabled())
+            {
+                result.IncompatiblePackageAndDomain = !_digitalAssetLinksDataSource.IsTrustedLink(autofillView.WebDomain, result.PackageName);
+                if (result.IncompatiblePackageAndDomain)
+                {
+                    _log.Log($"DAL verification failed for {result.PackageName}/{result.WebDomain}");
+                }
+            }
+            else
+            {
+                result.IncompatiblePackageAndDomain = false;
+            }
+            return result;
+        }
+
+        private void AddFieldToHintMap(FieldT field, string[] hints)
+        {
+            if (FieldsMappedToHints.ContainsKey(field))
+            {
+                FieldsMappedToHints[field] = FieldsMappedToHints[field].Concat(hints).ToArray();
+            }
+            else
+            {
+                FieldsMappedToHints[field] = hints;
+            }
+        }
+
+        public bool LogAutofillView { get; set; }
+
+        private bool IsEditText(FieldT f)
+        {
+            return (f.ClassName == "android.widget.EditText"
+                    || f.ClassName == "android.widget.AutoCompleteTextView"
+                    || f.HtmlInfoTag == "input");
+        }
+
+        private static readonly HashSet<string> _passwordHints = new HashSet<string> { "password", "passwort", "passwordAuto", "pswd" };
+        private static bool HasPasswordHint(InputField f)
+        {
+            return IsAny(f.IdEntry, _passwordHints) ||
+                   IsAny(f.Hint, _passwordHints);
+        }
+
+        private static readonly HashSet<string> _usernameHints = new HashSet<string> { "email", "e-mail", "username", "user id" };
+
+        private static bool HasUsernameHint(InputField f)
+        {
+            return IsAny(f.IdEntry?.ToLower(), _usernameHints) ||
+                IsAny(f.Hint?.ToLower(), _usernameHints);
+        }
+
+        private static bool IsAny(string? value, IEnumerable<string> terms)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return false;
+            }
+            var lowerValue = value.ToLowerInvariant();
+            return terms.Any(t => lowerValue == t);
+        }
+
+        private static bool IsInputTypeClass(InputTypes inputType, InputTypes inputTypeClass)
+        {
+            if (!InputTypes.MaskClass.HasFlag(inputTypeClass))
+                throw new Exception("invalid inputTypeClass");
+            return (((int)inputType) & (int)InputTypes.MaskClass) == (int)(inputTypeClass);
+        }
+        private static bool IsInputTypeVariation(InputTypes inputType, InputTypes inputTypeVariation)
+        {
+            if (!InputTypes.MaskVariation.HasFlag(inputTypeVariation))
+                throw new Exception("invalid inputTypeVariation");
+            return (((int)inputType) & (int)InputTypes.MaskVariation) == (int)(inputTypeVariation);
+        }
+
+        private static bool IsPassword(InputField f)
+        {
+            InputTypes inputType = f.InputType;
+
+            return
+                (!f.IdEntry?.ToLowerInvariant().Contains("search") ?? true) &&
+                (!f.Hint?.ToLowerInvariant().Contains("search") ?? true) &&
+                (
+                   (IsInputTypeClass(inputType, InputTypes.ClassText)
+                        &&
+                        (
+                      IsInputTypeVariation(inputType, InputTypes.TextVariationPassword)
+                      || IsInputTypeVariation(inputType, InputTypes.TextVariationVisiblePassword)
+                      || IsInputTypeVariation(inputType, InputTypes.TextVariationWebPassword)
+                      )
+                      )
+                    || (f.AutofillHints != null && f.AutofillHints.FirstOrDefault() == "passwordAuto")
+                    || (f.HtmlInfoTypeAttribute == "password")
+                );
+        }
+
+        
+        
+
+
+
+    }
+}

src/Kp2aAutofillParser/Kp2aAutofillParser.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>

src/Kp2aAutofillParserTest/AutofillTest.cs

@@ -0,0 +1,145 @@
+using Kp2aAutofillParser;
+using Newtonsoft.Json;
+using System.IO;
+using System.Reflection;
+using Xunit.Abstractions;
+
+namespace Kp2aAutofillParserTest
+{
+    public class AutofillTest
+    {
+        private readonly ITestOutputHelper _testOutputHelper;
+
+        public AutofillTest(ITestOutputHelper testOutputHelper)
+        {
+            _testOutputHelper = testOutputHelper;
+        }
+
+        class TestInputField: InputField
+        {
+            public string[] ExpectedAssignedHints { get; set; }
+            public override void FillFilledAutofillValue(FilledAutofillField filledField)
+            {
+            }
+        }
+
+        [Fact]
+        public void TestNotFocusedPasswordAutoIsNotFilled()
+        {
+            var resourceName = "Kp2aAutofillParserTest.com-servicenet-mobile-no-focus.json";
+            RunTestFromAutofillInput(resourceName, "com.servicenet.mobile");
+        }
+
+        [Fact]
+        public void TestCrashRegressionEmptySequence()
+        {
+            var resourceName = "Kp2aAutofillParserTest.imdb.json";
+            RunTestFromAutofillInput(resourceName, "com.vivaldi.browser", "m.imdb.com");
+        }
+
+        [Fact]
+        public void TestFocusedPasswordAutoIsFilled()
+        {
+            var resourceName = "Kp2aAutofillParserTest.com-servicenet-mobile-focused.json";
+            RunTestFromAutofillInput(resourceName, "com.servicenet.mobile");
+        }
+
+        [Fact]
+        public void TestMulitpleUnfocusedLoginsIsFilled()
+        {
+            var resourceName = "Kp2aAutofillParserTest.firefox-amazon-it.json";
+            RunTestFromAutofillInput(resourceName, "org.mozilla.firefox", "www.amazon.it");
+        }
+
+        [Fact]
+        public void CanDetectFieldsWithoutAutofillHints()
+        {
+            var resourceName = "Kp2aAutofillParserTest.chrome-android10-amazon-it.json";
+            RunTestFromAutofillInput(resourceName, "com.android.chrome", "www.amazon.it");
+        }
+        
+        [Fact]
+        public void DetectsUsernameFieldDespitePasswordAutoHint()
+        {
+            var resourceName = "Kp2aAutofillParserTest.com-ifs-banking-fiid3364-android13.json";
+            RunTestFromAutofillInput(resourceName, "com.ifs.banking.fiid3364", null);
+        }
+
+        [Fact]
+        public void DetectsEmailAutofillHint()
+        {
+            var resourceName = "Kp2aAutofillParserTest.com-expressvpn-vpn-android13.json";
+            RunTestFromAutofillInput(resourceName, "com.expressvpn.vpn", null);
+        }
+
+        private void RunTestFromAutofillInput(string resourceName, string expectedPackageName = null, string expectedWebDomain = null)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            
+
+            string input;
+            using (Stream stream = assembly.GetManifestResourceStream(resourceName))
+            using (StreamReader reader = new StreamReader(stream))
+            {
+                input = reader.ReadToEnd();
+            }
+
+            AutofillView<TestInputField>? autofillView =
+                JsonConvert.DeserializeObject<AutofillView<TestInputField>>(input);
+
+            StructureParserBase<TestInputField> parser =
+                new StructureParserBase<TestInputField>(new TestLogger(), new TestDalSourceTrustAll());
+
+            var result = parser.ParseForFill(false, autofillView);
+            if (expectedPackageName != null)
+                Assert.Equal(expectedPackageName, result.PackageName);
+            if (expectedWebDomain != null)
+                Assert.Equal(expectedWebDomain, result.WebDomain);
+            foreach (var field in autofillView.InputFields)
+            {
+                string[] expectedHints = field.ExpectedAssignedHints;
+                if (expectedHints == null)
+                    expectedHints = new string[0];
+                string[] actualHints;
+                parser.FieldsMappedToHints.TryGetValue(field, out actualHints);
+                if (actualHints == null)
+                    actualHints = new string[0];
+                if (actualHints.Any() || expectedHints.Any())
+                {
+                    _testOutputHelper.WriteLine($"field = {field.IdEntry} {field.Hint} {string.Join(",", field.AutofillHints ?? new string[]{})}");
+                    _testOutputHelper.WriteLine("actual Hints = " + string.Join(", ", actualHints));
+                    _testOutputHelper.WriteLine("expected Hints = " + string.Join(", ", expectedHints));
+                }
+                
+                Assert.Equal(expectedHints.Length, actualHints.Length);
+                Assert.Equal(expectedHints.OrderBy(x => x), actualHints.OrderBy(x => x));
+            }
+        }
+    }
+
+    public class TestDalSourceTrustAll : IKp2aDigitalAssetLinksDataSource
+    {
+        public bool IsTrustedApp(string packageName)
+        {
+            return true;
+        }
+
+        public bool IsTrustedLink(string domain, string targetPackage)
+        {
+            return true;
+        }
+
+        public bool IsEnabled()
+        {
+            return true;
+        }
+    }
+
+    public class TestLogger : ILogger
+    {
+        public void Log(string x)
+        {
+            Console.WriteLine(x);
+        }
+    }
+}

src/Kp2aAutofillParserTest/Kp2aAutofillParserTest.csproj

@@ -0,0 +1,62 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="chrome-android10-amazon-it.json" />
+    <None Remove="com-expressvpn-vpn-android13.json" />
+    <None Remove="com-ifs-banking-fiid3364-android13.json" />
+    <None Remove="com-servicenet-mobile-focused.json" />
+    <None Remove="com-servicenet-mobile-no-focus.json" />
+    <None Remove="firefox-amazon-it.json" />
+    <None Remove="imdb.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Kp2aAutofillParser\Kp2aAutofillParser.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="chrome-android10-amazon-it.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="com-expressvpn-vpn-android13.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="com-ifs-banking-fiid3364-android13.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="firefox-amazon-it.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="com-servicenet-mobile-focused.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="com-servicenet-mobile-no-focus.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="imdb.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

src/Kp2aAutofillParserTest/Usings.cs

@@ -0,0 +1 @@
+global using Xunit;

src/Kp2aAutofillParserTest/com-expressvpn-vpn-android13.json

@@ -0,0 +1,226 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "layout",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "textView2",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "emailLayout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "email",
+      "Hint": "E-Mail",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "email"
+      ],
+      "IsFocused": true,
+      "InputType": 33,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "emailAddress" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "passwordLayout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "password",
+      "Hint": "Passwort",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "password",
+        "passwordAuto"
+      ],
+      "IsFocused": false,
+      "InputType": 129,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [
+        "password",
+        "passwordAuto"
+      ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "textinput_suffix_text",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "forgotPassword",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "amazonInfo",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "signInButtonBarrier",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "signIn",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "newUser",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "focusThief",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "activatingContainer",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "com.expressvpn.vpn",
+  "WebDomain": null
+}

src/Kp2aAutofillParserTest/com-ifs-banking-fiid3364-android13.json

@@ -0,0 +1,322 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "loginParent",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "rooted_device_error_screen",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "scroll",
+      "Hint": null,
+      "ClassName": "android.widget.ScrollView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_box_layout",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "loginFragment_container_view",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_box",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "Edt_UserId",
+      "Hint": "User ID",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "passwordAuto"
+      ],
+      "IsFocused": true,
+      "InputType": 145,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "username" ]
+    },
+    {
+      "IdEntry": "login_save_userid_switch",
+      "Hint": null,
+      "ClassName": "android.widget.CompoundButton",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "Edt_Password_layout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "Edt_Password",
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "passwordAuto"
+      ],
+      "IsFocused": false,
+      "InputType": 129,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "password" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "textinput_prefix_text",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "textinput_suffix_text",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "textinput_placeholder",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "forgot_login_btn",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "Btn_Login",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_fab_fragment_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "biometric_fragment_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "biometricLayout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_menu_container",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "deposit_insurance_systems_textview",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_menu",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_menu_item_border_right",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "login_menu_item_border_left",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "sign_up_link",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "locations_link",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "more_link",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "com.ifs.banking.fiid3364",
+  "WebDomain": null
+}

src/Kp2aAutofillParserTest/com-servicenet-mobile-focused.json

@@ -0,0 +1,121 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": true,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "content",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "username_text_input_layout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "username",
+      "Hint": "Username",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": true,
+      "InputType": 97,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+      "ExpectedAssignedHints": [ "username" ]
+    },
+    {
+      "IdEntry": "password_text_input_layout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "password",
+      "Hint": "Password",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "passwordAuto"
+      ],
+      "IsFocused": false,
+      "InputType": 129,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+
+      "ExpectedAssignedHints": [ "password" ]
+    },
+    {
+      "IdEntry": "login_button",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "progressBar",
+      "Hint": null,
+      "ClassName": "android.widget.ProgressBar",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "forgot_password",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "com.servicenet.mobile",
+  "WebDomain": null
+}

src/Kp2aAutofillParserTest/com-servicenet-mobile-no-focus.json

@@ -0,0 +1,119 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": true,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "content",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "username_text_input_layout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "username",
+      "Hint": "Username",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 97,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "password_text_input_layout",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "password",
+      "Hint": "Password",
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "passwordAuto"
+      ],
+      "IsFocused": false,
+      "InputType": 129,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null,
+
+    },
+    {
+      "IdEntry": "login_button",
+      "Hint": null,
+      "ClassName": "android.widget.Button",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "progressBar",
+      "Hint": null,
+      "ClassName": "android.widget.ProgressBar",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "forgot_password",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "com.servicenet.mobile",
+  "WebDomain": null
+}

src/Kp2aAutofillParserTest/firefox-amazon-it.json

@@ -0,0 +1,469 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "rootContainer",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "navigationToolbarStub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "gestureLayout",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "browserWindow",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "browserLayout",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "swipeRefresh",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "engineView",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": true,
+      "InputType": 0,
+      "HtmlInfoTag": "",
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "form",
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "password"
+      ],
+      "IsFocused": false,
+      "InputType": 225,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "password",
+      "ExpectedAssignedHints": [ "password" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "emailAddress"
+      ],
+      "IsFocused": false,
+      "InputType": 33,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "email",
+      "ExpectedAssignedHints": [ "emailAddress" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "checkbox"
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "submit"
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "form",
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "password"
+      ],
+      "IsFocused": false,
+      "InputType": 225,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "password",
+      "ExpectedAssignedHints": [ "password" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": [
+        "emailAddress"
+      ],
+      "IsFocused": false,
+      "InputType": 33,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "email",
+
+      "ExpectedAssignedHints": [ "emailAddress" ]
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "submit"
+    },
+    {
+      "IdEntry": "stubFindInPage",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "viewDynamicDownloadDialog",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "crash_reporter_view",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "toolbar",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_navigation_actions",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_origin_view",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_title_view",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_url_view",
+      "Hint": "Suche oder Adresse",
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_page_actions",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_browser_actions",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "counter_root",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "counter_text",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_menu",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_progress",
+      "Hint": null,
+      "ClassName": "android.widget.ProgressBar",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_container",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_edit_actions_start",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_edit_url_view",
+      "Hint": null,
+      "ClassName": "android.widget.EditText",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 17,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "mozac_browser_toolbar_edit_actions_end",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "readerViewControlsBar",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "addressSelectBar",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "creditCardSelectBar",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "loginSelectBar",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tabPreview",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "org.mozilla.firefox",
+  "WebDomain": "www.amazon.it"
+}

src/Kp2aAutofillParserTest/imdb.json

@@ -0,0 +1,728 @@
+{
+  "InputFields": [
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_root",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "custom_tabs_handle_view_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "coordinator",
+      "Hint": null,
+      "ClassName": "android.view.ViewGroup",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "compositor_view_holder",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": true,
+      "InputType": 0,
+      "HtmlInfoTag": "form",
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": "",
+      "ClassName": null,
+      "AutofillHints": [],
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "checkbox"
+    },
+    {
+      "IdEntry": null,
+      "Hint": "Search IMDb",
+      "ClassName": null,
+      "AutofillHints": [
+        "off"
+      ],
+      "IsFocused": true,
+      "InputType": 0,
+      "HtmlInfoTag": "input",
+      "HtmlInfoTypeAttribute": "text"
+    },
+    {
+      "IdEntry": "main_tab_switcher",
+      "Hint": null,
+      "ClassName": "android.widget.RelativeLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "ar_view_holder",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "capture_overlay",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "overview_list_layout_holder",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "keyboard_accessory_sheet_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottombar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_modal_dialog_container_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_modal_dialog_container_sibling_view",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "omnibox_results_container_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "panel_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "search_engine_suggestion_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_bar_black_background",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_controls",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_controls_wrapper",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_group_ui_bottom_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_group_ui_toolbar_view",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_container_slot",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_toolbar",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_toolbar_browsing",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_switcher_tab_layout_toggle",
+      "Hint": null,
+      "ClassName": "android.widget.RelativeLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_switcher_tab_layout",
+      "Hint": null,
+      "ClassName": "android.widget.HorizontalScrollView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": null,
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "control_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "find_toolbar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "find_toolbar_tablet_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "toolbar_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_group_ui_top_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "toolbar",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_view_left_space",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_incognito_badge_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_icon_view",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_icon_frame",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_icon_bg",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_icon_holding_space",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_verbose_status",
+      "Hint": null,
+      "ClassName": "android.widget.TextView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_verbose_status_separator",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_verbose_status_extra_space",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "location_bar_status_view_right_space",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "url_action_container",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "toolbar_buttons",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "optional_button_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "menu_button_wrapper",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tab_switcher_toolbar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "bottom_toolbar_tab_switcher_mode",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "grid_tab_switcher_view_holder_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "message_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "status_indicator_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "empty_container_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "sheet_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "survey_container",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "page_zoom_container",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "dialog_parent_view",
+      "Hint": null,
+      "ClassName": "android.widget.FrameLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "keyboard_accessory",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "accessory_bar_contents",
+      "Hint": null,
+      "ClassName": "android.widget.LinearLayout",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "tabs",
+      "Hint": null,
+      "ClassName": "android.widget.HorizontalScrollView",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "menu_anchor_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "navigation_popup_anchor_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    },
+    {
+      "IdEntry": "action_mode_bar_stub",
+      "Hint": null,
+      "ClassName": "android.view.View",
+      "AutofillHints": null,
+      "IsFocused": false,
+      "InputType": 0,
+      "HtmlInfoTag": null,
+      "HtmlInfoTypeAttribute": null
+    }
+  ],
+  "PackageId": "com.vivaldi.browser",
+  "WebDomain": "m.imdb.com"
+}        

src/Kp2aBusinessLogic/Io/JavaFileStorage.cs

@@ -25,7 +25,7 @@ namespace keepass2android.Io
 	    public abstract bool UserShouldBackup { get; }
 
 
-	    private readonly IJavaFileStorage _jfs;
+	    protected readonly IJavaFileStorage _jfs;
 		private readonly IKp2aApp _app;
 
 		public JavaFileStorage(IJavaFileStorage jfs, IKp2aApp app)

src/Kp2aBusinessLogic/Io/NetFtpFileStorage.cs

@@ -1,18 +1,18 @@
 #if !NoNet
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
-using System.Reflection;
-using System.Threading;
 using Android.Content;
 using Android.OS;
-using Android.Preferences;
 using FluentFTP;
+using FluentFTP.Exceptions;
 using KeePassLib;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
 
+
 namespace keepass2android.Io
 {
 	public class NetFtpFileStorage: IFileStorage
@@ -75,14 +75,15 @@ namespace keepass2android.Io
 		}
 
 		private readonly ICertificateValidationHandler _app;
+		private readonly Func<bool> _debugLogPrefGetter;
 
 		public MemoryStream traceStream;
 
-		public NetFtpFileStorage(Context context, ICertificateValidationHandler app)
+		public NetFtpFileStorage(Context context, ICertificateValidationHandler app, Func<bool> debugLogPrefGetter)
 		{
             _app = app;
-			traceStream = new MemoryStream();
-			
+            _debugLogPrefGetter = debugLogPrefGetter;
+            traceStream = new MemoryStream();
 		}
 
 		public IEnumerable<string> SupportedProtocols
@@ -138,7 +139,7 @@ namespace keepass2android.Io
 			var settings = ConnectionSettings.FromIoc(ioc);
 			
 			FtpClient client = new FtpClient();
-		    client.RetryAttempts = 3;
+			client.Config.RetryAttempts = 3;
 			if ((settings.Username.Length > 0) || (settings.Password.Length > 0))
 				client.Credentials = new NetworkCredential(settings.Username, settings.Password);
 			else
@@ -154,9 +155,12 @@ namespace keepass2android.Io
 				args.Accept = _app.CertificateValidationCallback(control, args.Certificate, args.Chain, args.PolicyErrors);
 			};
 
-			client.EncryptionMode = settings.EncryptionMode;
-			
-			client.Connect();
+			client.Config.EncryptionMode = settings.EncryptionMode;
+
+			if (_debugLogPrefGetter())
+				client.Logger = new Kp2aLogFTPLogger();
+
+            client.Connect();
 			return client;
 			
 		}
@@ -284,42 +288,55 @@ namespace keepass2android.Io
 
         public IEnumerable<FileDescription> ListContents(IOConnectionInfo ioc)
 		{
-			try
+            try
 			{
                 using (var client = GetClient(ioc))
 				{
+                    /*
+					 * For some reason GetListing(path) does not always return the contents of the directory.
+					 * However, calling SetWorkingDirectory(path) followed by GetListing(null, options) to
+					 * list the contents of the working directory does consistently work.
+					 * 
+					 * Similar behavior was confirmed using ncftp client. I suspect this is a strange
+					 * bug/nuance in the server's implementation of the LIST command?
+					 *
+					 * [bug #2423]
+					 */
+                    client.SetWorkingDirectory(IocToLocalPath(ioc));
+
 					List<FileDescription> files = new List<FileDescription>();
-					foreach (FtpListItem item in client.GetListing(IocToLocalPath(ioc),
-						FtpListOption.Modify | FtpListOption.Size | FtpListOption.DerefLinks))
+					foreach (FtpListItem item in client.GetListing(null,
+						FtpListOption.SizeModify | FtpListOption.AllFiles))
 					{
-
-						switch (item.Type)
+                        switch (item.Type)
 						{
-							case FtpFileSystemObjectType.Directory:
+							case FtpObjectType.Directory:
 								files.Add(new FileDescription()
-								{
-									CanRead = true,
-									CanWrite = true,
-									DisplayName = item.Name,
-									IsDirectory = true,
-									LastModified = item.Modified,
-									Path = IocPathFromUri(ioc, item.FullName)
-								});
-								break;
-							case FtpFileSystemObjectType.File:
+                                {
+                                    CanRead = true,
+                                    CanWrite = true,
+                                    DisplayName = item.Name,
+                                    IsDirectory = true,
+                                    LastModified = item.Modified,
+                                    Path = IocPathFromUri(ioc, item.FullName)
+                                });
+                                break;
+							case FtpObjectType.File:
 								files.Add(new FileDescription()
-								{
-									CanRead = true,
-									CanWrite = true,
-									DisplayName = item.Name,
-									IsDirectory = false,
-									LastModified = item.Modified,
-									Path = IocPathFromUri(ioc, item.FullName),
-									SizeInBytes = item.Size
-								});
+                                {
+                                    CanRead = true,
+                                    CanWrite = true,
+                                    DisplayName = item.Name,
+                                    IsDirectory = false,
+                                    LastModified = item.Modified,
+                                    Path = IocPathFromUri(ioc, item.FullName),
+                                    SizeInBytes = item.Size
+                                });
+                                break;
+							default:
+								Kp2aLog.Log("FTP: ListContents item skipped: " + IocToUri(ioc) + ": " + item.FullName + ", type=" + item.Type);
 								break;
-
-						}
+                        }
 					}
 					return files;
 				}
@@ -329,7 +346,6 @@ namespace keepass2android.Io
 				throw ConvertException(ex);
 			}
 		}
-
 		
 		public FileDescription GetFileDescription(IOConnectionInfo ioc)
 		{
@@ -466,7 +482,9 @@ namespace keepass2android.Io
 
 		public static int GetDefaultPort(FtpEncryptionMode encryption)
 		{
-			return new FtpClient() { EncryptionMode =  encryption}.Port;
+			var client = new FtpClient();
+			client.Config.EncryptionMode = encryption;
+			return client.Port;
 		}
 
 		public string BuildFullPath(string host, int port, string initialPath, string user, string password, FtpEncryptionMode encryption)
@@ -582,5 +600,13 @@ namespace keepass2android.Io
 			_stream.Close();
 		}
 	}
+
+    class Kp2aLogFTPLogger : IFtpLogger
+    {
+        public void Log(FtpLogEntry entry)
+        {
+            Kp2aLog.Log("[FluentFTP] " + entry.Message);
+        }
+    }
 }
 #endif

src/Kp2aBusinessLogic/Io/PCloudFileStorage.cs

@@ -3,14 +3,15 @@ using Android.Content;
 
 namespace keepass2android.Io
 {
-	public partial class PCloudFileStorage: JavaFileStorage
+	public class PCloudFileStorage: JavaFileStorage
 	{
-		private const string ClientId = "CkRWTQXY6Lm";
+		private const string ClientId = "yCeH59Ffgtm";
 
 		public PCloudFileStorage(Context ctx, IKp2aApp app) :
-			base(new Keepass2android.Javafilestorage.PCloudFileStorage(ctx, ClientId), app)
+			base(new Keepass2android.Javafilestorage.PCloudFileStorage(ctx, ClientId, "pcloud", ""), app)
 		{
-		}
+
+        }
 
 
 	    public override bool UserShouldBackup
@@ -18,6 +19,23 @@ namespace keepass2android.Io
 	        get { return false; }
 	    }
 	}
+    public class PCloudFileStorageAll : JavaFileStorage
+    {
+        private const string ClientId = "FLm22de7bdS";
+
+        public PCloudFileStorageAll(Context ctx, IKp2aApp app) :
+            base(new Keepass2android.Javafilestorage.PCloudFileStorage(ctx, ClientId, "pcloudall", "PCLOUDALL_"), app)
+        {
+            
+
+        }
+
+
+        public override bool UserShouldBackup
+        {
+            get { return false; }
+        }
+    }
 
 }
 #endif

src/Kp2aBusinessLogic/Io/SftpFileStorage.cs

@@ -1,17 +1,39 @@
 using Android.Content;
+using Java.Nio.FileNio;
 #if !EXCLUDE_JAVAFILESTORAGE
 
 namespace keepass2android.Io
 {
 	public class SftpFileStorage: JavaFileStorage
 	{
-		public SftpFileStorage(Context ctx, IKp2aApp app) :
+		public SftpFileStorage(Context ctx, IKp2aApp app, bool debugEnabled) :
 			base(new Keepass2android.Javafilestorage.SftpStorage(ctx.ApplicationContext), app)
 		{
-		}
+            var storage = BaseStorage;
+            if (debugEnabled)
+            {
+                string? logFilename = null;
+                if (Kp2aLog.LogToFile)
+                {
+                    logFilename = Kp2aLog.LogFilename;
+                }
+                storage.SetJschLogging(true, logFilename);
+            }
+            else
+            {
+                storage.SetJschLogging(false, null);
+            }
+        }
 
+        private Keepass2android.Javafilestorage.SftpStorage BaseStorage
+        {
+            get
+            {
+                return _jfs as Keepass2android.Javafilestorage.SftpStorage;
+            }
+        }
 
-	    public override bool UserShouldBackup
+        public override bool UserShouldBackup
 	    {
 	        get { return true; }
 	    }

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -182,7 +182,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(Flavor)'!='NoNet' ">
     <PackageReference Include="FluentFTP">
-      <Version>31.3.1</Version>
+      <Version>48.0.0</Version>
     </PackageReference>
     <PackageReference Include="MegaApiClient">
       <Version>1.10.3</Version>
@@ -312,4 +312,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/PCloudBindings/PCloudBindings.csproj

@@ -56,7 +56,7 @@
   <ItemGroup>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
-    <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.2.0.aar" />
+    <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.8.1.aar" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml" />
@@ -72,6 +72,6 @@
   </Target>
   -->
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.2.0.jar" />
+    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.8.1.jar" />
   </ItemGroup>
 </Project>

src/build-properties.props

@@ -2,7 +2,7 @@
 <PropertyGroup>
 
 
-<Flavor>NoNet</Flavor>
+<xFlavor>Net</xFlavor>
 
 </PropertyGroup>
 

src/java/JavaFileStorage/app/build.gradle

@@ -47,8 +47,8 @@ dependencies {
     implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
         transitive = false
     }
-    implementation 'com.pcloud.sdk:java-core:1.2.0'
-    implementation 'com.pcloud.sdk:android:1.2.0'
+    implementation 'com.pcloud.sdk:java-core:1.8.1'
+    implementation 'com.pcloud.sdk:android:1.8.1'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.microsoft.services.msa:msa-auth:0.8.6'
     implementation 'com.microsoft.aad:adal:1.14.0'

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/JavaFileStorage.java

@@ -97,7 +97,28 @@ public class FileEntry {
 			return false;
 		return true;
 	}
-	
+
+	@Override
+	public String toString() {
+		StringBuilder s = new StringBuilder("JavaFileStorage.FileEntry{").append(displayName).append("|")
+				.append("path=").append(path).append(",sz=").append(sizeInBytes)
+				.append(",").append(isDirectory ? "dir" : "file")
+				.append(",lastMod=").append(lastModifiedTime);
+
+		StringBuilder perms = new StringBuilder();
+		if (canRead)
+			perms.append("r");
+		if (canWrite)
+			perms.append("w");
+		if (perms.length() > 0) {
+			s.append(",").append(perms);
+		}
+
+		if (userData != null && userData.length() > 0)
+			s.append(",userData=").append(userData);
+
+		return s.append("}").toString();
+	}
 	
 }
 	

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/Kp2aJSchLogger.java

@@ -0,0 +1,101 @@
+package keepass2android.javafilestorage;
+
+import android.util.Log;
+
+import com.jcraft.jsch.Logger;
+
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.util.Map;
+
+public class Kp2aJSchLogger implements Logger {
+
+    private static final String PREFIX = "KP2AJFS[JSch]";
+
+    private interface ILogger {
+        void log(String message);
+    }
+
+    private interface EntryToLogFactory {
+        ILogger create(LogEntry e);
+    }
+
+    private static final EntryToLogFactory ANDROID_FACTORY = e -> e.logger;
+
+    private static final class LogEntry {
+        private final String levelTag;
+        private final ILogger logger;
+
+        LogEntry(String levelTag, ILogger logger) {
+            this.levelTag = levelTag;
+            this.logger = logger;
+        }
+    }
+    private static final ILogger DEBUG = msg -> Log.d(PREFIX, msg);
+    private static final LogEntry DEBUG_ENTRY = new LogEntry("D", DEBUG);
+    private static final ILogger ERROR = msg -> Log.e(PREFIX, msg);
+    private static final LogEntry DEFAULT_ENTRY = DEBUG_ENTRY;
+
+    private static final Map<Integer, LogEntry> loggers = Map.of(
+            Logger.DEBUG, DEBUG_ENTRY,
+            Logger.INFO, new LogEntry("I", msg -> Log.i(PREFIX, msg)),
+            Logger.WARN, new LogEntry("W", msg -> Log.w(PREFIX, msg)),
+            Logger.ERROR, new LogEntry("E", ERROR),
+            Logger.FATAL, new LogEntry("F", msg -> Log.wtf(PREFIX, msg))
+    );
+
+
+    private final EntryToLogFactory logFactory;
+
+    static Kp2aJSchLogger createAndroidLogger() {
+        return new Kp2aJSchLogger(ANDROID_FACTORY);
+    }
+
+    static Kp2aJSchLogger createFileLogger(String logFilename) {
+        final String fName = logFilename;
+        return new Kp2aJSchLogger(e -> createFileLogger(e, fName));
+    }
+
+    private Kp2aJSchLogger(EntryToLogFactory logFactory) {
+        this.logFactory = logFactory;
+    }
+
+    @Override
+    public boolean isEnabled(int level) {
+        return true;
+    }
+
+    @Override
+    public void log(int level, String message) {
+        if (isEnabled(level))
+            getLogger(level).log(message);
+    }
+
+    private ILogger getLogger(int level) {
+        LogEntry entry = loggers.get(level);
+        if (entry == null)
+            entry = DEFAULT_ENTRY;
+
+        return logFactory.create(entry);
+    }
+
+    private static ILogger createFileLogger(LogEntry entry, String fName) {
+        try {
+            final PrintWriter p = new PrintWriter(new FileWriter(fName, true));
+            return msg -> {
+                try {
+                    String fullMsg = String.join(" ", entry.levelTag, PREFIX, msg);
+                    p.println(fullMsg);
+                } catch (Exception e) {
+                    ERROR.log(e.getMessage());
+                } finally {
+                    p.close();
+                }
+            };
+        } catch (Exception e) {
+            ERROR.log(e.getMessage());
+            return entry.logger;
+        }
+    }
+}
+

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/PCloudFileStorage.java

@@ -22,6 +22,7 @@ import com.pcloud.sdk.ApiError;
 import com.pcloud.sdk.Authenticators;
 import com.pcloud.sdk.AuthorizationActivity;
 import com.pcloud.sdk.AuthorizationData;
+import com.pcloud.sdk.AuthorizationRequest;
 import com.pcloud.sdk.AuthorizationResult;
 import com.pcloud.sdk.Call;
 import com.pcloud.sdk.DataSource;
@@ -47,11 +48,19 @@ public class PCloudFileStorage extends JavaFileStorageBase
 
     private ApiClient apiClient;
     private String clientId;
+    private String protocolId;
 
-    public PCloudFileStorage(Context ctx, String clientId) {
+    ///prefix for SHARED_PREF keys so we can distinguish between different instances
+    private String sharedPrefPrefix;
+
+    public PCloudFileStorage(Context ctx, String clientId, String protocolId, String sharedPrefPrefix) {
         this.ctx = ctx;
         this.clientId = clientId;
+        this.protocolId = protocolId;
+        this.sharedPrefPrefix = sharedPrefPrefix;
+
         this.apiClient = createApiClientFromSharedPrefs();
+        android.util.Log.d("KP2A", "Init pcloud with protocol " + protocolId + ", prefix=" + sharedPrefPrefix + ", clientId=" + clientId);
     }
 
     @Override
@@ -86,7 +95,8 @@ public class PCloudFileStorage extends JavaFileStorageBase
 
     @Override
     public String getProtocolId() {
-        return "pcloud";
+
+        return protocolId;
     }
 
     @Override
@@ -136,7 +146,7 @@ public class PCloudFileStorage extends JavaFileStorageBase
 
         DataSource dataSource = DataSource.create(data);
         String filename = path.substring(path.lastIndexOf("/") + 1);
-        String filePath = path.substring(0, path.lastIndexOf("/") + 1);
+        String filePath = path.substring(0, path.lastIndexOf("/"));
         RemoteFolder remoteFolder = this.getRemoteFolderByPath(filePath);
 
         try {
@@ -165,11 +175,14 @@ public class PCloudFileStorage extends JavaFileStorageBase
 
     @Override
     public String createFilePath(String parentPath, String newFileName) throws Exception {
+        String cleanpath = this.cleanPath(parentPath);
+        String filepath = this.getProtocolId() + "://";
+
         return (
-            this.getProtocolId() + "://" +
-            this.cleanPath(parentPath) +
-            ("".equals(newFileName) ? "" : "/") +
-            newFileName
+                filepath
+                +cleanpath
+                +("".equals(newFileName) || "/".equals(cleanpath) ? "" : "/") +newFileName
+
         );
     }
 
@@ -191,7 +204,7 @@ public class PCloudFileStorage extends JavaFileStorageBase
     @Override
     public FileEntry getFileEntry(String path) throws Exception {
         path = this.cleanPath(path);
-
+        //do not call getRemoteFileByPath because path could represent a file or folder, we don't know here
         RemoteEntry remoteEntry = this.getRemoteEntryByPath(path);
 
         return this.convertRemoteEntryToFileEntry(
@@ -204,10 +217,13 @@ public class PCloudFileStorage extends JavaFileStorageBase
     public void delete(String path) throws Exception {
         path = this.cleanPath(path);
 
-        RemoteEntry remoteEntry = this.getRemoteFileByPath(path);
+        RemoteEntry remoteEntry = this.getRemoteEntryByPath(path);
 
         try {
-            this.apiClient.delete(remoteEntry).execute();
+            if (remoteEntry.isFolder())
+                this.apiClient.deleteFolder(remoteEntry.asFolder(), true).execute();
+            else
+                this.apiClient.delete(remoteEntry).execute();
         } catch (ApiError e) {
             throw convertApiError(e);
         }
@@ -228,11 +244,17 @@ public class PCloudFileStorage extends JavaFileStorageBase
             finishActivityWithSuccess(activity);
         } else if (!activity.getState().getBoolean("hasStartedAuth", false)) {
             Activity castedActivity = (Activity)activity;
-            Intent authIntent = AuthorizationActivity.createIntent(castedActivity, this.clientId);
+            AuthorizationRequest req = AuthorizationRequest.create()
+                    .setClientId(this.clientId)
+                    .setType(AuthorizationRequest.Type.TOKEN)
+                    .setForceAccessApproval(true)
+                    .build();
+            Intent authIntent = AuthorizationActivity.createIntent(castedActivity, req);
             castedActivity.startActivityForResult(authIntent, PCLOUD_AUTHORIZATION_REQUEST_CODE);
             activity.getState().putBoolean("hasStartedAuth", true);
         }
 
+
     }
 
     @Override
@@ -273,7 +295,7 @@ public class PCloudFileStorage extends JavaFileStorageBase
     }
 
     private ApiClient createApiClientFromSharedPrefs() {
-        SharedPreferences prefs = this.ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences prefs = getPrefs();
         String authToken = prefs.getString(SHARED_PREF_AUTH_TOKEN, null);
         String apiHost = prefs.getString(SHARED_PREF_API_HOST, null);
         return this.createApiClient(authToken, apiHost);
@@ -297,15 +319,20 @@ public class PCloudFileStorage extends JavaFileStorageBase
 
     private void clearAuthToken() {
         this.apiClient = null;
-        SharedPreferences prefs = this.ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences prefs = getPrefs();
         SharedPreferences.Editor edit = prefs.edit();
         edit.clear();
         edit.apply();
     }
 
+    private SharedPreferences getPrefs()
+    {
+        return this.ctx.getSharedPreferences(sharedPrefPrefix + SHARED_PREF_NAME, Context.MODE_PRIVATE);
+    }
+
     private void setAuthToken(String authToken, String apiHost) {
         this.apiClient = this.createApiClient(authToken, apiHost);
-        SharedPreferences prefs = this.ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences prefs = getPrefs();
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString(SHARED_PREF_AUTH_TOKEN, authToken);
         edit.putString(SHARED_PREF_API_HOST, apiHost);
@@ -319,27 +346,47 @@ public class PCloudFileStorage extends JavaFileStorageBase
     }
 
     private RemoteFile getRemoteFileByPath(String path) throws Exception {
-        RemoteEntry remoteEntry = this.getRemoteEntryByPath(path);
+        Call<RemoteFile> call = this.apiClient.loadFile(path);
 
         try {
-            return remoteEntry.asFile();
-        } catch (IllegalStateException e) {
-            throw new FileNotFoundException(e.toString());
+            return call.execute();
+        } catch (ApiError apiError) {
+            throw convertApiError(apiError);
         }
     }
 
     private RemoteFolder getRemoteFolderByPath(String path) throws Exception {
-        RemoteEntry remoteEntry = this.getRemoteEntryByPath(path);
+        Call<RemoteFolder> call;
+        if ("".equals(path))
+             call = this.apiClient.listFolder(RemoteFolder.ROOT_FOLDER_ID, false);
+        else
+             call = this.apiClient.listFolder(path, false);
 
         try {
-            return remoteEntry.asFolder();
-        } catch (IllegalStateException e) {
-            throw new FileNotFoundException(e.toString());
+            return call.execute();
+        } catch (ApiError apiError) {
+            throw convertApiError(apiError);
         }
+
     }
 
     private RemoteEntry getRemoteEntryByPath(String path) throws Exception {
-        Call<RemoteFolder> call = this.apiClient.listFolder(RemoteFolder.ROOT_FOLDER_ID, true);
+        if ("/".equals(path)) {
+            try {
+                return this.apiClient.listFolder(RemoteFolder.ROOT_FOLDER_ID, false).execute();
+            } catch (ApiError apiError) {
+                throw convertApiError(apiError);
+            }
+        }
+
+        String filename = path.substring(path.lastIndexOf("/") + 1);
+        String parentPath = path.substring(0, path.lastIndexOf("/"));
+
+        Call<RemoteFolder> call;
+        if ("".equals(parentPath))
+            call = this.apiClient.listFolder(RemoteFolder.ROOT_FOLDER_ID, false);
+        else
+            call = this.apiClient.listFolder(parentPath, false);
 
         RemoteFolder folder;
         try {
@@ -348,40 +395,12 @@ public class PCloudFileStorage extends JavaFileStorageBase
             throw convertApiError(apiError);
         }
 
-        if ("/".equals(path)) {
-            return folder;
+        for (RemoteEntry remoteEntry : folder.children()) {
+            if (remoteEntry.name() != null && remoteEntry.name().equals(filename))
+                return remoteEntry;
         }
+        throw new FileNotFoundException("did not find " + path);
 
-        String[] fileNames = path.substring(1).split("/");
-        RemoteFolder currentFolder = folder;
-        Iterator<String> fileNamesIterator = Arrays.asList(fileNames).iterator();
-        while (true) {
-            String fileName = fileNamesIterator.next();
-
-            Iterator<RemoteEntry> entryIterator = currentFolder.children().iterator();
-            while (true) {
-                RemoteEntry remoteEntry;
-                try {
-                    remoteEntry = entryIterator.next();
-                } catch (NoSuchElementException e) {
-                    throw new FileNotFoundException(e.toString());
-                }
-
-                if (currentFolder.folderId() == remoteEntry.parentFolderId() && fileName.equals(remoteEntry.name())) {
-                    if (!fileNamesIterator.hasNext()) {
-                        return remoteEntry;
-                    }
-
-                    try {
-                        currentFolder = remoteEntry.asFolder();
-                    } catch (IllegalStateException e) {
-                        throw new FileNotFoundException(e.toString());
-                    }
-
-                    break;
-                }
-            }
-        }
     }
 
     private Exception convertApiError(ApiError e) {

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpPublicPrivateKeyUtils.java

@@ -0,0 +1,216 @@
+package keepass2android.javafilestorage;
+
+import android.util.Pair;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.regex.Pattern;
+
+import androidx.annotation.Nullable;
+
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.KeyPair;
+
+class SftpPublicPrivateKeyUtils {
+
+    private enum Validity {
+        NOT_ATTEMPTED, VALID, NOT_VALID;
+    }
+
+    private static final String SFTP_CUSTOM_KEY_DIRNAME = "user_keys";
+
+    private static final String KP2A_PRIVATE_KEY_FILENAME = "id_kp2a_rsa";
+
+    private final File appBaseDir;
+
+    /**
+     * Do NOT access this variable directly! Use {@link #baseDir()} instead.
+     */
+    private final File customKeyBaseDir;
+    private volatile Validity validDir = Validity.NOT_ATTEMPTED;
+
+    SftpPublicPrivateKeyUtils(String appBaseDir) {
+        // Assume app base directory exists already
+        this.appBaseDir = new File(appBaseDir);
+
+        // Intentionally skipping existence/creation checking in constructor
+        // See baseDir()
+        this.customKeyBaseDir = new File(appBaseDir, SFTP_CUSTOM_KEY_DIRNAME);
+    }
+
+    private Pair<File, Boolean> baseDir() {
+        if (validDir == Validity.NOT_ATTEMPTED) {
+            synchronized (this) {
+                if (!customKeyBaseDir.exists()) {
+                    customKeyBaseDir.mkdirs();
+                }
+                if (customKeyBaseDir.exists() && customKeyBaseDir.isDirectory()) {
+                    validDir = Validity.VALID;
+                } else {
+                    validDir = Validity.NOT_VALID;
+                }
+            }
+        }
+        return new Pair<>(customKeyBaseDir, validDir == Validity.VALID);
+    }
+
+    boolean deleteCustomKey(String keyName) throws FileNotFoundException {
+        File f = getCustomKeyFile(keyName);
+        return f.isFile() && f.delete();
+    }
+
+    String[] getCustomKeyNames() {
+        Pair<File, Boolean> base = baseDir();
+        if (!base.second) {
+            // Log it?
+            return new String[]{};
+        }
+        return base.first.list();
+    }
+
+    void savePrivateKeyContent(String keyName, String keyContent) throws IOException, Exception {
+        keyContent = PrivateKeyValidator.ensureValidContent(keyContent);
+
+        File f = getCustomKeyFile(keyName);
+        try (BufferedWriter w = new BufferedWriter(new FileWriter(f))) {
+            w.write(keyContent);
+        }
+    }
+
+    String getCustomKeyFilePath(String customKeyName) throws FileNotFoundException {
+        return getCustomKeyFile(customKeyName).getAbsolutePath();
+    }
+
+    String resolveKeyFilePath(JSch jschInst, @Nullable String customKeyName) {
+        // Custom private key configured
+        if (customKeyName != null) {
+            try {
+                return getCustomKeyFilePath(customKeyName);
+            } catch (FileNotFoundException e) {
+                System.out.println(e);
+            }
+        }
+        // Use KP2A's public/private key
+        String keyFilePath = getAppKeyFileName();
+        try{
+            createKeyPair(jschInst, keyFilePath);
+        } catch (Exception ex) {
+            System.out.println(ex);
+        }
+        return keyFilePath;
+    }
+
+    String createKeyPair(JSch jschInst) throws IOException, JSchException {
+        return createKeyPair(jschInst, getAppKeyFileName());
+    }
+
+    /**
+     * Exposed for testing purposes only
+     * @param keyName
+     * @return
+     */
+    String getSanitizedCustomKeyName(String keyName) {
+        return PrivateKeyValidator.sanitizeKeyAsFilename(keyName);
+    }
+
+    /**
+     * Exposed for testing purposes only.
+     * @param keyContent
+     * @return
+     * @throws Exception
+     */
+    String getValidatedCustomKeyContent(String keyContent) throws Exception {
+        return PrivateKeyValidator.ensureValidContent(keyContent);
+    }
+
+    private String createKeyPair(JSch jschInst, String key_filename) throws JSchException, IOException {
+        String public_key_filename = key_filename + ".pub";
+        File file = new File(key_filename);
+        if (file.exists())
+            return public_key_filename;
+        int type = KeyPair.RSA;
+        KeyPair kpair = KeyPair.genKeyPair(jschInst, type, 4096);
+        kpair.writePrivateKey(key_filename);
+
+        kpair.writePublicKey(public_key_filename, "generated by Keepass2Android");
+        //ret = "Fingerprint: " + kpair.getFingerPrint();
+        kpair.dispose();
+        return public_key_filename;
+    }
+
+    private String getAppKeyFileName() {
+        return new File(appBaseDir, KP2A_PRIVATE_KEY_FILENAME).getAbsolutePath();
+    }
+
+    private File getCustomKeyFile(String customKeyName) throws FileNotFoundException {
+        Pair<File, Boolean> base = baseDir();
+        if (!base.second) {
+            throw new FileNotFoundException("Custom key directory");
+        }
+
+        String keyFileName = PrivateKeyValidator.sanitizeKeyAsFilename(customKeyName);
+        if (!keyFileName.isEmpty()) {
+            File keyFile = new File(base.first, keyFileName);
+            // Protect against bad actors trying to navigate away from the base directory.
+            // This is probably overkill, given sanitizeKeyAsFilename(...) but better safe than sorry.
+            if (base.first.equals(keyFile.getParentFile())) {
+                return keyFile;
+            }
+        }
+        // The key was sanitized to nothing, or the parent check above failed.
+        throw new FileNotFoundException("Malformed key name");
+    }
+
+
+    private static class PrivateKeyValidator {
+        private static final Pattern CONTENT_FIRST_LINE = Pattern.compile("^-+BEGIN\\s[^\\s]+\\sPRIVATE\\sKEY-+$");
+        private static final Pattern CONTENT_LAST_LINE = Pattern.compile("^-+END\\s[^\\s]+\\sPRIVATE\\sKEY-+$");
+
+        /**
+         * Key-to-filename sanitizer solution sourced from:
+         *  <a href="https://www.b4x.com/android/forum/threads/sanitize-filename.82558/" />
+         */
+        private static final Pattern KEY_SANITIZER = Pattern.compile("([^\\p{L}\\s\\d\\-_~,;:\\[\\]\\(\\).'])",
+                Pattern.CASE_INSENSITIVE);
+
+        static String sanitizeKeyAsFilename(String key) {
+            return KEY_SANITIZER.matcher(key.trim()).replaceAll("");
+        }
+
+        static String ensureValidContent(String content) throws Exception {
+            content = content.trim();
+
+            boolean isValid = true;
+            try (BufferedReader r = new BufferedReader(new StringReader(content))) {
+                boolean validFirst = false;
+                String line;
+                String last = null;
+                while ((line = r.readLine()) != null) {
+                    if (!validFirst) {
+                        if (CONTENT_FIRST_LINE.matcher(line).matches()) {
+                            validFirst = true;
+                        } else {
+                            isValid = false;
+                            break;
+                        }
+                    }
+                    last = line;
+                }
+                if (!isValid || last == null || !CONTENT_LAST_LINE.matcher(last).matches()) {
+                    throw new RuntimeException("Malformed private key content");
+                }
+            } catch (Exception e) {
+                android.util.Log.d(SftpStorage.class.getName(), "Invalid key content", e);
+                throw e;
+            }
+
+            return content;
+        }
+    }
+}

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpStorage.java

@@ -2,20 +2,24 @@ package keepass2android.javafilestorage;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.KeyPair;
+import com.jcraft.jsch.Logger;
 import com.jcraft.jsch.Session;
 import com.jcraft.jsch.SftpATTRS;
 import com.jcraft.jsch.SftpException;
@@ -24,11 +28,40 @@ import com.jcraft.jsch.UserInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 
+@SuppressWarnings("unused")  // Exposed by JavaFileStorageBindings
 public class SftpStorage extends JavaFileStorageBase {
+	@FunctionalInterface
+	interface ValueResolver<T> {
+		/**
+		 * Takes a raw value and resolves it to either a String containing the String representation
+		 * of that value, or null. The latter signifying that the raw value could not be "resolved".
+		 *
+		 * @param value
+		 * @return String, or null if not resolvable
+		 */
+		String resolve(T value);
+	}
 
 	public static final int DEFAULT_SFTP_PORT = 22;
-	JSch jsch;
+	public static final int UNSET_SFTP_CONNECT_TIMEOUT = -1;
+	private static final String SFTP_CONNECT_TIMEOUT_OPTION_NAME = "connectTimeout";
+	private static final String SFTP_KEYNAME_OPTION_NAME = "key";
+	private static final String SFTP_KEYPASSPHRASE_OPTION_NAME = "phrase";
+
+	public static final String SSH_CFG_KEX = "kex";
+	public static final String SSH_CFG_SERVER_HOST_KEY = "server_host_key";
+	private static final Set<String> SSH_CFG_CSV_EXPANDABLE = Set.of(SSH_CFG_KEX, SSH_CFG_SERVER_HOST_KEY);
+	private static final ValueResolver<Integer> cTimeoutResolver = c ->
+			c == null || c == UNSET_SFTP_CONNECT_TIMEOUT ? null : String.valueOf(c);
+
+	private static final ValueResolver<String> nonBlankStringResolver = s ->
+			s == null || s.isBlank() ? null : s;
+
+	private static final String TAG = "KP2AJFS";
+	private static final String THREAD_TAG = TAG + "[thread]";
+	private JSch jsch;
 
 	public class ConnectionInfo
 	{
@@ -36,13 +69,42 @@ public class SftpStorage extends JavaFileStorageBase {
 		public String username;
 		public String password;
 		public String localPath;
+		public String keyName;
+		public String keyPassphrase;
 		public int port;
+		public int connectTimeoutSec = UNSET_SFTP_CONNECT_TIMEOUT;
+		public final Map<String, String> configOpts = new HashMap<>();
+
+
+		public String toString() {
+			return "ConnectionInfo{host=" + host + ",port=" + port + ",user=" + username +
+					",pwd=<hidden>,localPath=" + localPath + ",key=" + keyName +
+					",phrase=<hidden>,connectTimeout=" + connectTimeoutSec +
+					",cfgOpts=" + configOpts +
+					"}";
+		}
 	}
+
+	private static Map<String, String> buildOptionMap(ConnectionInfo ci, boolean includeSensitive) {
+		OptionMapBuilder b = new OptionMapBuilder()
+				.addOption(SFTP_CONNECT_TIMEOUT_OPTION_NAME, ci.connectTimeoutSec, cTimeoutResolver)
+				.addOption(SFTP_KEYNAME_OPTION_NAME, ci.keyName, nonBlankStringResolver);
+		// Assume all config options are not sensitive and use the same resolver...
+		for (Map.Entry<String, String> entry : ci.configOpts.entrySet()) {
+			b.addOption(entry.getKey(), entry.getValue(), nonBlankStringResolver);
+		}
+		if (includeSensitive) {
+			b.addOption(SFTP_KEYPASSPHRASE_OPTION_NAME, ci.keyPassphrase, nonBlankStringResolver);
+		}
+		return b.build();
+	}
+
 	Context _appContext;
+	private final SftpPublicPrivateKeyUtils _keyUtils;
 
 	public SftpStorage(Context appContext) {
 		_appContext = appContext;
-
+		_keyUtils = new SftpPublicPrivateKeyUtils(getBaseDir());
 	}
 
 	private static final String SFTP_PROTOCOL_ID = "sftp";
@@ -64,15 +126,15 @@ public class SftpStorage extends JavaFileStorageBase {
 
 	@Override
 	public InputStream openFileForRead(String path) throws Exception {
-
-		ChannelSftp c = init(path);
+		ConnectionInfo cInfo = splitStringToConnectionInfo(path);
+		ChannelSftp c = init(cInfo);
 
 		try {
 			byte[] buff = new byte[8000];
 
 			int bytesRead = 0;
 
-			InputStream in = c.get(extractSessionPath(path));
+			InputStream in = c.get(cInfo.localPath);
 			ByteArrayOutputStream bao = new ByteArrayOutputStream();
 
 			while ((bytesRead = in.read(buff)) != -1) {
@@ -104,14 +166,15 @@ public class SftpStorage extends JavaFileStorageBase {
 	public void uploadFile(String path, byte[] data, boolean writeTransactional)
 			throws Exception {
 
-		ChannelSftp c = init(path);
+		ConnectionInfo cInfo = splitStringToConnectionInfo(path);
+		ChannelSftp c = init(cInfo);
 		try {
 			InputStream in = new ByteArrayInputStream(data);
-			String targetPath = extractSessionPath(path);
+			String targetPath = cInfo.localPath;
 			if (writeTransactional)
 			{
 				//upload to temporary location:
-				String tmpPath = targetPath+".tmp";
+				String tmpPath = targetPath + ".tmp";
 				c.put(in, tmpPath);
 				//remove previous file:
 				try
@@ -127,9 +190,9 @@ public class SftpStorage extends JavaFileStorageBase {
 			}
 			else
 			{
-				c.put(in, targetPath);				
+				c.put(in, targetPath);
 			}
-			
+
 			tryDisconnect(c);
 		} catch (Exception e) {
 			tryDisconnect(c);
@@ -141,53 +204,98 @@ public class SftpStorage extends JavaFileStorageBase {
 	@Override
 	public String createFolder(String parentPath, String newDirName)
 			throws Exception {
-
+		ConnectionInfo cInfo = splitStringToConnectionInfo(parentPath);
 		try {
-			ChannelSftp c = init(parentPath);
-			String newPath = concatPaths(parentPath, newDirName);
-			c.mkdir(extractSessionPath(newPath));
+			ChannelSftp c = init(cInfo);
+			String newPath = concatPaths(cInfo.localPath, newDirName);
+			c.mkdir(newPath);
 			tryDisconnect(c);
-			return newPath;
+
+			return buildFullPath(cInfo.host, cInfo.port, newPath,
+					cInfo.username, cInfo.password, cInfo.connectTimeoutSec,
+					cInfo.keyName, cInfo.keyPassphrase,
+					cInfo.configOpts.get(SSH_CFG_KEX),
+					cInfo.configOpts.get(SSH_CFG_SERVER_HOST_KEY));
 		} catch (Exception e) {
 			throw convertException(e);
 		}
 
 	}
 
+	private String extractUserPwdHostPort(String path) {
+	    String withoutProtocol = path
+				.substring(getProtocolPrefix().length());
+		return withoutProtocol.substring(0, withoutProtocol.indexOf("/"));
+	}
+
 	private String extractSessionPath(String newPath) {
 		String withoutProtocol = newPath
 				.substring(getProtocolPrefix().length());
-		return withoutProtocol.substring(withoutProtocol.indexOf("/"));
+		int pathStartIdx = withoutProtocol.indexOf("/");
+		int pathEndIdx = withoutProtocol.indexOf("?");
+		if (pathEndIdx < 0) {
+			pathEndIdx = withoutProtocol.length();
+		}
+		return withoutProtocol.substring(pathStartIdx, pathEndIdx);
 	}
-	
-	private String extractUserPwdHost(String path) {
+
+	private Map<String, String> extractOptionsMap(String path) throws UnsupportedEncodingException {
 		String withoutProtocol = path
 				.substring(getProtocolPrefix().length());
-		return withoutProtocol.substring(0,withoutProtocol.indexOf("/"));
+
+		Map<String, String> options = new HashMap<>();
+
+		int extraOptsIdx = withoutProtocol.indexOf("?");
+		if (extraOptsIdx > 0 && extraOptsIdx + 1 < withoutProtocol.length()) {
+			String optsString = withoutProtocol.substring(extraOptsIdx + 1);
+			String[] parts = optsString.split("&");
+			for (String p : parts) {
+				int sepIdx = p.indexOf('=');
+				if (sepIdx > 0) {
+					String key = decode(p.substring(0, sepIdx));
+					String value = decode(p.substring(sepIdx + 1));
+					options.put(key, value);
+				} else {
+					options.put(decode(p), "true");
+				}
+			}
+		}
+		return options;
 	}
 
 	private String concatPaths(String parentPath, String newDirName) {
-		String res = parentPath;
-		if (!res.endsWith("/"))
-			res += "/";
-		res += newDirName;
-		return res;
+		StringBuilder fp = new StringBuilder(parentPath);
+		if (!parentPath.endsWith("/"))
+			fp.append("/");
+		return fp.append(newDirName).toString();
 	}
 
 	@Override
-	public String createFilePath(String parentPath, String newFileName)
+	public String createFilePath(final String parentUri, String newFileName)
 			throws Exception {
-		if (parentPath.endsWith("/") == false)
-			parentPath += "/";
-		return parentPath + newFileName;
+
+		String parentPath = parentUri;
+		String params = null;
+		int paramsIdx = parentUri.lastIndexOf("?");
+		if (paramsIdx > 0) {
+			params = parentUri.substring(paramsIdx);
+			parentPath = parentPath.substring(0, paramsIdx);
+		}
+
+		String newPath = concatPaths(parentPath, newFileName);
+
+		if (params != null) {
+			newPath += params;
+		}
+		return newPath;
 	}
 
 	@Override
 	public List<FileEntry> listFiles(String parentPath) throws Exception {
+		ConnectionInfo cInfo = splitStringToConnectionInfo(parentPath);
+		ChannelSftp c = init(cInfo);
 
-		ChannelSftp c = init(parentPath);
 		return listFiles(parentPath, c);
-
 	}
 
 	private void setFromAttrs(FileEntry fileEntry, SftpATTRS attrs) {
@@ -211,23 +319,27 @@ public class SftpStorage extends JavaFileStorageBase {
 			if (sftpEx.id == ChannelSftp.SSH_FX_NO_SUCH_FILE)
 				return new FileNotFoundException(sftpEx.getMessage());
 		}
-		
+
 		return e;
 
 	}
 
 	@Override
 	public FileEntry getFileEntry(String filename) throws Exception {
-
-		ChannelSftp c = init(filename);
+		ConnectionInfo cInfo = splitStringToConnectionInfo(filename);
+		ChannelSftp c = init(cInfo);
 		try {
 			FileEntry fileEntry = new FileEntry();
-			String sessionPath = extractSessionPath(filename);
-			SftpATTRS attr = c.stat(sessionPath);
+			SftpATTRS attr = c.stat(cInfo.localPath);
 			setFromAttrs(fileEntry, attr);
+
+			// Full URI
 			fileEntry.path = filename;
-			fileEntry.displayName = getFilename(sessionPath);
+
+			fileEntry.displayName = getFilename(cInfo.localPath);
+
 			tryDisconnect(c);
+
 			return fileEntry;
 		} catch (Exception e) {
 			logDebug("Exception in getFileEntry! " + e);
@@ -238,8 +350,9 @@ public class SftpStorage extends JavaFileStorageBase {
 
 	@Override
 	public void delete(String path) throws Exception {
+		ConnectionInfo cInfo = splitStringToConnectionInfo(path);
+		ChannelSftp c = init(cInfo);
 
-		ChannelSftp c = init(path);
 		delete(path, c);
 	}
 
@@ -263,10 +376,11 @@ public class SftpStorage extends JavaFileStorageBase {
 			tryDisconnect(c);
 			throw convertException(e);
 		}
-		
+
 	}
 
 	private List<FileEntry> listFiles(String path, ChannelSftp c) throws Exception {
+
 		try {
 			List<FileEntry> res = new ArrayList<FileEntry>();
 			@SuppressWarnings("rawtypes")
@@ -282,7 +396,7 @@ public class SftpStorage extends JavaFileStorageBase {
 								||(lsEntry.getFilename().equals(".."))
 								)
 							continue;
-						
+
 						FileEntry fileEntry = new FileEntry();
 						fileEntry.displayName = lsEntry.getFilename();
 						fileEntry.path = createFilePath(path, fileEntry.displayName);
@@ -312,96 +426,192 @@ public class SftpStorage extends JavaFileStorageBase {
 			throws UnsupportedEncodingException {
 		return java.net.URLDecoder.decode(encodedString, UTF_8);
 	}
-	
+
 	@Override
 	protected String encode(final String unencoded)
 			throws UnsupportedEncodingException {
 		return java.net.URLEncoder.encode(unencoded, UTF_8);
 	}
-	
-	ChannelSftp init(String filename) throws JSchException, UnsupportedEncodingException {
+
+
+	ChannelSftp init(ConnectionInfo cInfo) throws JSchException, UnsupportedEncodingException {
 		jsch = new JSch();
-		ConnectionInfo ci = splitStringToConnectionInfo(filename);
+
+		Log.d(TAG, "init SFTP");
 
 		String base_dir = getBaseDir();
 		jsch.setKnownHosts(base_dir + "/known_hosts");
 
-		String key_filename = getKeyFileName();
-		try{
-			createKeyPair(key_filename);
-		} catch (Exception ex) {
-			System.out.println(ex);
-		}
+		String key_filepath = _keyUtils.resolveKeyFilePath(jsch, cInfo.keyName);
 
 		try {
-			jsch.addIdentity(key_filename);
-		} catch (java.lang.Exception e)
-		{
+			jsch.addIdentity(key_filepath);
+		} catch (java.lang.Exception e) {
 
 		}
 
-		Session session = jsch.getSession(ci.username, ci.host, ci.port);
-		UserInfo ui = new SftpUserInfo(ci.password,_appContext);
-		session.setUserInfo(ui);
+		Log.e(THREAD_TAG, "getting session...");
+		Session session = jsch.getSession(cInfo.username, cInfo.host, cInfo.port);
 
-		session.setConfig("PreferredAuthentications", "publickey,password");
-
-		session.connect();
+		sessionConfigure(session, cInfo);
+		sessionConnect(session, cInfo);
 
 		Channel channel = session.openChannel("sftp");
 		channel.connect();
 		ChannelSftp c = (ChannelSftp) channel;
 
-		logDebug("success: init Sftp");
 		return c;
 
 	}
 
+	private void sessionConnect(Session session, ConnectionInfo cInfo) throws JSchException {
+		if (cInfo.connectTimeoutSec != UNSET_SFTP_CONNECT_TIMEOUT) {
+			session.connect(cInfo.connectTimeoutSec * 1000);
+		} else {
+			session.connect();
+		}
+	}
+
+	private void sessionConfigure(Session session, ConnectionInfo cInfo) {
+		Log.e(TAG, "creating SftpUserInfo");
+		UserInfo ui = new SftpUserInfo(cInfo.password, cInfo.keyPassphrase, _appContext);
+		session.setUserInfo(ui);
+
+		session.setConfig("PreferredAuthentications", "publickey,password");
+
+		for (Map.Entry<String, String> e : cInfo.configOpts.entrySet()) {
+			String cfgKey = e.getKey();
+			String before = session.getConfig(cfgKey);
+			String after = e.getValue();
+
+			if (SSH_CFG_CSV_EXPANDABLE.contains(cfgKey)) {
+				SshConfigCsvValueResolver resolver = new SshConfigCsvValueResolver(cfgKey, after);
+				after = resolver.resolve(before);
+			}
+			session.setConfig(cfgKey, after);
+		}
+	}
+
 	private String getBaseDir() {
 		return _appContext.getFilesDir().getAbsolutePath();
 	}
 
-	private String getKeyFileName() {
-		return getBaseDir() + "/id_kp2a_rsa";
+	public boolean deleteCustomKey(String keyName) throws FileNotFoundException {
+		return _keyUtils.deleteCustomKey(keyName);
 	}
 
+	public String[] getCustomKeyNames() {
+		return _keyUtils.getCustomKeyNames();
+	}
+
+	@SuppressWarnings("unused")  // Exposed by JavaFileStorageBindings
 	public String createKeyPair() throws IOException, JSchException {
-		return createKeyPair(getKeyFileName());
-
+		return _keyUtils.createKeyPair(jsch);
 	}
 
-	private String createKeyPair(String key_filename) throws JSchException, IOException {
-		String public_key_filename = key_filename + ".pub";
-		File file = new File(key_filename);
-		if (file.exists())
-			return public_key_filename;
-		int type = KeyPair.RSA;
-		KeyPair kpair = KeyPair.genKeyPair(jsch, type, 4096);
-		kpair.writePrivateKey(key_filename);
+	@SuppressWarnings("unused")  // Exposed by JavaFileStorageBindings
+	public void savePrivateKeyContent(String keyName, String keyContent) throws IOException, Exception {
+		_keyUtils.savePrivateKeyContent(keyName, keyContent);
+	}
 
-		kpair.writePublicKey(public_key_filename, "generated by Keepass2Android");
-		//ret = "Fingerprint: " + kpair.getFingerPrint();
-		kpair.dispose();
-		return public_key_filename;
+	@SuppressWarnings("unused")  // Exposed by JavaFileStorageBindings
+	public void setJschLogging(boolean enabled, String logFilename) {
+		Logger impl = null;
+		if (enabled) {
+			if (logFilename != null) {
+				impl = Kp2aJSchLogger.createFileLogger(logFilename);
+			} else {
+				impl = Kp2aJSchLogger.createAndroidLogger();
+			}
+		}
+		JSch.setLogger(impl);
+	}
 
+	/**
+	 * Exposed for testing purposes only.
+	 * @param keyName
+	 * @return
+	 */
+	public String sanitizeCustomKeyName(String keyName) {
+		return _keyUtils.getSanitizedCustomKeyName(keyName);
+	}
+
+	/**
+	 * Exposed for testing purposes only.
+	 * @param keyContent
+	 * @return
+	 * @throws Exception
+	 */
+	public String getValidatedCustomKeyContent(String keyContent) throws Exception {
+		return _keyUtils.getValidatedCustomKeyContent(keyContent);
+	}
+
+	/**
+	 * Exposed for testing purposes only.
+	 * @param currentValues
+	 * @param spec
+	 * @return
+	 * @throws Exception
+	 */
+	public String resolveCsvValues(String currentValues, String spec) {
+		return new SshConfigCsvValueResolver("test", spec)
+				.resolve(currentValues);
 	}
 
 	public ConnectionInfo splitStringToConnectionInfo(String filename)
 			throws UnsupportedEncodingException {
+
 		ConnectionInfo ci = new ConnectionInfo();
-		ci.host = extractUserPwdHost(filename);
+		ci.host = extractUserPwdHostPort(filename);
+
 		String userPwd = ci.host.substring(0, ci.host.indexOf('@'));
-		ci.username = decode(userPwd.substring(0, userPwd.indexOf(":")));
-		ci.password = decode(userPwd.substring(userPwd.indexOf(":")+1));
+		int sepIdx = userPwd.indexOf(":");
+		if (sepIdx > 0) {
+			ci.username = decode(userPwd.substring(0, sepIdx));
+			ci.password = decode(userPwd.substring(sepIdx + 1));
+		} else {
+			ci.username = userPwd;
+			ci.password = null;
+		}
+
 		ci.host = ci.host.substring(ci.host.indexOf('@') + 1);
 		ci.port = DEFAULT_SFTP_PORT;
-		int portSeparatorIndex = ci.host.indexOf(":");
+
+		int portSeparatorIndex = ci.host.lastIndexOf(':');
 		if (portSeparatorIndex >= 0)
 		{
-			ci.port = Integer.parseInt(ci.host.substring(portSeparatorIndex+1));
+			ci.port = Integer.parseInt(ci.host.substring(portSeparatorIndex + 1));
 			ci.host = ci.host.substring(0, portSeparatorIndex);
 		}
+		// Encode/decode required to support IPv6 (colons break host:port parse logic)
+		// See Bug #2350
+		ci.host = decode(ci.host);
+
 		ci.localPath = extractSessionPath(filename);
+
+		Map<String, String> options = extractOptionsMap(filename);
+
+		if (options.containsKey(SFTP_CONNECT_TIMEOUT_OPTION_NAME)) {
+			String optVal = options.get(SFTP_CONNECT_TIMEOUT_OPTION_NAME);
+			try {
+				ci.connectTimeoutSec = Integer.parseInt(optVal);
+			} catch (NumberFormatException nan) {
+				logDebug(SFTP_CONNECT_TIMEOUT_OPTION_NAME + " option not a number: " + optVal);
+			}
+		}
+		if (options.containsKey(SFTP_KEYNAME_OPTION_NAME)) {
+			ci.keyName = options.get(SFTP_KEYNAME_OPTION_NAME);
+		}
+		if (options.containsKey(SFTP_KEYPASSPHRASE_OPTION_NAME)) {
+			ci.keyPassphrase = options.get(SFTP_KEYPASSPHRASE_OPTION_NAME);
+		}
+
+		for (String cfgKey : SSH_CFG_CSV_EXPANDABLE) {
+			if (options.containsKey(cfgKey)) {
+				ci.configOpts.put(cfgKey, options.get(cfgKey));
+			}
+		}
+
 		return ci;
 	}
 
@@ -438,12 +648,18 @@ public class SftpStorage extends JavaFileStorageBase {
 		try
 		{
 			ConnectionInfo ci = splitStringToConnectionInfo(path);
-			return getProtocolPrefix()+ci.username+"@"+ci.host+ci.localPath;
+			StringBuilder dName = new StringBuilder(getProtocolPrefix())
+					.append(ci.username)
+					.append("@")
+					.append(ci.host)
+					.append(ci.localPath);
+			appendOptions(dName, buildOptionMap(ci, false));
+			return dName.toString();
 		}
 		catch (Exception e)
 		{
 			return extractSessionPath(path);
-		}		
+		}
 	}
 
 	@Override
@@ -465,22 +681,105 @@ public class SftpStorage extends JavaFileStorageBase {
 	@Override
 	public void onActivityResult(FileStorageSetupActivity activity,
 			int requestCode, int resultCode, Intent data) {
-		
+
 
 	}
 
-	public String buildFullPath( String host, int port, String localPath, String username, String password) throws UnsupportedEncodingException
-	{
-		if (port != DEFAULT_SFTP_PORT)
-			host += ":"+String.valueOf(port);
-		return getProtocolPrefix()+encode(username)+":"+encode(password)+"@"+host+localPath;
-		
+	public String buildFullPath(String host, int port, String localPath,
+										String username, String password,
+										int connectTimeoutSec,
+										String keyName, String keyPassphrase,
+										String kexAlgorithms, String shkAlgorithms)
+			throws UnsupportedEncodingException {
+
+		StringBuilder uri = new StringBuilder(getProtocolPrefix()).append(encode(username));
+		if (password != null) {
+			uri.append(":").append(encode(password));
+		}
+		uri.append("@");
+		// Encode/decode required to support IPv6 (colons break host:port parse logic)
+		// See Bug #2350
+		uri.append(encode(host));
+
+		if (port != DEFAULT_SFTP_PORT) {
+			uri.append(":").append(port);
+		}
+		if (localPath != null && localPath.startsWith("/")) {
+			uri.append(localPath);
+		}
+
+		appendOptions(uri, new OptionMapBuilder()
+				.addOption(SFTP_CONNECT_TIMEOUT_OPTION_NAME, connectTimeoutSec, cTimeoutResolver)
+				.addOption(SFTP_KEYNAME_OPTION_NAME, keyName, nonBlankStringResolver)
+				.addOption(SFTP_KEYPASSPHRASE_OPTION_NAME, keyPassphrase, nonBlankStringResolver)
+				.addOption(SSH_CFG_KEX, kexAlgorithms, nonBlankStringResolver)
+				.addOption(SSH_CFG_SERVER_HOST_KEY, shkAlgorithms, nonBlankStringResolver)
+				.build());
+
+		return uri.toString();
+	}
+
+	private void appendOptions(StringBuilder uri, Map<String, String> opts)
+			throws UnsupportedEncodingException {
+
+		boolean first = true;
+		// Sort for stability/consistency
+		Set<Map.Entry<String, String>> sortedEntries = new TreeSet<>(new EntryComparator<>());
+		sortedEntries.addAll(opts.entrySet());
+		for (Map.Entry<String, String> me : sortedEntries) {
+			if (first) {
+				uri.append("?");
+				first = false;
+			} else {
+				uri.append("&");
+			}
+			uri.append(encode(me.getKey())).append("=").append(encode(me.getValue()));
+		}
 	}
 
 
 	@Override
 	public void prepareFileUsage(Context appContext, String path) {
 		//nothing to do
-		
+
+	}
+
+	/**
+	 * A comparator that compares Map.Entry objects by their keys, via natural ordering.
+	 *
+	 * @param <T> the Map.Entry key type, that must implement Comparable.
+	 */
+	private static class EntryComparator<T extends Comparable<T>> implements Comparator<Map.Entry<T, ?>> {
+		@Override
+		public int compare(Map.Entry<T, ?> o1, Map.Entry<T, ?> o2) {
+			return o1.getKey().compareTo(o2.getKey());
+		}
+	}
+
+	private static class OptionMapBuilder {
+		private final Map<String, String> options = new HashMap<>();
+
+		/**
+		 * Attempts to add a raw value <code>oVal</code> to the underlying option map with key <code>oName</code>
+		 * iff the <code>resolver</code> produces a non-null output when invoked using the raw value.
+		 *
+		 * @param oName the name/key associated with the value, if added
+		 * @param oVal the raw value attempting to be added
+		 * @param resolver the resolver that determines if the value will be added
+		 *
+		 * @return OptionMapBuilder (updated)
+		 * @param <T> the raw value type
+		 */
+		<T> OptionMapBuilder addOption(final String oName, T oVal, ValueResolver<T> resolver) {
+			String resolved = resolver.resolve(oVal);
+			if (resolved != null) {
+				options.put(oName, resolved);
+			}
+			return this;
+		}
+
+		Map<String, String> build() {
+			return new HashMap<>(options);
+		}
 	}
 }

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpUserInfo.java

@@ -34,7 +34,6 @@ public class SftpUserInfo implements UserInfo {
 				builder.setContentText("SFTP prompt");
 				builder.setSmallIcon(R.drawable.ic_logo_green_foreground);
 
-
 				Handler h = new Handler() {
 					public void handleMessage(Message M) {
 						msg.copyFrom(M);
@@ -51,7 +50,16 @@ public class SftpUserInfo implements UserInfo {
 				intent.putExtra("keepass2android.sftp.prompt", text);
 				intent.setData((Uri.parse("suckit://"+SystemClock.elapsedRealtime())));
 
-				PendingIntent contentIntent = PendingIntent.getActivity(_appContext, 0, intent, 0);
+
+				Log.e("KP2AJFS[thread]", "built after 2023-03-14");
+
+				int flags = 0;
+				if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+					Log.e("KP2AJFS[thread]", "Setting mutable flag...");
+					flags |= PendingIntent.FLAG_MUTABLE;
+				}
+				PendingIntent contentIntent = PendingIntent.getActivity(_appContext, 0, intent, flags);
+
 				builder.setContentIntent(contentIntent);
 
 				{
@@ -108,17 +116,19 @@ public class SftpUserInfo implements UserInfo {
 	Context _appContext;
 
 	String _password;
+	String _passphrase;
 	
-	public SftpUserInfo(String password, Context appContext)
+	public SftpUserInfo(String password, String passphrase, Context appContext)
 	{
 		_password = password;
+		_passphrase = passphrase;
 		_appContext = appContext;
 	}
 
 	@Override
 	public String getPassphrase() {
-		
-		return null;
+
+		return _passphrase;
 	}
 
 	@Override
@@ -129,12 +139,12 @@ public class SftpUserInfo implements UserInfo {
 
 	@Override
 	public boolean promptPassword(String message) {
-		return true;
+		return _password != null;
 	}
 
 	@Override
 	public boolean promptPassphrase(String message) {
-		return false; //passphrase not supported
+		return _passphrase != null;
 	}
 
 	@Override

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SshConfigCsvValueResolver.java

@@ -0,0 +1,178 @@
+package keepass2android.javafilestorage;
+
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A class that manipulates CSV String values based on a list of CSV "spec" definitions, where each definition
+ * can describe one of the following:
+ *
+ *   - Prepend to existing list: +something
+ *   - Append to end of existing list: something+
+ *   - Remove a specific value: -something
+ *   - Remove values matching prefix: -something*
+ *   - Remove values matching suffix: -*something
+ *   - Remove values matching substring: -*something*
+ *   - Remove values matching prefix and suffix: -some*thing
+ *
+ *  Otherwise CSV of values completely replace original config values
+ *  
+ *  Examples:
+ *  <code>
+ *    var r = new SshConfigCsvValueResolver("foo", "addToEnd+,-remove*,+addToBeginning,-*del*");
+ *    r.resolve("one,removeTwo,three,removeThree,four") --> "addToBeginning,one,three,four,addToEnd"
+ *    r.resolve("one,my-del,del-me,two,foodelbar,three") --> "addToBeginning,one,two,three,addToEnd"
+ *
+ *    r = new SshConfigCsvValueResolver("foo", "replace,the,config");
+ *    r.resolve("one,two,three,four") --> "replace,the,config"
+ *  </code>
+ *
+ */
+class SshConfigCsvValueResolver {
+    interface Matcher {
+        boolean matches(String s);
+    }
+    private final String cfgKey;
+    private static final String TAG = "KP2AJFS[sshcfg]";
+
+    private static final String DELIM = ",";
+    private static final char ADD = '+';
+    private static final char REMOVE = '-';
+    private static final char WILD = '*';
+    private final List<String> prepends;
+    private final List<String> appends;
+    private final List<Matcher> removes;
+    private final List<String> replaces;
+
+    /**
+     * Creates a new resolver.
+     *
+     * @param cfgKey - configuration key name (used for logging)
+     * @param incomingSpec - A CSV String of "spec" definitions that will be used to
+     *                     (potentially) modify incoming CSV String values.
+     */
+    SshConfigCsvValueResolver(String cfgKey, String incomingSpec) {
+        List<String> prepends = new ArrayList<>();
+        List<String> appends = new ArrayList<>();
+        List<Matcher> removes = new ArrayList<>();
+        List<String> replaces = new ArrayList<>();
+
+        for (String iVal : incomingSpec.split(DELIM)) {
+            if (iVal.isBlank()) {
+                continue;
+            }
+            int evLen = iVal.length();
+            if (iVal.charAt(0) == ADD && evLen > 1) {
+                prepends.add(iVal.substring(1));
+            } else if (iVal.charAt(iVal.length() - 1) == ADD && evLen > 1) {
+                appends.add(iVal.substring(0, evLen - 1));
+            } else if (iVal.charAt(iVal.length() - 1) == REMOVE && evLen > 1) {
+                removes.add(createMatcher(iVal.substring(1)));
+            } else {
+                // This looks like a straight replace
+                replaces.add(iVal);
+            }
+        }
+        this.cfgKey = cfgKey;
+        this.prepends = Collections.unmodifiableList(prepends);
+        this.appends = Collections.unmodifiableList(appends);
+        this.removes = Collections.unmodifiableList(removes);
+        this.replaces = Collections.unmodifiableList(replaces);
+    }
+
+    /**
+     * Takes a CSV String and (potentially) modifies it according to the "spec" entries of this resolver.
+     *
+     * @param existingValues - the original CSV String
+     * @return an updated representation of <code>existingValues</code>, based on the defined "spec"
+     *         entries of this resolver.
+     */
+    public String resolve(String existingValues) {
+        List<String> newValues;
+        // If there's even one replace, it wins over everything and the rest is thrown out
+        if (!replaces.isEmpty()) {
+            if (!(prepends.isEmpty() || appends.isEmpty() || removes.isEmpty())) {
+                Log.w(TAG, "Discarded SSH cfg parts: key=" + cfgKey +
+                        ", prepends=" + prepends + ", appends=" + appends +
+                        ", removes=" + removes);
+            }
+            newValues = replaces;
+        } else {
+            // Otherwise we rebuild from existing and incoming values
+            newValues = createResolvedValues(existingValues);
+        }
+        return String.join(DELIM, newValues);
+    }
+
+    private List<String> createResolvedValues(String existingValues) {
+        List<String> newValues = new ArrayList<>(prepends);
+        for (String a : existingValues.split(DELIM)) {
+            if (!shouldRemove(a)) {
+                newValues.add(a);
+            }
+        }
+        newValues.addAll(appends);
+        return newValues;
+    }
+
+    private boolean shouldRemove(String s) {
+        s = normalize(s);
+        for (Matcher m : removes) {
+            if (m.matches(s)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private Matcher createMatcher(String val) {
+        final String v = normalize(val);
+        Matcher impl = s -> v.equals(s);
+
+        int wildcardIdx = v.indexOf(WILD);
+        if (wildcardIdx < 0) {
+            return impl;
+        }
+
+        // *blah     *blah*     blah*       some*thing
+        // endsWith  substring  startsWith  startsWith && endsWith
+        String subStr = null;
+        String suffix = null;
+        String prefix = null;
+        int vLen = v.length();
+
+        if (v.charAt(0) == WILD && vLen > 1) {
+            if (vLen > 2 && v.charAt(vLen - 1) == WILD) {
+                //substring
+                subStr = v.substring(1, vLen - 1);
+            } else {
+                // endsWith
+                suffix = v.substring(1);
+            }
+        } else if (v.charAt(vLen - 1) == WILD && vLen > 1) {
+            // beginsWith
+            prefix = v.substring(0, v.length() - 1);
+        } else if (wildcardIdx > 0) {
+            // startsWith && endsWith
+            prefix = v.substring(0, wildcardIdx);
+            suffix = v.substring(wildcardIdx + 1);
+        }
+
+        if (subStr != null) {
+            final String sub = subStr;
+            impl = s -> s.contains(sub);
+        } else if (prefix != null || suffix != null) {
+            final String pre = prefix;
+            final String suf = suffix;
+            impl = s -> (pre == null || s.startsWith(pre)) && (suf == null || s.endsWith(suf));
+        }
+        return impl;
+    }
+
+    private static String normalize(String s) {
+        return s == null ? null : s.toLowerCase();
+    }
+}

src/java/JavaFileStorage/gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536m

src/java/JavaFileStorage/settings.gradle

@@ -0,0 +1 @@
+include ':app'

src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java

@@ -148,6 +148,7 @@ import java.util.List;
 import keepass2android.javafilestorage.GoogleDriveAppDataFileStorage;
 import keepass2android.javafilestorage.JavaFileStorage;
 import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
+import keepass2android.javafilestorage.PCloudFileStorage;
 import keepass2android.javafilestorage.SftpStorage;
 import keepass2android.javafilestorage.UserInteractionRequiredException;
 import keepass2android.javafilestorage.WebDavStorage;
@@ -539,11 +540,11 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 
 	static JavaFileStorage createStorageToTest(Context ctx, Context appContext, boolean simulateRestart) {
 		//storageToTest = new SftpStorage(ctx.getApplicationContext());
-		//storageToTest = new PCloudFileStorage(ctx, "yCeH59Ffgtm");
+		storageToTest = new PCloudFileStorage(ctx, "FLm22de7bdS", "pcloud", "pcloudtest");
 		//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
 
 
-		storageToTest = new GoogleDriveAppDataFileStorage();
+		//storageToTest = new GoogleDriveAppDataFileStorage();
 		/*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
 			@Override
 			public boolean onValidationError(String error) {
@@ -690,6 +691,13 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 		return sb.toString();
 	}
 
+	private void populateCsvMockValues(View view) {
+		EditText etSpecs = view.findViewById(R.id.mock_csv_specs);
+		etSpecs.setText("-bar,+first,-*d*");
+		EditText etCfgs = view.findViewById(R.id.mock_csv_cfg);
+		etCfgs.setText("foo,del1,bar,del2");
+	}
+
 	@Override
 	public void performManualFileSelect(boolean isForSave, final int requestCode,
 			String protocolId)
@@ -697,12 +705,13 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 		if (protocolId.equals("sftp"))
 		{
 			final View view = getLayoutInflater().inflate(R.layout.sftp_credentials, null);
+			final SftpStorage sftpStorage = (SftpStorage)storageToTest;
+
+			populateCsvMockValues(view);
 
 			view.findViewById(R.id.send_public_key).setOnClickListener(v -> {
 				Intent sendIntent = new Intent();
 
-
-                SftpStorage sftpStorage = (SftpStorage)storageToTest;
                 try {
                     String pub_filename = sftpStorage.createKeyPair();
 
@@ -715,39 +724,140 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
                 }
                 catch (Exception ex)
                 {
-                    Toast.makeText(this,"Failed to create key pair: " + ex.getMessage(), Toast.LENGTH_LONG);
-                    return;
+                    Toast.makeText(this,"Failed to create key pair: " + ex.getMessage(), Toast.LENGTH_LONG).show();
                 }
-
-
 			});
+
+			view.findViewById(R.id.list_private_keys).setOnClickListener(v -> {
+				String[] keys = sftpStorage.getCustomKeyNames();
+				Toast.makeText(this, "keys: " + String.join(",", keys), Toast.LENGTH_LONG).show();
+			});
+
+			view.findViewById(R.id.add_private_key).setOnClickListener(v -> {
+				EditText etKeyName = view.findViewById(R.id.private_key_name);
+				String keyName = etKeyName.getText().toString();
+				EditText etKeyContent = view.findViewById(R.id.private_key_content);
+				String keyContent = etKeyContent.getText().toString();
+
+				try {
+					sftpStorage.savePrivateKeyContent(keyName, keyContent);
+					Toast.makeText(this, "Add successful", Toast.LENGTH_LONG).show();
+				}
+				catch (Exception e) {
+					Toast.makeText(this, "Add failed: " + e.getMessage(), Toast.LENGTH_LONG).show();
+				}
+			});
+
+			view.findViewById(R.id.delete_private_key).setOnClickListener(v -> {
+				EditText etKeyName = view.findViewById(R.id.private_key_name);
+				String keyName = etKeyName.getText().toString();
+
+				String exMessage = null;
+				boolean success = false;
+				try {
+					success = sftpStorage.deleteCustomKey(keyName);
+				}
+				catch (Exception e) {
+					exMessage = e.getMessage();
+				}
+				StringBuilder msg = new StringBuilder("Delete ");
+				msg.append(success ? "succeeded" : "FAILED");
+				if (exMessage != null) {
+					msg.append(" (").append(exMessage).append(")");
+				}
+				Toast.makeText(this, msg.toString(), Toast.LENGTH_LONG).show();
+			});
+
+			view.findViewById(R.id.validate_private_key).setOnClickListener(v -> {
+				EditText etKeyName = view.findViewById(R.id.private_key_name);
+				String inKeyName = etKeyName.getText().toString();
+
+				if (!inKeyName.isEmpty()) {
+					String keyResponse;
+					try {
+						keyResponse = sftpStorage.sanitizeCustomKeyName(inKeyName);
+					} catch (Exception e) {
+						keyResponse = "EX:" + e.getMessage();
+					}
+					String msg = "key: [" + inKeyName + "] -> [" + keyResponse + "]";
+					Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+				}
+
+				EditText etKeyContent = view.findViewById(R.id.private_key_content);
+				String inKeyContent = etKeyContent.getText().toString();
+				String msg;
+				if (!inKeyContent.isEmpty()) {
+					try {
+						// We could print the key, but I don't it's that helpful
+						sftpStorage.getValidatedCustomKeyContent(inKeyContent);
+						msg = "Key content is valid";
+					} catch (Exception e) {
+						msg = "Invalid key content: " + e.getMessage();
+					}
+					Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+				}
+			});
+
+			view.findViewById(R.id.resolve_mock_csv).setOnClickListener(v -> {
+				EditText etSpecs = view.findViewById(R.id.mock_csv_specs);
+				String specs = etSpecs.getText().toString();
+				EditText etCfg = view.findViewById(R.id.mock_csv_cfg);
+				String cfg = etCfg.getText().toString();
+				if (!specs.isBlank() && !cfg.isBlank()) {
+					String result = sftpStorage.resolveCsvValues(cfg, specs);
+					Toast.makeText(this, result, Toast.LENGTH_LONG).show();
+				}
+			});
+
+			view.findViewById(R.id.reset_mock_csv).setOnClickListener(v -> {
+				populateCsvMockValues(view);
+			});
+
 			new AlertDialog.Builder(this)
 					.setView(view)
 					.setTitle("Enter SFTP credentials")
-					.setPositiveButton("OK",new DialogInterface.OnClickListener() {
+					.setPositiveButton("OK", (dialog, which) -> {
 
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
+						Toast.makeText(MainActivity.this, "Hey", Toast.LENGTH_LONG).show();
 
-							Toast.makeText(MainActivity.this, "Hey", Toast.LENGTH_LONG).show();
-
-							SftpStorage sftpStorage = (SftpStorage)storageToTest;
-							try {
-								EditText etHost = ((EditText)view.findViewById(R.id.sftp_host));
-								String host = etHost.getText().toString();
-								EditText etUser = ((EditText)view.findViewById(R.id.sftp_user));
-								String user = etUser.getText().toString();
-								EditText etPwd = ((EditText)view.findViewById(R.id.sftp_password));
-								String pwd = etPwd.getText().toString();
-								EditText etPort = ((EditText)view.findViewById(R.id.sftp_port));
-								int port = Integer.parseInt(etPort.getText().toString());
-								EditText etInitDir = ((EditText)view.findViewById(R.id.sftp_initial_dir));
-								String initialDir = etInitDir.getText().toString();
-								onReceivePathForFileSelect(requestCode, sftpStorage.buildFullPath( host, port, initialDir, user, pwd));
-							} catch (UnsupportedEncodingException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
+						SftpStorage sftpStorage1 = (SftpStorage)storageToTest;
+						try {
+							EditText etHost = view.findViewById(R.id.sftp_host);
+							String host = etHost.getText().toString();
+							EditText etUser = view.findViewById(R.id.sftp_user);
+							String user = etUser.getText().toString();
+							EditText etPwd = view.findViewById(R.id.sftp_password);
+							String pwd = etPwd.getText().toString();
+							EditText etPort = view.findViewById(R.id.sftp_port);
+							int port = Integer.parseInt(etPort.getText().toString());
+							EditText etInitDir = view.findViewById(R.id.sftp_initial_dir);
+							String initialDir = etInitDir.getText().toString();
+							EditText etConnectTimeout = view.findViewById(R.id.sftp_connect_timeout);
+							int connectTimeout = SftpStorage.UNSET_SFTP_CONNECT_TIMEOUT;
+							String ctStr = etConnectTimeout.getText().toString();
+							if (!ctStr.isEmpty()) {
+								try {
+									int ct = Integer.parseInt(ctStr);
+									if (connectTimeout != ct) {
+										connectTimeout = ct;
+									}
+								} catch (NumberFormatException parseEx) {
+								}
 							}
+							EditText etKeyName = view.findViewById(R.id.private_key_name);
+							String keyName = etKeyName.getText().toString();
+							EditText etKeyPassphrase = view.findViewById(R.id.private_key_passphrase);
+							String keyPassphrase = etKeyPassphrase.getText().toString();
+							EditText etKex = view.findViewById(R.id.kex);
+							String kex = etKex.getText().toString();
+							EditText etShk = view.findViewById(R.id.shk);
+							String shk = etShk.getText().toString();
+
+							onReceivePathForFileSelect(requestCode, sftpStorage1.buildFullPath(
+									host, port, initialDir, user, pwd, connectTimeout,
+									keyName, keyPassphrase, kex, shk));
+						} catch (UnsupportedEncodingException e) {
+							e.printStackTrace();
 						}
 					})
 					.create()

src/java/JavaFileStorageTest-AS/app/src/main/res/layout/sftp_credentials.xml

@@ -3,69 +3,217 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_margin="12dip"
-    >
-	<LinearLayout
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-		<EditText
+    android:layout_margin="12dip">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <EditText
             android:id="@+id/sftp_host"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="10"
             android:singleLine="true"
             android:inputType="textNoSuggestions"
             android:text=""
-			android:hint="@string/hint_sftp_host" />
-	  <TextView
+            android:hint="@string/hint_sftp_host" />
+        <TextView
             android:id="@+id/portsep"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=":" />
-	<EditText
+        <EditText
             android:id="@+id/sftp_port"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="15"
             android:singleLine="true"
-			android:inputType="number"
-			android:text="22" 
-			android:hint="@string/hint_sftp_port" />
- </LinearLayout>
- <EditText
+            android:inputType="number"
+            android:text="22"
+            android:hint="@string/hint_sftp_port" />
+        <EditText
+            android:id="@+id/sftp_connect_timeout"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="14"
+            android:singleLine="true"
+            android:inputType="number"
+            android:text=""
+            android:hint="@string/hint_sftp_connect_timeout" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <EditText
             android:id="@+id/sftp_user"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:singleLine="true"
             android:text=""
-			android:hint="@string/hint_username" />
-		
-	<EditText
+            android:hint="@string/hint_username" />
+        <EditText
             android:id="@+id/sftp_password"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:inputType="textPassword"
             android:singleLine="true"
             android:text=""
-			android:hint="@string/hint_pass"
-			android:importantForAccessibility="no" />
-		
-		<TextView android:id="@+id/initial_dir"
+            android:hint="@string/hint_pass"
+            android:importantForAccessibility="no" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <TextView android:id="@+id/initial_dir"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="4dip"
             android:layout_marginTop="4dip"
             
             android:text="@string/initial_directory" />
-		<EditText
+        <EditText
             android:id="@+id/sftp_initial_dir"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dip"
             android:singleLine="true"
-			android:text="/home/philipp"
-			 />
-		<Button android:id="@+id/send_public_key"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:text="send public key" />
-
+            android:text="/home/philipp"
+             />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <EditText android:id="@+id/kex"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:inputType="textNoSuggestions"
+            android:text=""
+            android:hint="KEX Algs" />
+        <EditText android:id="@+id/shk"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:inputType="textNoSuggestions"
+            android:text=""
+            android:hint="Server Host Key Algs" />
+    </LinearLayout>
+    <Button android:id="@+id/send_public_key"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="send public key" />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:layout_marginTop="15dp"
+        android:textStyle="bold"
+        android:text="Private Keys Functions" />
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <Button android:id="@+id/list_private_keys"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="List" />
+        <Button android:id="@+id/add_private_key"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Add" />
+        <Button android:id="@+id/delete_private_key"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Delete" />
+        <Button android:id="@+id/validate_private_key"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Validate" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+    <EditText android:id="@+id/private_key_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"
+        android:text=""
+        android:hint="key name" />
+    <EditText android:id="@+id/private_key_passphrase"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"
+        android:text=""
+        android:hint="passphrase (optional)" />
+    </LinearLayout>
+    <EditText android:id="@+id/private_key_content"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textMultiLine"
+        android:lines="4"
+        android:text=""
+        android:hint="key content" />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:layout_marginTop="15dp"
+        android:textStyle="bold"
+        android:text="CSV Resolver Functions" />
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <EditText android:id="@+id/mock_csv_specs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:inputType="textNoSuggestions"
+            android:text=""
+            android:hint="Test specs" />
+        <EditText android:id="@+id/mock_csv_cfg"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:inputType="textNoSuggestions"
+            android:text=""
+            android:hint="Test config" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <Button android:id="@+id/reset_mock_csv"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="5dp"
+            android:text="Reset" />
+        <Button android:id="@+id/resolve_mock_csv"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginRight="50dp"
+            android:layout_marginLeft="5dp"
+            android:text="Resolve" />
+    </LinearLayout>
 </LinearLayout>

src/java/JavaFileStorageTest-AS/app/src/main/res/values/strings.xml

@@ -333,6 +333,7 @@
 
 	<string name="hint_sftp_host">host</string>
 	<string name="hint_sftp_port">port</string>
+    <string name="hint_sftp_connect_timeout">timeout sec</string>
 
 	<string name="select_storage_type">Select the storage type:</string>
 
@@ -524,6 +525,6 @@ Initial public release
 		<item>Do not accept invalid certificates</item>
 	</string-array>
 	
-	<string name="initial_directory">Initial directory (optional):</string>
+	<string name="initial_directory">Initial dir (optional):</string>
     
 </resources>

src/java/JavaFileStorageTest-AS/gradle.properties

@@ -19,4 +19,4 @@
 
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx1536m

src/java/KP2AKdbLibrary/gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536m