rename back to current names

.github/workflows/build.yml

@@ -333,9 +333,6 @@ jobs:
     - name: Build keepass2android (nonet)
       run: |
         make msbuild Flavor=NoNet
-    - name: Update dotnet workloads
-      run: |
-        dotnet workload update
     - name: Test Autofill
       working-directory: ./src/Kp2aAutofillParser.Tests
       run: dotnet test

.github/workflows/release-net.yml

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

.github/workflows/release.yml

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

Makefile

@@ -20,7 +20,6 @@
 #  - nuget: restore NuGet packages
 #  - msbuild: build the project
 #  - apk: same as all
-#  - manifestlink: creates a symlink (to be used in building) to the AndroidManifest corresponding to the selected Flavor
 #
 #  - distclean: run a 'git clean -xdff'. Remove everyhing that is not in the git tree.
 #  - clean: all clean_* targets below
@@ -62,8 +61,8 @@ $(info )
 
 # On linux use xabuild, on Windows use MSBuild.exe, otherwise (macos?) use msbuild.
 ifeq ($(detected_OS),Linux)
-  MSBUILD_binary := dotnet
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary)) build
+  MSBUILD_binary := xabuild
+  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary))
 else ifeq ($(detected_OS),Windows)
   MSBUILD_binary := MSBuild.exe
   MSBUILD := $(shell $(WHICH) $(MSBUILD_binary) 2> nul)

crowdin.yml

@@ -1,7 +1,7 @@
 files:
-  - source: src/keepass2android-app/Resources/values/strings.xml
+  - source: src/keepass2android/Resources/values/strings.xml
     translation: >-
-      /src/keepass2android-app/Resources/values-%two_letters_code%/%original_file_name%
+      /src/keepass2android/Resources/values-%two_letters_code%/%original_file_name%
     translate_attributes: '0'
     content_segmentation: '0'
     languages_mapping:

docs/AccServiceAutoFill.md

@@ -0,0 +1,5 @@
+As of December 2017, Google does not accept the use of Accessibility services for anything except helping people with disabilities. This means that Keepass2Android can no longer provide the accessibility service based AutoFill feature. Otherwise, Google would remove Keepass2Android from Play Store.
+
+If you want to continue using this feature, please [install the Accessibility service based AutoFill plugin](https://github.com/PhilippC/kp2a_accservice_autofill/releases/).
+
+After installation, please enable the accessibility service "KP2A AutoFillPlugin" in the Android system settings. When trying to use the plugin for the first time, KP2A will ask you if the plugin may access the Keepass database. Please accept this to use the plugin.

docs/Advanced-usage-of-the-Keepass2Android-keyboard.md

@@ -0,0 +1,18 @@
+# Installing dictionaries
+Keepass2Android will load dictionaries for your current language both from AnySoftKeyboard and from Hacker's keyboard.
+ * For AnySoftKeyboard dictionaries visit: [https://play.google.com/store/search?q=anysoftkeyboard+dictionary&c=apps](https://play.google.com/store/search?q=anysoftkeyboard+dictionary&c=apps)
+ * For Hacker's Keyboard dictionaries visit: [https://play.google.com/store/search?q=hacker%27s%20keyboard%20dictionary&c=apps](https://play.google.com/store/search?q=hacker%27s%20keyboard%20dictionary&c=apps)
+ 
+# Automatic keyboard switching (requires ADB)
+Starting with Keepass2Android 1.02-pre1, you can use the [KeyboardSwap Plugin](https://play.google.com/store/apps/details?id=keepass2android.plugin.keyboardswap2) to switch to the KP2A keyboard automatically instead of bringing up the Input method selection dialog (e.g. after using the Share URL feature). To setup the plugin please follow the instructions on [the PlayStore website](https://play.google.com/store/apps/details?id=keepass2android.plugin.keyboardswap2)
+
+# Deprecated: Automatic keyboard switching on rooted devices
+
+In order to automatically switch to the KP2A keyboard and back, you need to
+ * have a rooted device (per Android security policies)
+ * have at least KP2A version 0.9.3-pre2
+ * install the Secure Settings app with the "System+" module available in Secure Settings v. 1.3.4 and above.  **Note:** This is no longer available for recent Android versions.
+ * Go to the KP2A keyboard settings. Enable auto-switch on rooted devices.
+
+If you go to a website, select "Share URL" -> Keepass2Android, the keyboard should be switched as soon as you locate the entry or when it's found automatically.
+

docs/Build.readme.md

@@ -0,0 +1,239 @@
+# How to build Keepass2Android
+
+## Overview
+
+Keepass2Android is a Mono for Android app. This means that you need Xamarin's Mono for Android to build it. However, it also uses several components written in Java, so there are also Android-Studio projects involved. To make things even worse, parts of the keyboard and kdb-library are written in native code.
+
+To build KP2A from scratch, you need:
+- Xamarin's Mono for Android (also included in Visual Studio)
+- Android SDK & NDK
+
+Prior to building Keepass2Android, you need to build some of its components (from command line). Then you can build the full project either through Visual Studio, or through command line.
+
+By using the command line, you can build on Windows, macOS or Linux.
+
+## Prerequisites
+
+### Common to all architectures
+- Install Android SDK & NDK (either manually with Google's [sdkmanager](https://developer.android.com/studio/command-line/sdkmanager), or through Android Studio). Visual Studio also installs a version of it, but in the end the directory must be writable and in a path without spaces (see below) so as to be able to build the components.
+- Fetch the main repository of Keepass2Android and all submodules
+    - Note that VisualStudio can do this for you, otherwise run:
+    - `git submodule init && git submodule update`
+
+### On Windows or macOS
+- Install Visual Studio (for example 2019) with Xamarin.Android (ie. with capability to build Android apps). This should provide the needed tools like
+    - Xamarin.Android
+    - MSBuild
+    - Java JDK
+- If you plan to build also from the command line:
+    - Install the MSVC build tools of visual studio. They provide the `vcvarsall.bat` file which among other things adds MSBuild to the PATH.
+    - Install [NuGet](https://www.nuget.org/downloads) to build also with "make". Alternatively, on Windows, if you use [chocolatey](https://chocolatey.org), run as administrator:
+      - `choco install nuget.commandline`
+    - Check that you have access to 'GNU make'.
+      - On Windows, it is usually not available by default. But the Android NDK provides it. You can find it in `%ANDROID_NDK_ROOT%\prebuilt\windows-x86_64\bin\make.exe`.  Alternatively, on Windows, if you use [chocolatey](https://chocolatey.org), run as administrator:
+        - `choco install make`
+      - On macOS, it is usually only installed if you have developer command line tools installed or if you use [homebrew](https://brew.sh) or [macports](https://www.macports.org/). As an alternative it may be available in the Android NDK at `%ANDROID_NDK_ROOT%/prebuilt/darwin-x86_64/bin/make`.
+
+### On Linux
+- Install Java's JDK
+    - On Debian, for example: `apt install default-jdk-headless`.
+
+- Install [Mono](https://www.mono-project.com/)
+    - This should provide `msbuild` & `xabuild` binary
+    - 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)~~ **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
+    - On Debian/Ubuntu: `apt install nuget`
+
+- Install [libzip](https://libzip.org/) for your distribution for some Xamarin.Android versions
+  - This may not be relevant anymore: for example, with Xamarin.Android 11.4.99. this is not needed.
+  - Some versions of Xamarin may require `libzip4`. If you are in this case:
+    - On Debian/Ubuntu, install it with `apt install libzip4`.
+    - Other distributions ship only `libzip5`. As a dirty workaround, it's possible to symlink `libzip.so.5` to `libzip.so.4`. Luckily, it appears to be working. For example:
+      - `sudo ln -s /usr/lib/libzip.so.5 /usr/lib/libzip.so.4`
+      - or `sudo ln -s /usr/lib64/libzip.so.5 /usr/lib/libzip.so.4`
+
+## Building the required components:
+
+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`)
+    
+    **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.
+    - or create a symlink to that path which doesn't contain spaces. Attention: this requires **administrator** priveleges. For example:
+
+        ```
+        IF NOT EXIST C:\Android ( MKDIR C:\Android ) && 
+        MKLINK /D C:\Android\android-sdk "C:\Program Files (x86)\Android\android-sdk" 
+        ```
+    This is because [Android NDK doesn't support being installed in a path with spaces](https://github.com/android/ndk/issues/1400).
+
+    **Note**: The Android SDK path will require to be writeable because during the build, some missing components might be downloaded & installed.
+
+- If you have "GNU make" available on your windows system, you may build by using the Makefile. You can also find a `make` executable in `%ANDROID_NDK_ROOT%\prebuilt\windows-x86_64\bin\make.exe`. To use it, see the instructions for Linux/macOS. Basically, just run `make` or `mingw32-make` depending on which distribution of GNU make for windows you have installed.
+
+- Otherwise proceed as below:
+
+    1. Build argon2
+
+        ```
+        cd src/java/argon2
+        %ANDROID_NDK_ROOT%/ndk-build.cmd
+        ```
+    1. Build the other java components
+
+        ```
+        cd src/build-scripts
+        build-java.bat
+        ```
+
+        `build-java.bat` will call `gradlew` for several Java modules.
+
+**Notes:**
+
+ - 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
+
+- Setup your environment:
+  - Set these environment variables for Android's SDK & NDK
+    - `ANDROID_HOME` (for example `export ANDROID_HOME=/path/to/android-sdk/`)
+    - `ANDROID_SDK_ROOT` (for example `export ANDROID_SDK_ROOT=/path/to/android-sdk/`)
+    - `ANDROID_NDK_ROOT` (for example `export ANDROID_NDK_ROOT=/path/to/android-sdk/ndk/version`)
+
+- Update your PATH environment variable so that it can access `nuget`, `msbuild` or `xabuild` (for linux):
+    - On Linux:
+        - add `xabuild` to your path: `export PATH=/path/to/xamarin.android-oss/bin/Release/bin/:$PATH`
+    - On macOS:
+        - you may similarly need to add `msbuild` & `nuget` to your PATH.
+
+- Start the build:
+    - This will use the Makefile at the root of the project (requires GNU make). To build everything (components & Keepass2Android APK) in a single command simply run:
+
+        ```
+        make
+        ```
+
+    - Otherwise, if you prefer to do step by step
+
+        1. Build argon2
+
+            ```
+            make native
+            ```
+
+        1. Build the other java components
+
+            ```
+            make java
+            ```
+
+## Building Keepass2Android:
+
+These are the basic steps to build Keepass2Android. You can also build Keepass2Android Offline. For this, configure the build by using the [Flavors](#Flavors).
+
+### With Visual Studio
+
+- On windows or on macOS open the src/KeePass.sln file with visual studio, and choose to build the project named 'keepass2android-app'
+
+### Command Line
+
+#### Windows, Macos & Linux
+to build the APK, simply run:
+
+```
+    make
+```
+
+or to skip building the APK:
+
+```
+    make msbuild
+```
+
+## Where is the APK ?
+The Apk can be installed on a device.
+It is located in `src/keepass2android/bin/*/*-Signed.apk`
+
+If you build with Visual Studio, the APK is not produced automatically. You need to perform some extra step. See the documentation of Visual Studio on how to proceed.
+
+## Flavors
+
+Keepass2Android is distributed in two flavors.
+  - Keepass2Android (aka `net`)
+  - Keepass2Android Offline (aka `nonet`)
+
+The flavor is set through a MSBuild Property named "`Flavor`". The possible values are '`Net`' and '`NoNet`'.
+
+The value of the Flavor property is used in 2 projects:
+  - `keepass2android-app` (in `src/keepass2android`)
+  - `Kp2aBusinessLogic` (in `src/keepass2android`)
+
+Its value is set inside the `*.csproj` file (XML format) of each project in the `Project`/`PropertyGroup`/`Flavor` node.
+By default its value is set to an empty string so that development is made with `AndroidManifest_debug.xml` on the '`net`' flavor.
+
+This is the behaviour of the build system depending on the value of Flavor:
+| Flavor                                     | What is built           | `AndroidManifest.xml` used  |
+| -----                                      | -----                   | -----                       |
+| `` (empty string): This is the default value. | Keepass2Android      | `AndroidManifest_debug.xml` |
+| `Net`                                      | Keepass2Android         | `AndroidManifest_net.xml`   |
+| `NoNet`                                    | Keepass2Android Offline | `AndroidManifest_nonet.xml` |
+
+### Select/Change flavor:
+
+When building, by default, the flavor is not set. So the value used is the value of the Flavor property in *.csproj file. This should result on doing a build of the 'net' flavor.
+
+You can force the Flavor by setting the Flavor property.
+
+Proceed this way:
+
+#### Command line
+
+##### Windows, Macos & Linux
+
+To force building 'net' with `make`, run:
+
+```
+    make Flavor=Net
+```
+
+To build 'nonet' with `make`, run:
+
+```
+    make Flavor=NoNet
+```
+
+##### MSBuild
+
+To build with MSBuild directly on the command line, set the flavor with `-p:Flavor=value` argument. For example:
+
+```
+    MSBuild src/KeePass.sln ... -p:Flavor=NoNet
+```
+
+#### Visual Studio
+When building with Visual Studio, edit the `*.csproj` file (XML format) and set the value in the `Project`/`PropertyGroup`/`Flavor` node. This is needed only for the projects that use the flavors.
+
+**Note:** When switching between flavors, be sure to clean the previous build before.
+
+## Makefile
+
+It is possible to override the project's default 'Flavor' (Net, NoNet) and 'Configuration' (Release, Debug) by passing it as argument to `make`. See the header of the Makefile to see what can be done.

docs/Comparison-of-Keepass-apps-for-Android.md

@@ -0,0 +1,118 @@
+<div class="wikidoc">
+<h1>Comparison of Keepass apps for Android</h1>
+<p>This page was created to give you a short overview of the features of Keepass2Android vs. Keepass2Android Offline. As Keepass2Android is based on Keepassdroid (by Brian Pellin), there are quite a few similarities here, as well, so we added Keepass2Android
+ vs. Keepassdroid comparison as well. &quot;Better&quot; properties are highlighted in bold. The page was created in 12/2013. If any information is out of date, please leave a note in the comments section.</p>
+<table>
+<tbody>
+<tr>
+<th>&nbsp;</th>
+<th>
+<h3>Keepass2Android</h3>
+</th>
+<th>
+<h3>Keepass2Android Offline</h3>
+</th>
+<th>
+<h3>Keepassdroid</h3>
+</th>
+</tr>
+<tr>
+<td><strong>Play Store link</strong></td>
+<td><a href="https://play.google.com/store/apps/details?id=keepass2android.keepass2android">https://play.google.com/store/apps/details?id=keepass2android.keepass2android</a></td>
+<td><a href="https://play.google.com/store/apps/details?id=keepass2android.keepass2android_nonet">https://play.google.com/store/apps/details?id=keepass2android.keepass2android_nonet</a></td>
+<td><a href="https://play.google.com/store/apps/details?id=com.android.keepass">https://play.google.com/store/apps/details?id=com.android.keepass</a></td>
+</tr>
+<tr>
+<td><strong>Technology</strong></td>
+<td>Mono for Android, Java</td>
+<td>Mono for Android, Java</td>
+<td>Java</td>
+</tr>
+<tr>
+<td><strong>Keepass 2.x (kdbx) support</strong></td>
+<td><strong>write and read</strong></td>
+<td><strong>write and read</strong></td>
+<td>read (write in beta)</td>
+</tr>
+<tr>
+<td><strong>Keepass 2.x feature support</strong></td>
+<td><strong>Viewing and editing of tags, attachments, additional fields, TAN support</strong></td>
+<td><strong>Viewing and editing of tags, attachments, additional fields, TAN support</strong></td>
+<td>Edit standard fields only, no display/edit of attachments</td>
+</tr>
+<tr>
+<td><strong>Keepass 1.x (kdb) support</strong></td>
+<td>currently read-only</td>
+<td>currently read-only</td>
+<td><strong>yes</strong></td>
+</tr>
+<tr>
+<td><strong>Storage locations</strong></td>
+<td>SD Card,<strong> Cloud (Dropbox, Google Drive, OneDrive), Web (FTP/HTTP/HTTPS/WebDav), SFTP</strong></td>
+<td>SD Card</td>
+<td>SD Card</td>
+</tr>
+<tr>
+<td><strong>File choosers</strong></td>
+<td><strong>Internal or third party</strong></td>
+<td><strong>Internal or third party</strong></td>
+<td>Third party</td>
+</tr>
+<tr>
+<td><strong>Required permissions</strong></td>
+<td>Internet, SD card, Manage accounts</td>
+<td><strong>SD card</strong></td>
+<td><strong>SD card</strong></td>
+</tr>
+<tr>
+<td><strong>Android 4.x style</strong></td>
+<td><strong>yes</strong></td>
+<td><strong>yes</strong></td>
+<td>no</td>
+</tr>
+<tr>
+<td><strong>Database locking</strong></td>
+<td><strong>QuickUnlock</strong> or full lock</td>
+<td><strong>QuickUnlock</strong> or full lock</td>
+<td>Full lock only</td>
+</tr>
+<tr>
+<td><strong>Browser integration</strong></td>
+<td><strong>yes</strong></td>
+<td><strong>yes</strong></td>
+<td>no</td>
+</tr>
+<tr>
+<td><strong>Secure keyboard</strong></td>
+<td><strong>yes</strong></td>
+<td><strong>yes</strong></td>
+<td>no</td>
+</tr>
+<tr>
+<td><strong>Database unlocking</strong></td>
+<td><strong>password, keyfile, One-Time-Passwords (supports Yubikey NEO with NFC), KeeChallenge</strong></td>
+<td><strong>password, keyfile, One-Time-Passwords (supports Yubikey NEO with NFC),&nbsp;KeeChallenge</strong></td>
+<td>password, keyfile</td>
+</tr>
+<tr>
+<td><strong>Keepass plugin compatibility</strong></td>
+<td><strong>Twofish Cipher, KeeChallenge, TrayTOTP, KeeOTP</strong></td>
+<td><strong>Twofish Cipher, KeeChallenge, TrayTOTP, KeeOTP</strong></td>
+<td>Twofish Cipher</td>
+</tr>
+<tr>
+<td><strong>Extensible with plugins</strong></td>
+<td><strong>yes</strong></td>
+<td><strong>yes</strong></td>
+<td>no</td>
+</tr>
+<tr>
+<td><strong>Database export</strong></td>
+<td><strong>yes</strong></td>
+<td><strong>yes</strong></td>
+<td>no</td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div>

docs/Documentation.md

@@ -1 +1,125 @@
-This page has been moved to the [wiki](https://github.com/PhilippC/keepass2android/wiki/Documentation)
+**Note:** This is an incomplete and preliminary documentation. More documentation will be added as requests come in or when the app is more feature stable. 
+If you want, I'd be happy if you contribute texts for this place!
+
+If you think something is missing in the documentation, please create an issue at https://github.com/PhilippC/keepass2android/issues
+
+# What you should know and think about
+If you store important information using Keepass2Android, you should know a little bit about what's going on:
+* Keepass2Android stores your password in an encrypted file. It is *your responsibility* to backup this file regularly and safely.
+* There is no way for anyone, including the app's author, to access the information stored in your password database without 
+  * having the database file
+  * knowing the master password (and additional second factor if you chose one)
+  This means that **if you forget the master password, your database is lost**! So make sure you remember the password and retain any second factor method (if one is used).
+* You might also want to think about:
+  * What happens if I have an accident? Should any trusted person be able to access my database?
+  * What happens if my phone gets lost or stolen? Do I know how to recover my database from a backup or the cloud?
+
+
+# Getting started
+
+## Opening an existing database
+Many users are already using Keepass 2 on Windows and thus have their passwords stored in a Keepass database, typically a file with ending .kdbx. For opening such an existing database, there are two main options:
+* You can open the file directly if it is located on a webserver or in the cloud. Use "Open Database" on the startscreen. By default, files from the cloud or servers are cached in the application's cache directory after loading them once. This allows to access your files even when you're offline.
+* If you don't have your database stored on a webserver or in the cloud (or if you're using KP2A Offline) you need to copy your kdbx-Database to your phone. I suggest to use a sync tool like FolderSync. Such a tool copies your database to your local storage, so you always have it accessible. FolderSync can access your database if you have it on a network share or use any other common storage. 
+
+## Creating a new database
+Select "Create new database" from the start screen. Tap the integrated help icons for more information. Note that by default, the database is created as a local file. Please consider making backups regularly or select a location in the cloud.
+
+## Getting passwords into password fields
+There are many ways how to enter the passwords from your database in the corresponding fields. By default, the clipboard as well as the KP2A keyboard are activated in the settings:
+* The KP2A keyboard is the recommended way because it's safe against clipboard loggers: Whenever you select an entry, the KP2A keyboard notification will appear in the notification bar. Click it to activate the keyboard. (The first time you do this, you are required to enable the keyboard in the system settings. This must be done by the user for Android security reasons.) As soon as it's activated, you can tap a field where you want to enter data from the selected entry. The KP2A keyboard will come up. Click the KP2A key (on the bottom left) to select whether you want to enter Username/password etc. When you're done, click the Keyboard key (next to the KP2A key) to switch back to your favorite keyboard.
+* You can enable the Keepass2Android Autofill service in the system's Autofill settings (Android 8+) which allows to fill data using Android's accessibility system. This works with many apps including Firefox browser but is not supported for Chrome (when writing this).
+* The clipboard based approach can be used as well: Pull the notification bar down and select "Copy username/password to clipboard". Then long-tap the field where you want to paste the data. A small "paste" button should come up. Note, however, that information in the clipboard can be monitored by all apps on your device and clearing the clipboard is not always possible.
+
+These options can be used in different workflows:
+### Browser-based workflow
+If you are browsing the web and need to enter crendentials for a webpage, a simple and powerful workflow is to use the "Share URL" option from the browser's menu. Then select Keepass2Android (or KP2A Offline). Open your database (if it's not already opened) and select the entry you want to enter (if KP2A did not already select the appropriate entry). Use the built-in keyboard or the clipboard to enter the password.
+### Autofill service based workflow
+If you have enabled the autofill service and open a (supported) app with a password field, a dropdown appears. Select "Fill with Keepass2Android" to select the appropriate entry. When you return to the app, the password and user field should be filled already.
+### KP2A based workflow for websites
+Open KP2A, open your database, select your entry (in this step, the notification bar items should show up already). Now click the URL link of the entry to open a browser window with the website. Use one of the methods described above to enter the credentials. 
+### KP2A Keyboard based workflow
+When you are in a text field, you can use the Android icon in the notification bar to switch to the KP2A keyboard. Hit the KP2A key to select an icon. After it's selected, hit the KP2A key again to enter the desired field.
+
+## Creating a new account
+Assume you want to create an account on a website. If you do not have a database yet, see above. As soon as you have a database, you may proceed as follows:
+* Go to the website you want to create the account for
+* Select Share/Share URL from the browser's menu and tap "Keepass2Android"
+* Log in to your database (if it's not already unlocked)
+* You will see the search result screen with "No search results"
+* Tap "Create entry for URL"
+* Choose the desired group, then tap the "+"-button to add an entry.
+* Tap the "..." button next to the password field to launch the password generator, create your password and then select "Accept"
+* Enter a name for the entry
+* Enter the username you want to use for the entry
+* Tap "Save" on the top
+* You should see notifications like "Entry is available through KP2A keyboard" and/or  "Copy username/password to clipboard". If not, view the new entry by clicking it.
+* Return back to the browser.
+* Use the notifications to enter your new credentials. See "Getting passwords into the password fields" for more details.
+* If the user name you entered is not available or valid, choose a different one but copy it to clipboard. After creating the account, don't forget to update the new entry.
+
+# Keepass2Android vs Keepass2Android Offline vs Keepassdroid
+What's the difference between these apps? There is a short comparison on [Comparison of Keepass apps for Android](Comparison-of-Keepass-apps-for-Android.md) to help you pick the best for you!
+
+# Advanced topics
+## YubiKey NEO support for One-Time-Passwords
+Please see the [How to use Keepass2Android with YubiKey NEO](How-to-use-Keepass2Android-with-YubiKey-NEO.md) page.
+
+## Advanced usage of the Keepass2Android keyboard
+Please see the [Advanced usage of the Keepass2Android keyboard](Advanced-usage-of-the-Keepass2Android-keyboard.md) page.
+
+## Using Keepass2Android like an authenticator app to generate Time-based One-Time-Passwords (TOTPs)
+Please see [Generating TOTPs with Keepass2Android](Generating-TOTPs.md)
+
+# FAQ
+
+## Should I use the KP2A keyboard for entering passwords?
+The KP2A keyboard is meant to quickly "paste" or "type" values from your database to any text fields by using the KP2A icon. The QUERTY keyboard is just for convenience (if you just have the KP2A keyboard activated and need to enter a few letters). However, every other (trustworthy) keyboard is ok as well to enter sensitive information: Keyboard's aren't unsafe in Android. Only the clipboard is. Thus, the KP2A keyboard allows to get information out of the database without using the clipboard.
+**You can use any keyboard when you enter the main database password**
+
+## Is it safe to store my kdbx file in the cloud?
+While it may happen that someone gets access to your kdbx file in the cloud, there is still no need to worry: the purpose of encryption is to protect the data even in case someone gets the kdbx file! As long as you are using a safe master key, you're safe! [Key files](https://keepass.info/help/base/keys.html#keyfiles) can help with securing the database even more. 
+
+## Doesn't Keepass2Android create automatic backups?
+Yes and no. Yes: Keepass2Android stores the last successfully opened file as a read-only backup locally on the phone (unless you disable this is in the settings). This should make sure that even if the file gets destroyed during a save operation or gets deleted by accident, you should always have a version that can be opened. (Don't mix this up with the internal file cache which is not meant as a backup and can easily be overwritten even with a corrupt file. This internal file cache is meant for providing writable access even when the original file is not reachable, e.g. when you're offline.)
+No: The local backup has two shortcomings: It is only one backup and does not allow to revert to older versions. So if you deleted an entry from the database, it might be deleted in the local backup soon as well. The even more important shortcoming is that it is just a local backup. It won't help when your phone gets lost or broken. Please create additional backups on seperate storage!
+
+## How do I backup the database?
+If you have stored your database on the cloud, you might rely on your cloud storage providers backups. Make sure they allow you to revert to older revisions in case the file gets corrupted for some reason.
+If you are working with a local database file, make sure you create regular backups. I suggest you have an aumotated mechanism, e.g. with FolderSync (Lite) which can copy local files from your device to other locations, e.g. your PC in a local network. You can also use USB or tools like MyPhoneExploror to transfer data to your PC. Or, you use a removable storage like an SD card which you keep in a safe place after making the backup. 
+In all cases, you need to verify that your backup is readable! It's even best to test this on another device (e.g. a PC), so you simulate the case that you may lose your phone.
+
+## I can open my database with fingerprint, but don't remember my master password!
+It's time for action! As soon as possible, select Settings - Database - Export and choose unencrypted XML (don't put this on the cloud but on a local file). Transfer this file to a PC and import it to a new kdbx file, e.g. with Keepass2. Choose a new master password and make sure you don't forget this password! 
+
+## How can I transfer data from one device to another?
+  * If you are about to get a new Android device, you should make sure you're not losing your passwords in the transition! The first thing you need to make sure is that you can access your .kdbx file (which stores the passwords) on the new device. If it is already stored in the cloud, you only need to make sure you know how to setup the cloud storage on the new device (it might require a password, so make sure you have access to that!). 
+  * If the .kdbx-file is stored locally on the old device, make sure you have an up-to-date backup (see above). You can then transfer that backup copy to the new device. (Note: transferring via USB causes data corruption in some cases, use MyPhoneExplorer or similar tools to be sure this does not happen.)
+  * If you are securing your password database with a keyfile, also transfer this key file to the new device.
+  * If you are opening your database with a fingerprint, make sure you also know the master password because fingerprint will not be available immediately on the new device.
+
+## Why is Keepass2Android's apk so big?
+Please see [Keepass2Android Apk](Keepass2Android-Apk.md) for more information.
+
+## I get a message "File is trashed" when reading or writing a file on Google Drive
+This happens because ocaml-fuse (I guess you are on Linux  and use that) moves files to trash and then creates a new one instead of correctly updating the file on Google Drive (each file has a unique ID which Keepass2Android uses). Fortunately, this was fixed: https://github.com/astrada/google-drive-ocamlfuse/issues/494. After activating this option, please select "Change database" in KP2A, tap ,"Open file" and browse to the file on Google Drive again. After that, the message should no longer pop up.
+
+## I get a message "The name must not be empty: null" when opening from Google Drive
+Please follow  these steps:
+
+ * select "Change database" on the password screen, then "Open database" and browse to your file again
+ * go to Android app settings and disable all permissions for the KP2A app. Then try again to open the database file.
+ * reboot the device
+
+(Before running the following steps, make sure you don't have local changes in your database which have not been synchronized with Google Drive (this can happen if you worked offline). If you have, please open the database from the local cache and go to settings - database settings - export database and make a backup copy of the data.)
+
+  * clear KP2A's app cache in the Android settings
+  * uninstall & reinstall
+
+One of these has helped all users so far, but unfortunately it's not totally clear to me why different steps are required (or nothing for most users).
+
+# For developers
+If you are interested in adding new features, you have two options:
+Either your features can be implemented as a plug-in. Please see [How to create a plug-in?](How-to-create-a-plug-in_.md) for more information. Or you add the features directly in the source code of the projects and create a pull request.
+
+If you want to build Keepass2Android, check the [build guide](Build.readme.md).

docs/Generating-TOTPs.md

@@ -1 +1,53 @@
-This page has been moved to the [wiki](https://github.com/PhilippC/keepass2android/wiki/Generating-TOTPs)
+
+## TOTP in brief
+TOTP stands for [Time-based One-Time Password algorithm](https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm) which is one of the most common way proposed by websites to do a [two-factor authentication (2FA)](https://en.wikipedia.org/wiki/Multi-factor_authentication).
+
+On these websites, this option will often be mentioned in the 2FA configuration menu as things like "_use code generated by an application_", "_use [Google] Authenticator app_".
+
+You're prompted to scan a QR code with the app, which essentially contains a code called "_seed_", usually with a form like "_AZER TYUI OPQS DFGH JKLM_", used to generate TOTPs. The seed can be also directly copied if there is no scanning option on the app.
+
+Most common apps: 
+
+- Google Authenticator
+- Authy
+- Microsoft Authenticator
+- FreeOTP
+- LastPass Authenticator
+
+## TOTP in KeePass and benefits
+In KeePass (by Dominik Reichl) there is are several ways to enable this Authenticator app ability: 
+
+- built-in TOTP support: https://keepass.info/help/base/placeholders.html#otp
+- [KeePassOTP plugin](https://keepass.info/plugins.html#kpotp)
+- [KeeOtp plugin](https://keepass.info/plugins.html#keeotp)
+- [KeeTrayTOTP plugin](https://keepass.info/plugins.html#keetraytotp) (note the name "_TrayTOTP_" on this one for later)
+
+KeePassXC also supports TOTP: https://keepassxc.org/docs/KeePassXC_UserGuide#_adding_totp_to_an_entry
+
+The greatest benefits are:
+
+- the seed stays available contrary to the above apps (for which it's more or less hard to backup/restore/switch with another app)
+- TOTPs are available wherever the KeePass database is available. But conceptually it's not really 2FA anymore (all things are stored in the same place).
+
+The different implementations use different ways of storing the TOTP seed (or secret, or key) and optional settings (e.g. the length of the TOTP to generate) within an entry inside the kdbx database. Keepass2Android attempts to be able to read the different formats, but can only write one:
+
+## TOTP in Keepass2Android 
+
+If you use any of the tools mentioned above, you can set up TOTP entries with them. Keepass2Android can read those entries and generate TOTPs if any of the following styles are used:
+
+* Keepass2 style: used when there are TimeOtp-Secret(-XXX) fields in the entry
+* KeeOtpPlugin style: used when there is an otp field containing a query string in the form of key=abc&step=X&size=Y (step and size are optional)
+* KeeWebOtp/Key Uri Format style: used when entry contains a URL starting with otpauth://totp/, e.g. otpauth://totp/?secret=abc (https://github.com/google/google-authenticator/wiki/Key-Uri-Format)
+* KeeTrayTotp style:
+  * requires a non-empty seed field (default key is "TOTP seed", can be changed in KP2A settings), value is base32 encoded data
+  * requires a non-empty settings field (default key is "TOTP Settings", can be changed as well), value is expected to be a csv-separated array with [Duration];Length(;TimeCorrectionURL). Length is either an integer value or "S" to indicate Steam encoding
+
+In order to view the generated TOTP code in KP2A, open the corresponding entry. You can then
+ * use a dynamically generated field called "_TOTP_" containing the TOTP  or
+ * use the "Copy TOTP" button on the system notification for the selected entry or
+ * switch to the KP2A keyboard and use the TOTP button to insert the TOTP value into the target app or browser
+
+If you want to configure an entry to contain the TOTP fields, it is suggested to enter edit mode for the entry. Then click the "Configure TOTP" button. You can either enter the data manually or scan a QR code with the information.
+ 
+### Spaces in otp field
+ Make sure that the URI doesn't contain spaces, otherwise KeePass2Android will fail to generate TOTPs as a space is an invalid character. If your URIs have spaces, check [this comment](https://github.com/PhilippC/keepass2android/issues/1248#issuecomment-628035961)._

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

@@ -0,0 +1,157 @@
+# How to create a plug-in or connect from your app
+
+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://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://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:
+
+```java
+
+public class PluginAAccessReceiver extends keepass2android.pluginsdk.PluginAccessBroadcastReceiver
+{
+
+	@Override
+	public ArrayList<String> getScopes() {
+		ArrayList<String> scopes = new ArrayList<String>();
+		scopes.add(Strings.SCOPE_DATABASE_ACTIONS);
+		scopes.add(Strings.SCOPE_CURRENT_ENTRY);
+		return scopes;
+		
+	}
+
+}
+```
+
+Here, you define the method getScopes where the list of scopes is created which must be granted by the user. The actual logic of the authorization process is implemented by the base class in the sdk.
+
+In order to make this broadcast receiver visible to KP2A, add the following lines (probably with the name adapted to your class name) in the AndroidManifest.xml:
+
+```xml
+<receiver android:name="PluginAAccessReceiver" android:exported="true">
+	<intent-filter>
+		<action android:name="keepass2android.ACTION_TRIGGER_REQUEST_ACCESS" />
+                <action android:name="keepass2android.ACTION_RECEIVE_ACCESS" />
+                <action android:name="keepass2android.ACTION_REVOKE_ACCESS" />
+	</intent-filter>
+</receiver>
+```
+
+Please also add a few strings in your resource files (e.g. strings.xml) with the following keys:
+
+```xml
+<string name="kp2aplugin_title">The Great PluginA</string>
+<string name="kp2aplugin_shortdesc">Test plugin to demonstrate how plugins work</string>
+<string name="kp2aplugin_author">[your name here](your-name-here)</string>
+```
+These strings will be displayed to the user when KP2A asks if access should be granted.
+
+## 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" 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).
+
+To implement this, simply follow the steps descrIbed above in the sections Preparation and Authorization. Then, wherever appropriate in your app, do something like this: 
+
+```java
+	try
+	{
+		PlaceholderFragment.this.startActivityForResult(
+				Kp2aControl.getQueryEntryIntentForOwnPackage(),
+				1);
+	}
+	catch (ActivityNotFoundException e)
+	{
+		Toast.makeText(
+			PlaceholderFragment.this.getActivity(), 
+			"no KP2A host app found", 
+			Toast.LENGTH_SHORT).show();
+	} 
+
+```
+
+(of course you can use `PacketManager` to check if the intent can be started instead of catching the `Exception`).
+
+Instead of querying credentials associated with your own app, you might want to query other credentials as well. instead of `KpControl.getQueryEntryIntentForOwnPackage()` use
+`Kp2aControl.getQueryEntryIntent("google.com")`
+This requires \{"SCOPE_QUERY_CREDENTIALS (whereas getQueryEntryIntentForOwnPackage() requires SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE)"\}.
+
+The credential data can be retrieved in onActivityResult():
+
+```java
+if ((requestCode == 1) //queryEntry for own package
+	&& (resultCode == RESULT_OK)) // ensure user granted access and selected something
+{
+	HashMap<String, String> credentials = Kp2aControl.getEntryFieldsFromIntent(data);
+	if (!credentials.isEmpty())
+	{
+		//here we go!
+		Toast.makeText(
+			getActivity(), 
+			"retrieved credenitals! Username="+credentials.get(KeepassDefs.UserNameField),
+			Toast.LENGTH_LONG).show();
+	}
+}
+```
+
+Note that you get access to all strings (Title, Username, Password, URL, Notes + any user defined strings) in the entry. This may be in intersting in combination with the following section:
+
+## Storing data in KP2A 
+If you allow the user to set up an account in your app or create a password, e.g. for encryption, please add an option to store this data in the Keepass2Android database, as this will lead to great workflows for the user. It's as simple as 
+
+```java
+try {
+	HashMap<String, String> fields = new HashMap<String, String>();
+	//standard fields
+	fields.put(KeepassDefs.TitleField, "plugin A");
+	fields.put(KeepassDefs.UserNameField, "John Doe");
+	fields.put(KeepassDefs.PasswordField, "top secret");
+	//associate entry with our app. If we would require the URL field for a web URL,
+	//this string could be added in any other (e.g. a custom) field 
+	fields.put(KeepassDefs.UrlField, "androidapp://"+getActivity().getPackageName()); 
+	//custom field:
+	fields.put(PLUGIN_A_PASSPHRASE, "some long text");
+	//mark custom field as protected (i.e. display masked, enable memory protection in Keepass2)
+	ArrayList<String> protectedFields = new ArrayList<String>();
+	protectedFields.add(PLUGIN_A_PASSPHRASE);
+	
+	//add to KP2A
+	PlaceholderFragment.this.startActivityForResult(
+		Kp2aControl.getAddEntryIntent(fields, protectedFields),
+		2);
+} catch (ActivityNotFoundException e) {
+	Toast.makeText(
+		PlaceholderFragment.this.getActivity(),
+		"no KP2A host app found",
+		Toast.LENGTH_SHORT).show();
+}
+```
+
+Note that this does not even require access authorization because the user will actively save the entry anyways (after selecting the group where to create it.)
+
+## Get information about database actions
+With {"SCOPE_DATABASE_ACTIONS"}, you will be informed when the user opens, closes, locks or unlocks the database including the file name information.
+
+PluginA uses this to simply display a toast message in its ActionReceiver:
+
+```java
+@Override
+	protected void dbAction(DatabaseAction db) {
+		
+		Log.d("PluginA", db.getAction() + " in file " + db.getFileDisplayName() + " ("+db.getFilePath()+")");
+	}
+```
+ 
+
+## Sample plugin
+Most example code from above is taken from the simple sample plugin "PluginA" as can be found on [https://keepass2android.codeplex.com/SourceControl/latest#src/java/PluginA/](https://keepass2android.codeplex.com/SourceControl/latest#src/java/PluginA/)

docs/How-to-use-Keepass2Android-with-YubiKey-NEO.md

@@ -0,0 +1,31 @@
+<div class="wikidoc">
+<h1>How to use Keepass2Android with YubiKey NEO</h1>
+<p>Please refer to the documentation on the Keepass website (<a href="http://keepass.info/help/kb/yubikey.html">http://keepass.info/help/kb/yubikey.html</a>) or the Yubico website (<a href="http://www.yubico.com/applications/password-management/consumer/keepass/">http://www.yubico.com/applications/password-management/consumer/keepass/</a>)
+ on how to set up a Keepass 2 database with Yubikey/OTP protection.<br>
+<br>
+After successful setup you should have the database file, e.g. yubi.kdbx, and the OTP auxiliary file, e.g. yubi.otp.xml, both in the same folder.<br>
+<a href="How to use Keepass2Android with YubiKey NEO_OTPAuxFile_2.png"><img title="OTPAuxFile" src="How to use Keepass2Android with YubiKey NEO_OTPAuxFile_thumb.png" alt="OTPAuxFile" width="513" height="40" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a></p>
+<p>Make sure you make <strong>both files</strong> available to Keepass2Android, e.g. by placing them both in your Dropbox.</p>
+<p>Now you should check your NDEF setup of the Yubikey NEO. Therefore, go to the Tools menu in the Yubico Personalization Utility. Select the same slot as used for OTPs with Keepass 2. The default setting for NDEF type and payload should work. If you experience
+ problems, you may use the configuration as shown in this screenshot or simply press the &ldquo;Reset&rdquo; button:</p>
+<p><a href="How to use Keepass2Android with YubiKey NEO_image_2.png"><img title="image" src="How to use Keepass2Android with YubiKey NEO_image_thumb.png" alt="image" width="760" height="622" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a></p>
+<p><br>
+<br>
+In Keepass2Android, select &quot;Open file&quot; and locate your database file, e.g. yubi.kdbx.<br>
+<br>
+In the password screen under &quot;Select master key type&quot; select &quot;Password &#43; OTP&quot;.</p>
+<p><a href="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-50_2.png"><img title="Screenshot_2013-12-13-06-38-50" src="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-50_thumb.png" alt="Screenshot_2013-12-13-06-38-50" width="204" height="360" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a></p>
+<p>Click &quot;Load auxiliary OTP file&quot;. This is required to load the information how many OTPs must be entered. As loading the file might require user action in some cases, this is not performed automatically.<br>
+<a href="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-12_2.png"><img title="Screenshot_2013-12-13-06-38-12" src="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-12_thumb.png" alt="Screenshot_2013-12-13-06-38-12" width="204" height="360" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a><br>
+After loading the OTP auxiliary file, you should see a few text fields for entering the OTPs. Now swipe your YubiKey NEO at the back of your Android device. If you have multiple apps which can handle NFC actions, you might be prompted to select which app to
+ use. Select Keepass2Android in this case. Swipe your YubiKey again until all OTP fields are filled. Note: You don't need to select the next text field, this is done automatically!<br>
+<a href="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-36_2.png"><img title="Screenshot_2013-12-13-06-38-36" src="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-38-36_thumb.png" alt="Screenshot_2013-12-13-06-38-36" width="204" height="360" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a><br>
+Don't forget to also enter your password and click OK. You will see the &ldquo;Saving auxiliary OTP file&hellip;&rdquo; dialog. Note that there is some encryption envolved which is probably fast on your PC but might take some time on your mobile device. You
+ can reduce the look-ahead window length to speed this up.<br>
+<a href="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-39-47_2.png"><img title="Screenshot_2013-12-13-06-39-47" src="How to use Keepass2Android with YubiKey NEO_Screenshot_2013-12-13-06-39-47_thumb.png" alt="Screenshot_2013-12-13-06-39-47" width="204" height="360" border="0" style="padding-top:0px; padding-left:0px; display:inline; padding-right:0px; border:0px"></a></p>
+<h2>&nbsp;</h2>
+<h2>A note about offline access</h2>
+<p>If your database is stored in the cloud or on the web, you can still access it if you have enabled file caching (which is on by default). With OTPs, this becomes a little bit more complicated: If you repeatedly open your datbase while being offline, the
+ OTP counter stored on the Yubikey will be increased. Don&rsquo;t forget to synchronize the database (which will also synchronize the OTP auxiliary file) as soon as possible to avoid problems with accessing your database on other devices! If you often need
+ to open the database while you&rsquo;re offline, consider increasing the look-ahead window length!</p>
+</div><div class="ClearBoth"></div>

docs/Keepass2Android-Apk.md

@@ -0,0 +1,25 @@
+Keepass2Android's apk is pretty big, e.g. when comparing to Keepassdroid. The main difference is that Keepass2Android is built on Mono for Android. Mono is an open-source implementation of the Microsoft .Net Framework (installed on pretty much every Windows PC). On Windows, the .net framework requires several hundred MB (but only once, not for every application). On Android devices, Mono is not installed globally. Instead, it is packaged into every app. The more features from Mono are required, the bigger the package becomes.
+
+Here's a list of what is contained in the Keepass2Android 0.9.1 application package:
+
+```
+Mono for Android		
+			.net dlls			5.0 MB
+			Runtime				2.5 MB				
+			Google libraries		0.8 MB				
+			(for Drive support)
+
+Resources		Strings, Icons..		2.1 MB				
+Password Font						0.2 MB				
+Java Code		including Dropbox 		1.1 MB				
+				GDrive, SkyDrive
+				libraries
+							
+Keepass library						0.2 MB				
+Keepass2Android Code					0.3 MB				
+Java/Mono bindings					0.5 MB				
+							
+rest							0.3 MB		
+
+TOTAL							13 MB
+```

docs/OreoAutoFill.md

@@ -0,0 +1,20 @@
+Google has introduced the Android Autofill interface in Android 8. Keepass2Android supports this interface. In most Android apps and all Autofill-enabled browsers, this is the most convenient way of entering passwords. As soon as you focus a field, you will see a popup "Fill with Keepass2Android".
+
+<img src="autofill-facebook.png" />
+
+After clicking this popup, you can unlock your KP2A database. If automatic look up succeeds, KP2A will close automatically, if not you are prompted to select the entry you want to auto-fill. When returning to the target app, the fields should be filled automatically already.
+
+As of January 2018, the following browsers are known to have Android Autofill support:
+
+* Firefox Focus / Firefox Klar
+* Opera Mini
+
+These browsers do not (yet) have autofill support:
+
+* Google Chrome
+* Firefox for Android ([bugzilla entry](https://bugzilla.mozilla.org/show_bug.cgi?id=1352011))
+* Brave-Browser
+* Opera
+
+Please use the Share-URL-feature and the built-in KP2A keyboard for these browsers.
+

docs/Privacy-Policy.md

@@ -1 +1,25 @@
-This page has been moved to the [wiki](https://github.com/PhilippC/keepass2android/wiki/Privacy-Policy)
+# Who we are
+
+Philipp Crocoll
+Wallonenstr. 4
+76297 Stutensee
+Germany
+
+is the author of Keepass2Android and Keepass2Android Offline.
+
+# What data is collected?
+
+The contents of your password database is yours and is never collected by us. Keepass2Android stores this data on a location chosen by the user and encrypted in the Keepass database format. The app author does not have any access, neither to the files nor the contents. Depending on the user's choice of the storage location, the files may be stored on third-party servers like Dropbox or Google Drive. 
+
+Keepass2Android does not collect personal identifiable information. For debugging purposes, the user may activate creating a debug log. This collects data inside the app and is not accessible to any other app nor the author of the app, unless the user explicitly sends the debug log to the author. Debug logs usually do not contain personal identifiable information, except if such information is part of file or folder names. Debug logs will not be shared with third parties unless explicitly authorized by the sender.
+
+# What Android permissions are required?
+
+* **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/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/README.md

@@ -2,8 +2,8 @@
 
 
 # What is Keepass2Android?
-Keepass2Android is a password manager app. It allows to store and retrieve passwords and other sensitive information in a file called "database", secured with a strong key.
-The password database file can be synchronized across different devices. This works best using one of the built-in cloud storage options, but can also be performed with third-party apps. Keepass2Android is compatible with KeePass 2.x and KeepassXC on PCs as well as many other KeePass ports for a variety of platforms.
+Keepass2Android is a password manager app. It allows to store and retrieve passwords and other sensitive information in a file called "database". This database is secured with a so-called master password. The master password typically is a strong password and can be complemented with a second factor for additional security.
+The password database file can be synchronized across different devices. This works best using one of the built-in cloud storage options, but can also be performed with third-party apps. Keepass2Android is compatible with Keepass 1 and Keepass 2 on Windows and KeepassX on Linux.
 
 # Where to get it?
 Regular stable releases of Keepass2Android are available on [Google Play](https://play.google.com/store/apps/details?id=keepass2android.keepass2android).
@@ -17,7 +17,11 @@ Beta-releases can be obtained by opting in to the [Beta testing channel](https:/
 * [Make a donation](http://philipp.crocoll.net/donate.php)
 
 # How do I learn more?
-Please see the [wiki](https://github.com/PhilippC/keepass2android/wiki/Documentation) for further information.
+Please see the [documentation](Documentation.md).
 
+# How do I build the project?
+If you want to build Keepass2Android, check the [build guide](Build.readme.md).
+
+The project homepage is https://philipp.crocoll.net/keepass2android/index.php
 
 <img src="https://github.com/PhilippC/keepass2android/actions/workflows/build.yml/badge.svg" alt="build status" /> [Build status](https://github.com/PhilippC/keepass2android/actions)

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.

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-slate

src/DropboxBinding/Additions/AboutAdditions.txt

@@ -1,48 +0,0 @@
-Additions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-    {
-        // JNI bindings
-    }
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-        this (location.X, location.Y, size.Width, size.Height)
-    {
-    }
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-    public int Y { get; set; }
-}

src/DropboxBinding/DropboxBinding.csproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-</Project>

src/DropboxBinding/Transforms/EnumFields.xml

@@ -1,14 +0,0 @@
-<enum-field-mappings>
-  <!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
-    <field jni-name="Fragment_name" clr-name="Name" value="0" />
-    <field jni-name="Fragment_id" clr-name="Id" value="1" />
-    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
-  </mapping>
-  -->
-</enum-field-mappings>

src/DropboxBinding/Transforms/EnumMethods.xml

@@ -1,13 +0,0 @@
-<enum-method-mappings>
-  <!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-  
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-  -->
-</enum-method-mappings>

src/DropboxBinding/Transforms/Metadata.xml

@@ -1,35 +0,0 @@
-<metadata>
-
-  <remove-node path="/api/package[@name='com.dropbox.core']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.http']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.json']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.oauth']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.sdk.android']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.stone']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.util']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v1']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.account']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.callbacks']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.check']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.seenstate']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.teamcommon']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.secondaryemails']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.async']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.auth']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.common']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.contacts']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.fileproperties']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.filerequests']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.files']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.paper']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.openid']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.sharing']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.team']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.teamlog']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.teampolicies']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.users']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.v2.userscommon']" />
-  <remove-node path="/api/package[@name='com.dropbox.android']" />
-  <remove-node path="/api/package[@name='com.dropbox.core.android']" />
-</metadata>

src/KeePass.sln

@@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCloudBindings", "PCloudBin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParser.Tests", "Kp2aAutofillParser.Tests\Kp2aAutofillParser.Tests.csproj", "{F5A2A8F9-C084-498F-9603-9D927BA5C626}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DropboxBinding", "DropboxBinding\DropboxBinding.csproj", "{2FE6E335-E834-4F86-AB83-2C5D225DA929}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -371,30 +369,6 @@ Global
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Win32.Build.0 = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|x64.Build.0 = Debug|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Win32.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Win32.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|x64.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|x64.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/KeePassLib2Android/Cryptography/PopularPasswords.cs

@@ -35,6 +35,8 @@ namespace KeePassLib.Cryptography
 		{
 			get
 			{
+				Debug.Assert(m_dicts.Count > 0); // Should be initialized
+
 				int iMaxLen = 0;
 				foreach(int iLen in m_dicts.Keys)
 				{

src/KeePassLib2Android/Kp2aLog.cs

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

src/KeePassLib2Android/Serialization/KdbxFile.Read.cs

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

src/Kp2aAutofillParser.Tests/AutofillTest.cs

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

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

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

src/Kp2aAutofillParser/AutofillParser.cs

@@ -445,9 +445,6 @@ namespace Kp2aAutofillParser
 
         public static string ToCanonicalHint(string hint)
         {
-            //avoid crash when looking up a null key
-            if (hint == null)
-                return "";
             string canonicalHint;
             if (!hintToCanonicalReplacement.TryGetValue(hint, out canonicalHint))
                 canonicalHint = hint;
@@ -476,16 +473,8 @@ namespace Kp2aAutofillParser
 
             foreach (var field in autofillFields.HintMap.Values.Distinct())
             {
-                if (field == null || field.AutofillHints == null)
-                {
-                    continue;
-                }
                 foreach (var hint in field.AutofillHints)
                 {
-                    if (hint == null)
-                    {
-                        continue;
-                    }
                     if (GetPartitionIndex(hint) == partitionIndex)
                     {
                         filteredCollection.Add(field);
@@ -741,7 +730,7 @@ namespace Kp2aAutofillParser
     {
         public List<TField> InputFields { get; set; } = new List<TField>();
 
-        public string? PackageId { get; set; } = null;
+        public string PackageId { get; set; } = null;
         public string WebDomain { get; set; } = null;
     }
 
@@ -801,14 +790,14 @@ namespace Kp2aAutofillParser
             }
         }
 
-        public AutofillTargetId ParseForFill(AutofillView<FieldT> autofillView)
+        public AutofillTargetId ParseForFill(bool isManual, AutofillView<FieldT> autofillView)
         {
-            return Parse(true, autofillView);
+            return Parse(true, isManual, autofillView);
         }
 
         public AutofillTargetId ParseForSave(AutofillView<FieldT> autofillView)
         {
-            return Parse(false, autofillView);
+            return Parse(false, true, autofillView);
         }
 
         /// <summary>
@@ -816,7 +805,8 @@ namespace Kp2aAutofillParser
         /// </summary>
         /// <returns>The parse.</returns>
         /// <param name="forFill">If set to <c>true</c> for fill.</param>
-        protected virtual AutofillTargetId Parse(bool forFill, AutofillView<FieldT> autofillView)
+        /// <param name="isManualRequest"></param>
+        protected virtual AutofillTargetId Parse(bool forFill, bool isManualRequest, AutofillView<FieldT> autofillView)
         {
             AutofillTargetId result = new AutofillTargetId()
             {
@@ -851,7 +841,6 @@ namespace Kp2aAutofillParser
                         continue;
                     if (viewHints.Where(h => h != null).Select(AutofillHintsHelper.ToCanonicalHint).Intersect(_autofillHintsForLogin).Any())
                     {
-
                         AddFieldToHintMap(viewNode, viewHints.Where(h => h != null).Select(AutofillHintsHelper.ToCanonicalHint).ToHashSet().ToArray());
                     }
 
@@ -883,9 +872,8 @@ namespace Kp2aAutofillParser
                     
                 }
 
-                //for "heuristic determination" we demand that there is a password field or one of the username fields is focused:
-                //Note that "IsFocused" might be false even when tapping the field. It might require long-press to autofill.
-                if (passwordFields.Any() || usernameFields.Any(f => f.IsFocused))
+                //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 });

src/Kp2aBusinessLogic/IKp2aApp.cs

@@ -29,14 +29,6 @@ namespace keepass2android
 
 	}
 
-
-    public enum MessageSeverity
-    {
-        Info,
-        Warning,
-        Error
-    }
-
     /// <summary>
 	/// Interface through which Activities and the logic layer can access some app specific functionalities and Application static data
 	/// </summary>
@@ -110,13 +102,10 @@ namespace keepass2android
 		                    Context ctx,
 		                    string messageSuffix = "");
 
-        void ShowMessage(Context ctx, int resourceId, MessageSeverity severity);
-        void ShowMessage(Context ctx, string text, MessageSeverity severity);
-
-        /// <summary>
-        /// Returns a Handler object which can run tasks on the UI thread
-        /// </summary>
-        Handler UiThreadHandler { get; }
+		/// <summary>
+		/// Returns a Handler object which can run tasks on the UI thread
+		/// </summary>
+		Handler UiThreadHandler { get; }
 
 		IProgressDialog CreateProgressDialog(Context ctx);
 

src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs

@@ -13,7 +13,7 @@ using Android.Content.PM;
 using Android.OS;
 using Android.Preferences;
 using Java.IO;
-using KeePass.Util;
+
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
 using File = System.IO.File;
@@ -121,7 +121,7 @@ namespace keepass2android.Io
 			var response = ex.Response as HttpWebResponse;
 			if ((response != null) && (response.StatusCode == HttpStatusCode.NotFound))
 			{
-				throw new FileNotFoundException(ExceptionUtil.GetErrorMessage(ex), ioc.Path, ex);
+				throw new FileNotFoundException(ex.Message, ioc.Path, ex);
 			}
 			if (ex.Status == WebExceptionStatus.TrustFailure)
 			{

src/Kp2aBusinessLogic/Io/JavaFileStorage.cs

@@ -13,7 +13,6 @@ using Keepass2android.Javafilestorage;
 #endif
 using Exception = System.Exception;
 using FileNotFoundException = Java.IO.FileNotFoundException;
-using KeePass.Util;
 
 namespace keepass2android.Io
 {
@@ -43,7 +42,7 @@ namespace keepass2android.Io
 			}
 			catch (FileNotFoundException e)
 			{
-				throw new System.IO.FileNotFoundException(ExceptionUtil.GetErrorMessage(e), e);
+				throw new System.IO.FileNotFoundException(e.Message, e);
 			}
 			catch (Java.Lang.Exception e)
 			{
@@ -196,7 +195,7 @@ namespace keepass2android.Io
 			}
 			catch (FileNotFoundException e)
 			{
-				throw new System.IO.FileNotFoundException(ExceptionUtil.GetErrorMessage(e), e);
+				throw new System.IO.FileNotFoundException(e.Message, e);
 			}
 			catch (Java.Lang.Exception e)
 			{
@@ -215,7 +214,7 @@ namespace keepass2android.Io
 			}
 			catch (FileNotFoundException e)
 			{
-				throw new System.IO.FileNotFoundException(ExceptionUtil.GetErrorMessage(e), e);
+				throw new System.IO.FileNotFoundException(e.Message, e);
 			}
 			catch (Java.Lang.Exception e)
 			{
@@ -245,7 +244,7 @@ namespace keepass2android.Io
 			}
 			catch (FileNotFoundException e)
 			{
-				throw new System.IO.FileNotFoundException(ExceptionUtil.GetErrorMessage(e), e);
+				throw new System.IO.FileNotFoundException(e.Message, e);
 			}
 			catch (Java.Lang.Exception e)
 			{

src/Kp2aBusinessLogic/Io/NetFtpFileStorage.cs

@@ -8,7 +8,6 @@ using Android.Content;
 using Android.OS;
 using FluentFTP;
 using FluentFTP.Exceptions;
-using KeePass.Util;
 using KeePassLib;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
@@ -128,7 +127,7 @@ namespace keepass2android.Io
 				var ftpEx = (FtpCommandException) exception;
 
 				if (ftpEx.CompletionCode == "550")
-					throw new FileNotFoundException(ExceptionUtil.GetErrorMessage(exception), exception);
+					throw new FileNotFoundException(exception.Message, exception);
 			}
 
 			return exception;

src/Kp2aBusinessLogic/Io/OneDrive2FileStorage.cs

@@ -3,7 +3,6 @@ using System.Reflection;
 using System.Text;
 using Android.Content;
 using Android.Util;
-using KeePass.Util;
 using keepass2android.Io.ItemLocation;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
@@ -523,10 +522,10 @@ namespace keepass2android.Io
         {
 
             if (e.IsMatch(GraphErrorCode.ItemNotFound.ToString()))
-                return new FileNotFoundException(ExceptionUtil.GetErrorMessage(e));
+                return new FileNotFoundException(e.Message);
             if (e.Message.Contains("\n\n404 : ")
             ) //hacky solution to check for not found. errorCode was null in my tests so I had to find a workaround.
-                return new FileNotFoundException(ExceptionUtil.GetErrorMessage(e));
+                return new FileNotFoundException(e.Message);
             return e;
         }
 
@@ -1149,46 +1148,30 @@ namespace keepass2android.Io
                 });
             }
 
+            string? driveId = parentPath.DriveId;
+            if ((string.IsNullOrEmpty(driveId)) && (drives?.Any() == true))
+            {
+                driveId = drives.First().Id;
+            }
+        
             
             if (!CanListShares)
                 return result;
-
             
-            try
+            var sharedWithMeResponse = await client.Drives[driveId].SharedWithMe.GetAsSharedWithMeGetResponseAsync();
+
+            foreach (DriveItem i in sharedWithMeResponse?.Value ?? [])
             {
-                string? driveId = parentPath.DriveId;
-                if (string.IsNullOrEmpty(driveId))
+                var oneDrive2ItemLocation = parentPath.BuildShare(i.RemoteItem.Id, i.RemoteItem.Name, i.RemoteItem.WebUrl, i.RemoteItem.ParentReference.DriveId);
+                FileDescription sharedFileEntry = new FileDescription()
                 {
-                    driveId = (await client.Me.Drive.GetAsync()).Id;
-                }
-                if ((string.IsNullOrEmpty(driveId)) && (drives?.Any() == true))
-                {
-                    driveId = drives.First().Id;
-                }
+                    CanWrite = true, CanRead = true, DisplayName = i.Name,
+                    IsDirectory = true,
+                    Path = oneDrive2ItemLocation.ToString()
+                };
+                result.Add(sharedFileEntry);
 
-                var sharedWithMeResponse = await client.Drives[driveId].SharedWithMe.GetAsSharedWithMeGetResponseAsync();
-
-                foreach (DriveItem i in sharedWithMeResponse?.Value ?? [])
-                {
-                    var oneDrive2ItemLocation = parentPath.BuildShare(i.RemoteItem.Id, i.RemoteItem.Name, i.RemoteItem.WebUrl, i.RemoteItem.ParentReference.DriveId);
-                    FileDescription sharedFileEntry = new FileDescription()
-                    {
-                        CanWrite = true,
-                        CanRead = true,
-                        DisplayName = i.Name,
-                        IsDirectory = (i.Folder != null) || ((i.RemoteItem != null) && (i.RemoteItem.Folder != null)),
-                        Path = oneDrive2ItemLocation.ToString()
-                    };
-                    result.Add(sharedFileEntry);
-
-                }
             }
-            catch (Exception e)
-            {
-                logDebug("Failed to list shares: " + e);
-            }
-
-
 
             return result;
         }

src/Kp2aBusinessLogic/Io/OneDriveFileStorage.cs

@@ -16,32 +16,20 @@ namespace keepass2android.Io
     /// </summary>
 	public class OneDriveFileStorage: IFileStorage
 	{
-        public OneDriveFileStorage(IKp2aApp app)
-        {
-            _app = app;
-        }
-
-        private readonly IKp2aApp _app;
-
-        public IEnumerable<string> SupportedProtocols
+		
+		public IEnumerable<string> SupportedProtocols
 		{
 			get
 			{
 				yield return "skydrive";
 				yield return "onedrive";
-            }
+			}
 		}
 
-        string GetDeprecatedMessage()
-        {
-            return
-                "You have opened your file through a deprecated Microsoft API. Please select Change database, Open Database and then select OneDrive again.";
-        }
-
-        private Exception GetDeprecatedException()
+        private Exception GetDeprecatedMessage()
         {
             return new Exception(
-                GetDeprecatedMessage());
+                "You have opened your file through a deprecated Microsoft API. Please select Change database, Open Database and then select One Drive again.");
         }
 
 	    public bool UserShouldBackup
@@ -51,132 +39,133 @@ namespace keepass2android.Io
 
         public void Delete(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public bool CheckForFileChangeFast(IOConnectionInfo ioc, string previousFileVersion)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public string GetCurrentFileVersionFast(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public Stream OpenFileForRead(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public IWriteTransaction OpenWriteTransaction(IOConnectionInfo ioc, bool useFileTransaction)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public string GetFilenameWithoutPathAndExt(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public string GetFileExtension(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public bool RequiresCredentials(IOConnectionInfo ioc)
         {
-            return false;
+            throw GetDeprecatedMessage();
         }
 
         public void CreateDirectory(IOConnectionInfo ioc, string newDirName)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public IEnumerable<FileDescription> ListContents(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public FileDescription GetFileDescription(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public bool RequiresSetup(IOConnectionInfo ioConnection)
         {
-            return false;
+            throw GetDeprecatedMessage();
         }
 
         public string IocToPath(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public void StartSelectFile(IFileStorageSetupInitiatorActivity activity, bool isForSave, int requestCode, string protocolId)
         {
-            
+            throw GetDeprecatedMessage();
         }
 
         public void PrepareFileUsage(IFileStorageSetupInitiatorActivity activity, IOConnectionInfo ioc, int requestCode,
             bool alwaysReturnSuccess)
         {
-            _app.ShowMessage(activity.Activity, GetDeprecatedMessage(), MessageSeverity.Error);
-
+            throw GetDeprecatedMessage();
         }
 
         public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc)
         {
-            
+            throw GetDeprecatedMessage();
         }
 
         public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState)
         {
-            
+            throw GetDeprecatedMessage();
         }
 
         public void OnResume(IFileStorageSetupActivity activity)
         {
-            
+            throw GetDeprecatedMessage();
         }
 
         public void OnStart(IFileStorageSetupActivity activity)
         {
+            throw GetDeprecatedMessage();
         }
 
         public void OnActivityResult(IFileStorageSetupActivity activity, int requestCode, int resultCode, Intent data)
         {
+            throw GetDeprecatedMessage();
         }
 
         public string GetDisplayName(IOConnectionInfo ioc)
         {
-            return "File using deprecated Microsoft API. Please update.";
+            throw GetDeprecatedMessage();
         }
 
         public string CreateFilePath(string parent, string newFilename)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public IOConnectionInfo GetParentPath(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public IOConnectionInfo GetFilePath(IOConnectionInfo folderPath, string filename)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public bool IsPermanentLocation(IOConnectionInfo ioc)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
 
         public bool IsReadOnly(IOConnectionInfo ioc, OptionalOut<UiStringKey> reason = null)
         {
-            throw GetDeprecatedException();
+            throw GetDeprecatedMessage();
         }
     }
 }

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -4,7 +4,6 @@
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <DefineConstants Condition="'$(Flavor)'=='NoNet'">NO_QR_SCANNER;EXCLUDE_JAVAFILESTORAGE;NoNet</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
@@ -13,6 +12,7 @@
     <PackageReference Include="FluentFTP" Version="51.1.0" />
     <PackageReference Include="MegaApiClient" Version="1.10.4" />
     <PackageReference Include="Microsoft.Graph" Version="5.68.0" />
+	<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.7" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.67.1" />
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0" />
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.13.1.5" />
@@ -20,7 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBinding\AndroidFileChooserBinding.csproj" />
-    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" Condition="'$(Flavor)'!='NoNet'"  />
+    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" />
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj" />
     <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj" />
     <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj" />

src/Kp2aBusinessLogic/SearchDbHelper.cs

@@ -138,8 +138,7 @@ namespace keepass2android
 				{
 					continue;
 				}
-				if (string.Equals(host, otherHost, StringComparison.OrdinalIgnoreCase) ||
-					host.EndsWith("." + otherHost, StringComparison.OrdinalIgnoreCase))
+				if (host.IndexOf(otherHost, StringComparison.InvariantCultureIgnoreCase) > -1)
 				{
 					pgResults.AddEntry(entry, false);
 				}

src/Kp2aBusinessLogic/SelectStorageLocationActivityBase.cs

@@ -4,7 +4,6 @@ using Android.Content;
 using Android.OS;
 using Android.Widget;
 using Java.Net;
-using KeePass.Util;
 using KeePassLib.Serialization;
 using keepass2android.Io;
 
@@ -95,12 +94,15 @@ namespace keepass2android
 				}
 				if ((resultCode == Result.Canceled) && (data != null) && (data.HasExtra("EXTRA_ERROR_MESSAGE")))
 				{
-					ShowErrorToast(data.GetStringExtra("EXTRA_ERROR_MESSAGE"));
+					ShowToast(data.GetStringExtra("EXTRA_ERROR_MESSAGE"));
 				}
 
 				if (resultCode == Result.Ok)
 				{
+					Kp2aLog.Log("FileSelection returned "+data.DataString);
+					//TODO: don't try to extract filename if content URI
 					string filename = IntentToFilename(data);
+					Kp2aLog.Log("FileSelection returned filename " + filename);
 					if (filename != null)
 					{
 						if (filename.StartsWith("file://"))
@@ -148,7 +150,7 @@ namespace keepass2android
 
 		protected abstract void StartFileChooser(string path, int requestCode, bool isForSave);
 
-		protected abstract void ShowErrorToast(string text);
+		protected abstract void ShowToast(string text);
 
 		protected abstract void ShowInvalidSchemeMessage(string dataString);
 
@@ -206,7 +208,7 @@ namespace keepass2android
 					{
 						return () =>
 							{
-								ShowErrorToast(_app.GetResourceString(UiStringKey.ErrorOcurred) + " " + ExceptionUtil.GetErrorMessage(e));
+								ShowToast(_app.GetResourceString(UiStringKey.ErrorOcurred) + " " + e.Message);
 								ReturnCancel();
 							};
 					}

src/Kp2aBusinessLogic/Utils/ExceptionUtil.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-namespace KeePass.Util
-{
-    public class ExceptionUtil
-    {
-
-        public static string GetErrorMessage(Exception e)
-        {
-            string errorMessage = e.Message;
-            if (e is Java.Lang.Exception javaException)
-            {
-                try
-                {
-                    errorMessage = javaException.LocalizedMessage ?? javaException.Message ?? errorMessage;
-                }
-                finally
-                {
-
-                }
-            }
-
-            return errorMessage;
-        }
-
-    }
-}

src/Kp2aBusinessLogic/database/CheckDatabaseForChanges.cs

@@ -5,7 +5,6 @@ using System.Security.Cryptography;
 using System.Text;
 using Android.App;
 using Android.Content;
-using KeePass.Util;
 using KeePassLib.Cryptography;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
@@ -66,7 +65,7 @@ namespace keepass2android
 			}
 			catch (Exception e)
 			{
-				Finish(false, ExceptionUtil.GetErrorMessage(e));
+				Finish(false, e.Message);
 			}
 
 		}

src/Kp2aBusinessLogic/database/Database.cs

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

src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs

@@ -10,7 +10,6 @@ using Com.Keepassdroid.Database.Exception;
 #endif
 using Com.Keepassdroid.Database.Save;
 using Java.Util;
-using KeePass.Util;
 using KeePassLib;
 using KeePassLib.Cryptography;
 using KeePassLib.Cryptography.Cipher;
@@ -83,14 +82,15 @@ namespace keepass2android
 			catch (Java.IO.FileNotFoundException e)
 			{
 				throw new FileNotFoundException(
-                    ExceptionUtil.GetErrorMessage(e), e);
+					e.Message, e);
 			}  
 			catch (Java.Lang.Exception e)
 			{
 				if (e.Message == "Invalid key!")
 					throw new InvalidCompositeKeyException();
-				throw new Exception(ExceptionUtil.GetErrorMessage(e) ??
-                                                                  e.GetType().Name, e);
+				throw new Exception(e.LocalizedMessage ??
+				e.Message ??
+				e.GetType().Name, e);
 			}
 			
 			HashOfLastStream = hashingStream.Hash;

src/Kp2aBusinessLogic/database/SynchronizeCachedDatabase.cs

@@ -6,7 +6,6 @@ using Android.App;
 using Android.Content;
 using KeePassLib.Serialization;
 using keepass2android.Io;
-using KeePass.Util;
 
 namespace keepass2android
 {
@@ -110,7 +109,7 @@ namespace keepass2android
 			catch (Exception e)
 			{
                 Kp2aLog.LogUnexpectedError(e);
-				Finish(false, ExceptionUtil.GetErrorMessage(e));
+				Finish(false, e.Message);
 			}
 			
 		}

src/Kp2aBusinessLogic/database/edit/LoadDB.cs

@@ -21,7 +21,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Android.App;
-using KeePass.Util;
 using keepass2android.database.edit;
 using KeePassLib;
 using KeePassLib.Keys;
@@ -104,10 +103,10 @@ namespace keepass2android
 			}
 			catch (AggregateException e)
 			{
-				string message = ExceptionUtil.GetErrorMessage(e);
+				string message = e.Message;
 				foreach (var innerException in e.InnerExceptions)
 				{
-					message = ExceptionUtil.GetErrorMessage(innerException);
+					message = innerException.Message;
 					// Override the message shown with the last (hopefully most recent) inner exception
 					Kp2aLog.LogUnexpectedError(innerException);
 				}
@@ -117,14 +116,14 @@ namespace keepass2android
 			catch (DuplicateUuidsException e)
 			{
 				Kp2aLog.Log(e.ToString());
-				Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError) + " " + ExceptionUtil.GetErrorMessage(e) + _app.GetResourceString(UiStringKey.DuplicateUuidsErrorAdditional), false, Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError) + " " + e.Message + _app.GetResourceString(UiStringKey.DuplicateUuidsErrorAdditional), false, Exception);
 				return;
 			}
 			catch (Exception e)
 			{
 				if (!(e is InvalidCompositeKeyException))
 					Kp2aLog.LogUnexpectedError(e);
-				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + (ExceptionUtil.GetErrorMessage(e) ?? (e is FileNotFoundException ? _app.GetResourceString(UiStringKey.FileNotFound) :  "")), false, Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + (e.Message ?? (e is FileNotFoundException ? _app.GetResourceString(UiStringKey.FileNotFound) :  "")), false, Exception);
 				return;
 			}
 			
@@ -138,7 +137,6 @@ namespace keepass2android
 
 		Database TryLoad(MemoryStream databaseStream)
 		{
-			Kp2aLog.Log("LoadDb: Copying database in memory");
 			//create a copy of the stream so we can try again if we get an exception which indicates we should change parameters
 			//This is not optimal in terms of (short-time) memory usage but is hard to avoid because the Keepass library closes streams also in case of errors.
 			//Alternatives would involve increased traffic (if file is on remote) and slower loading times, so this seems to be the best choice.
@@ -147,9 +145,8 @@ namespace keepass2android
 			workingCopy.Seek(0, SeekOrigin.Begin);
 			//reset stream if we need to reuse it later:
 			databaseStream.Seek(0, SeekOrigin.Begin);
-            Kp2aLog.Log("LoadDb: Ready to start loading");
-            //now let's go:
-            try
+			//now let's go:
+			try
 			{
                 Database newDb = _app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _format, _makeCurrent);
 				Kp2aLog.Log("LoadDB OK");

src/Kp2aBusinessLogic/database/edit/OnFinish.cs

@@ -130,24 +130,24 @@ namespace keepass2android
 			if ( !String.IsNullOrEmpty(message) ) {
 			    Kp2aLog.Log("OnFinish message: " + message);
                 if (makeDialog && ctx != null)
-                {
-                    try
-                    {
-                        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
-
-                        builder.SetMessage(message)
-                            .SetPositiveButton(Android.Resource.String.Ok, (sender, args) => ((Dialog)sender).Dismiss())
-                            .Show();
+			    {
+			        try
+			        {
+			            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
+			            
+			            builder.SetMessage(message)
+			                .SetPositiveButton(Android.Resource.String.Ok, (sender, args) => ((Dialog)sender).Dismiss())
+			                .Show();
 
                     }
                     catch (Exception)
-                    {
-                        Toast.MakeText(ctx, message, ToastLength.Long).Show();
-                    }
-                }
+			        {
+			            Toast.MakeText(ctx, message, ToastLength.Long).Show();
+			        }
+			    }
                 else
                     Toast.MakeText(ctx ?? Application.Context, message, ToastLength.Long).Show();
-            }
+			}
 		}
 	}
 }

src/Kp2aBusinessLogic/database/edit/SaveDB.cs

@@ -29,7 +29,6 @@ using KeePassLib.Utility;
 using keepass2android.Io;
 using Debug = System.Diagnostics.Debug;
 using Exception = System.Exception;
-using KeePass.Util;
 
 namespace keepass2android
 {
@@ -188,7 +187,7 @@ namespace keepass2android
 			}
 */
 					Kp2aLog.LogUnexpectedError(e);
-					Finish(false, ExceptionUtil.GetErrorMessage(e));
+					Finish(false, e.Message);
 					return;
 				}
 			}
@@ -223,8 +222,8 @@ namespace keepass2android
 						catch (Exception e)
 						{
 							Kp2aLog.LogUnexpectedError(e);
-							Kp2aLog.Log("Error in worker thread of SaveDb: " + ExceptionUtil.GetErrorMessage(e));
-							Finish(false, ExceptionUtil.GetErrorMessage(e));
+							Kp2aLog.Log("Error in worker thread of SaveDb: " + e);
+							Finish(false, e.Message);
 						}
 						
 					});
@@ -234,7 +233,7 @@ namespace keepass2android
 			{
 				Kp2aLog.LogUnexpectedError(e);
 				Kp2aLog.Log("Error starting worker thread of SaveDb: "+e);
-				Finish(false, ExceptionUtil.GetErrorMessage(e));
+				Finish(false, e.Message);
 			}
 			
 		}

src/build-scripts/build-java.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#unset ANDROID_NDK_HOME ANDROID_NDK
-
-pushd ../java/
-
-pushd JavaFileStorageTest-AS
-./gradlew assemble
-popd
-
-pushd KP2ASoftkeyboard_AS
-./gradlew assemble
-popd
-
-pushd Keepass2AndroidPluginSDK2
-./gradlew assemble
-popd
-
-pushd KP2AKdbLibrary
-./gradlew assemble
-popd
-
-popd

src/build-scripts/build-native.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-pushd ../java/argon2
-ndk-build
-popd

src/build-scripts/linux-build.md

@@ -1,29 +0,0 @@
-## Setup build environment
-* install Android SDK
-* install Android NDK
-* install dotnet8
-
-```
-
-#from https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-8.0.407-linux-x64-binaries
-wget https://download.visualstudio.microsoft.com/download/pr/9d07577e-f7bc-4d60-838d-f79c50b5c11a/459ef339396783db369e0432d6dc3d7e/dotnet-sdk-8.0.407-linux-x64.tar.gz
-mkdir -p $HOME/dotnet && tar zxf dotnet-sdk-8.0.407-linux-x64.tar.gz -C $HOME/dotnet
-export DOTNET_ROOT=$HOME/dotnet
-export PATH=$PATH:$HOME/dotnet
-
-```
-
-## Build Keepass2Android
-
-```
-git clone --recurse-submodules https://github.com/PhilippC/keepass2android.git
-cd keepass2android/src/build-scripts
-./build-java.sh && ./build-native.sh
-cd ..
-cp Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs
-cd keepass2android-app
-ln -s Manifests/AndroidManifest_debug.xml AndroidManifest.xml
-dotnet workload restore
-dotnet restore
-dotnet build
-```

src/java/JavaFileStorage/app/build.gradle

@@ -41,8 +41,7 @@ dependencies {
         exclude group: 'com.google.android.google-play-services'
     }
     implementation 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
-    implementation 'com.dropbox.core:dropbox-core-sdk:7.0.0'
-    implementation 'com.dropbox.core:dropbox-android-sdk:7.0.0'
+    implementation 'com.dropbox.core:dropbox-core-sdk:5.4.6'
     implementation 'com.google.api-client:google-api-client:1.30.5'
     implementation 'com.google.api-client:google-api-client-android:1.30.5'
 

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

@@ -7,7 +7,6 @@ import com.dropbox.core.DbxOAuth1Upgrader;
 import com.dropbox.core.DbxRequestConfig;
 import com.dropbox.core.InvalidAccessTokenException;
 import com.dropbox.core.android.Auth;
-
 import com.dropbox.core.json.JsonReadException;
 import com.dropbox.core.oauth.DbxCredential;
 import com.dropbox.core.v2.DbxClientV2;
@@ -155,7 +154,7 @@ public class DropboxV2Storage extends JavaFileStorageBase
     {
         if ((previousFileVersion == null) || (previousFileVersion.equals("")))
             return false;
-        path = removeProtocol(path);
+            path = removeProtocol(path);
         try {
             Metadata entry = dbxClient.files().getMetadata(path);
             return !String.valueOf(entry.hashCode()) .equals(previousFileVersion);

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

@@ -304,11 +304,6 @@ public class WebDavStorage extends JavaFileStorageBase {
                         //relative path:
                         e.path = buildPathFromHref(parentPath, r.href);
                     }
-                    if ( (parentPath.indexOf("@") != -1) && (e.path.indexOf("@") == -1))
-                    {
-                        //username/password not contained in .href response. Add it back from parentPath:
-                        e.path = parentPath.substring(0, parentPath.indexOf("@")+1) + e.path.substring(e.path.indexOf("://")+3);
-                    }
 
                     if ((depth == 1) && e.isDirectory)
                     {

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

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

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

@@ -113,15 +113,4 @@ extends Activity implements JavaFileStorage.FileStorageSetupActivity {
 		return state;
 	}
 
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-		MainActivity.storageToTest.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-
-
-
-	}
-
-
 }

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

@@ -147,7 +147,6 @@ import java.util.List;
 //import keepass2android.javafilestorage.DropboxCloudRailStorage;
 import keepass2android.javafilestorage.DropboxV2Storage;
 import keepass2android.javafilestorage.GoogleDriveAppDataFileStorage;
-import keepass2android.javafilestorage.GoogleDriveFullFileStorage;
 import keepass2android.javafilestorage.ICertificateErrorHandler;
 import keepass2android.javafilestorage.JavaFileStorage;
 import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
@@ -548,7 +547,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 
 
 		//storageToTest = new GoogleDriveAppDataFileStorage();
-		/*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
+		storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
 			@Override
 			public boolean onValidationError(String error) {
 				return false;
@@ -559,11 +558,10 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 				return false;
 			}
 		});
-*/
+
 		//storageToTest =  new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
 		//storageToTest =  new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
 		//storageToTest = new DropboxAppFolderFileStorage(ctx,"ax0268uydp1ya57", "3s86datjhkihwyc", true);
-		storageToTest = new GoogleDriveFullFileStorage();
 
 
 		return storageToTest;
@@ -582,8 +580,6 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 		getMenuInflater().inflate(R.menu.main, menu);
 		return true;
 	}
-
-
 	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {

src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/KP2AKeyboard.java

@@ -356,13 +356,7 @@ public class KP2AKeyboard extends InputMethodService
         pFilter.addAction("android.intent.action.PACKAGE_ADDED");
         pFilter.addAction("android.intent.action.PACKAGE_REPLACED");
         pFilter.addAction("android.intent.action.PACKAGE_REMOVED");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            registerReceiver(mPluginManager, pFilter, RECEIVER_EXPORTED);
-        }
-        else
-        {
-            registerReceiver(mPluginManager, pFilter);
-        }
+        registerReceiver(mPluginManager, pFilter);
 
 
         LatinIMEUtil.GCUtils.getInstance().reset();
@@ -381,28 +375,16 @@ public class KP2AKeyboard extends InputMethodService
 
         // register to receive ringer mode changes for silent mode
         IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            registerReceiver(mSilentModeReceiver, filter, RECEIVER_EXPORTED);
-        }
-        else
-        {
-            registerReceiver(mSilentModeReceiver, filter);
-        }
-
+        registerReceiver(mSilentModeReceiver, filter);
+       
         prefs.registerOnSharedPreferenceChangeListener(this);
         
         //check if we have KP2A data available:
-        mHadKp2aData = mShowKp2aKeyboard = KeyboardData.hasData();
+        mHadKp2aData = mShowKp2aKeyboard = keepass2android.kbbridge.KeyboardData.hasData();
         
         mClearKeyboardReceiver = new ClearKeyboardBroadcastReceiver();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)), RECEIVER_EXPORTED);
-        }
-        else
-        {
-            registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)));
-        }
-        Log.d("KP2AK", "registered receiver for clear keyboard broadcast: "+get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this));
+        registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)));
+        android.util.Log.d("KP2AK", "registered receiver for clear keyboard broadcast: "+get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this));
         
     }
 

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

@@ -164,7 +164,7 @@
     <!-- Short message to tell the user the system is ready for them to speak. -->
     <string name="voice_listening">Гаварыце</string>
     <!-- Short message shown after the user finishes speaking. -->
-    <string name="voice_working">Апрацоўка</string>
+    <string name="voice_working">Апрацоўванне</string>
     <!-- Short message shown before the user should speak. -->
     <!-- Short message shown when a generic error occurs. -->
     <string name="voice_error">Памылка. Паўтарыце спробу.</string>

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

@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Title for Latin keyboard  -->
-    <string name="english_ime_name">Keepass2Android-Tastatur</string>
+    <string name="english_ime_name">KeePass2Android-Tastatur</string>
     <!-- Title for Latin keyboard settings activity / dialog -->
     <string name="english_ime_settings">Android-Tastatureinstellungen</string>
     <!-- Title for Latin keyboard input options dialog -->
@@ -49,7 +49,7 @@
     <!-- Description for text prediction -->
     <string name="prediction_summary">Automatische Vervollständigung während der Eingabe aktivieren</string>
     <!-- Dialog title for auto complete choices -->
-    <string name="auto_complete_dialog_title">Autovervollständigung</string>
+    <string name="auto_complete_dialog_title">Automatische. Vervollständigung </string>
     <!-- Option to enable text prediction in landscape -->
     <string name="prediction_landscape">Textfeld vergrößern</string>
     <!-- Description for text prediction -->
@@ -62,7 +62,7 @@
     <string name="auto_punctuate">Autom. Zeichensetzung</string>
     <!-- Description for auto punctuate -->
     <!-- Option to enable quick fixes -->
-    <string name="quick_fixes">Schnelle Korrektur</string>
+    <string name="quick_fixes">Schnelle Fixierung</string>
     <!-- Description for quick fixes -->
     <string name="quick_fixes_summary">Korrigiert gängige Tippfehler</string>
     <!-- Option to enable showing suggestions -->
@@ -112,7 +112,7 @@
     <!-- Tip to long press on typed word to add to dictionary -->
     <string name="tip_add_to_dictionary">Lange auf das Wort ganz links außen drücken, um es zum Wörterbuch hinzuzufügen</string>
     <!-- Instruction to touch the bubble to continue -->
-    <string name="touch_to_continue">Diesen Hinweis antippen, um fortzufahren.»</string>
+    <string name="touch_to_continue">Diesen Hinweis berühren, um fortzufahren.»</string>
     <!-- Instruction to touch the bubble to start typing -->
     <string name="touch_to_finish">Hier berühren, um diesen Hinweis zu schließen und mit dem Tippen zu beginnen!</string>
     <!-- Tutorial tip 1 - The keyboard opens any time you touch a text field -->
@@ -138,7 +138,7 @@
     <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
     <string name="label_symbol_key">\?123</string>
     <!-- Label for "switch to numeric" key.  Must be short to fit on key! -->
-    <string name="label_phone_key">123</string>
+    <string name="label_phone_key">Nummer</string>
     <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
     <string name="label_alpha_key">ABC</string>
     <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -161,7 +161,7 @@
         "Swipe across keyboard to speak"). Also shown when enabling settings. -->
     <string name="voice_hint_dialog_message">Um die Spracheingabe zu verwenden, drücken Sie die Mikrofontaste oder ziehen Sie Ihren Finger über die Bildschirmtastatur.</string>
     <!-- Short message to tell the user the system is ready for them to speak. -->
-    <string name="voice_listening">Jetzt sprechen</string>
+    <string name="voice_listening">Sprechen Sie jetzt</string>
     <!-- Short message shown after the user finishes speaking. -->
     <string name="voice_working">Vorgang läuft</string>
     <!-- Short message shown before the user should speak. -->
@@ -186,7 +186,7 @@
     <!-- Short hint shown in candidate view to explain voice input. -->
     <string name="voice_swipe_hint"><b>„Hinweis:“</b>„ Ziehen Sie zum Sprechen den Finger über die Tastatur.“</string>
     <!-- Short hint shown in candidate view to explain that user can speak punctuation. -->
-    <string name="voice_punctuation_hint"><b>Hinweis: </b>Versuche beim nächsten Mal, Satzzeichen wie „Punkt“, „Komma“ oder „Fragezeichen“ per Sprachbefehl einzugeben.</string>
+    <string name="voice_punctuation_hint"><b>„Hinweis: “</b>„ Versuchen Sie beim nächsten Mal, Satzzeichen wie „Punkt“, „Komma“ oder „Fragezeichen“ per Sprachbefehl einzugeben.“</string>
     <!-- Label on button to stop recognition. Must be short to fit on button. -->
     <string name="cancel">Abbrechen</string>
     <!-- Label on button when an error occurs -->
@@ -216,7 +216,7 @@
     <!-- appears above image showing the user to click on a TextView to show the IME -->
     <string name="open_the_keyboard"><font size="17"><b>„Tastatur öffnen“\n</b></font><font size="3">\n</font>„Berühren Sie ein beliebiges Textfeld.“</string>
     <!-- appears above the image showing the back button used to close the keyboard -->
-    <string name="close_the_keyboard"><font size="17"><b>Tastatur schließen\n</b></font><font size="3">\n</font>Drücken die Zurück-Taste.</string>
+    <string name="close_the_keyboard"><font size="17"><b>„Tastatur schließen“\n</b></font><font size="3">\n</font>„Drücken Sie die Zurück-Taste.“</string>
     <!-- appears above image showing how to use touch and hold -->
     <string name="touch_and_hold"><font size="17"><b>„Für Optionen eine Taste berühren und gedrückt halten“\n</b></font><font size="3">\n</font>„Greifen Sie auf Satzzeichen und Akzente zu.“</string>
     <!-- appears above image showing how to access keyboard settings -->

src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java

@@ -64,6 +64,8 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
     @Override
     public boolean onCreate() {
 
+        Log.d("KP2A_FC_P", "onCreate");
+
         BaseFileProviderUtils.registerProviderInfo(_ID,
                 getAuthority());
 
@@ -220,12 +222,12 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         try
         {
             checkConnection(uri);
-            if (Utils.doLog()) Log.d("KP2A_FC_P", "checking connection for " + uri + " ok.");
+            Log.d("KP2A_FC_P", "checking connection for " + uri + " ok.");
             return null;
         }
         catch (Exception e)
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P","Check connection failed with: " + e.toString());
+            Log.d("KP2A_FC_P","Check connection failed with: " + e.toString());
 
             MatrixCursor matrixCursor = new MatrixCursor(BaseFileProviderUtils.CONNECTION_CHECK_CURSOR_COLUMNS);
             RowBuilder newRow = matrixCursor.newRow();
@@ -253,7 +255,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         }
         catch (FileNotFoundException ex)
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P","File not found. Ignore.");
+            Log.d("KP2A_FC_P","File not found. Ignore.");
 
             return;
         }
@@ -274,8 +276,8 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         MatrixCursor matrixCursor = null;
 
         String lastPathSegment = uri.getLastPathSegment();
-
-        if (Utils.doLog()) Log.d("KP2A_FC_P", "lastPathSegment:" + lastPathSegment);
+        
+        Log.d("KP2A_FC_P", "lastPathSegment:" + lastPathSegment);
         
         if (BaseFile.CMD_CANCEL.equals(lastPathSegment)) {
             int taskId = ProviderUtils.getIntQueryParam(uri,
@@ -359,7 +361,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
 
         } else if (BaseFile.CMD_CHECK_CONNECTION.equals(lastPathSegment))
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P","Check connection...");
+            Log.d("KP2A_FC_P","Check connection...");
             return getCheckConnectionCursor(uri);
         }
 
@@ -468,7 +470,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
                 String displayName = getFileEntryCached(dirName).displayName;
                 newRow.add(displayName);
                 
-                if (Utils.doLog()) Log.d(CLASSNAME, "Returning name " + displayName+" for " +dirName);
+                Log.d(CLASSNAME, "Returning name " + displayName+" for " +dirName);
             }
         }
 
@@ -688,7 +690,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         }
         catch (Exception e)
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P", "sortFiles() >> "+e);
+            Log.d("KP2A_FC_P", "sortFiles() >> "+e);
             throw e;
         }
     }// sortFiles()
@@ -775,14 +777,14 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         path = removeTrailingSlash(path);
         if (path.indexOf("://") == -1)
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P", "invalid path: " + path);
+            Log.d("KP2A_FC_P", "invalid path: " + path);
             return null;
         }
         String pathWithoutProtocol = path.substring(path.indexOf("://") + 3);
         int lastSlashPos = path.lastIndexOf("/");
         if (pathWithoutProtocol.indexOf("/") == -1)
         {
-            if (Utils.doLog()) Log.d("KP2A_FC_P", "parent of " + path + " is null");
+            Log.d("KP2A_FC_P", "parent of " + path + " is null");
             return null;
         }
         else
@@ -791,7 +793,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
             if (params != null) {
                 parent += params;
             }
-            if (Utils.doLog()) Log.d("KP2A_FC_P", "parent of " + path +" is " + parent);
+            Log.d("KP2A_FC_P", "parent of " + path +" is " + parent);
             return parent;
         }
     }

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

@@ -56,7 +56,7 @@
     <string name="afc_title_sort_by">Sortieren nach…</string>
     <string name="afc_yesterday">Gestern</string>
     <plurals name="afc_title_choose_directories">
-        <item quantity="one">Ordner wählen…</item>
+        <item quantity="one">Ordner wählen …</item>
         <item quantity="other">Verzeichnisse wählen</item>
     </plurals>
     <plurals name="afc_title_choose_files">
@@ -64,7 +64,7 @@
         <item quantity="other">Dateien wählen …</item>
     </plurals>
     <plurals name="afc_title_choose_files_directories">
-        <item quantity="one">Datei/Ordner wählen…</item>
+        <item quantity="one">Datei/Ordner wählen …</item>
         <item quantity="other">Dateien/Ordner wählen …</item>
     </plurals>
 </resources>

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

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

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

@@ -55,19 +55,4 @@
     <string name="afc_title_size">Dimensiune</string>
     <string name="afc_title_sort_by">Sortează după…</string>
     <string name="afc_yesterday">Ieri</string>
-    <plurals name="afc_title_choose_directories">
-        <item quantity="one">Alege dosarul…</item>
-        <item quantity="few">Alege dosarele…</item>
-        <item quantity="other">Alege dosarele…</item>
-    </plurals>
-    <plurals name="afc_title_choose_files">
-        <item quantity="one">Alege fișierul…</item>
-        <item quantity="few">Alege fișierele…</item>
-        <item quantity="other">Alege fișierele…</item>
-    </plurals>
-    <plurals name="afc_title_choose_files_directories">
-        <item quantity="one">Alege fișierul/dosarul…</item>
-        <item quantity="few">Alege fișierele/dosarele…</item>
-        <item quantity="other">Alege fișierele/dosarele…</item>
-    </plurals>
 </resources>

src/keepass2android-app/AboutDialog.cs

@@ -59,7 +59,7 @@ namespace keepass2android
 					}
 					catch (ActivityNotFoundException)
 					{
-                        App.Kp2a.ShowMessage(Context, Resource.String.no_url_handler, MessageSeverity.Error);
+						Toast.MakeText(Context, Resource.String.no_url_handler, ToastLength.Long).Show();
 					}
 
 				};
@@ -71,7 +71,7 @@ namespace keepass2android
 				}
 				catch (ActivityNotFoundException)
 				{
-					App.Kp2a.ShowMessage(Context, Resource.String.no_url_handler,  MessageSeverity.Error);
+					Toast.MakeText(Context, Resource.String.no_url_handler, ToastLength.Long).Show();
 				}
 			};
 			FindViewById(Resource.Id.translate).Click += delegate
@@ -82,7 +82,7 @@ namespace keepass2android
 				}
 				catch (ActivityNotFoundException)
 				{
-					App.Kp2a.ShowMessage(Context, Resource.String.no_url_handler,  MessageSeverity.Error);
+					Toast.MakeText(Context, Resource.String.no_url_handler, ToastLength.Long).Show();
 				}
 			}; FindViewById(Resource.Id.donate).Click += delegate
 			{

src/keepass2android-app/AppKilledInfo.cs

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

src/keepass2android-app/ChangeLog.cs

@@ -14,11 +14,9 @@ using Android.Runtime;
 using Android.Text;
 using Android.Text.Method;
 using Android.Text.Util;
-using Android.Util;
 using Android.Views;
 using Android.Webkit;
 using Android.Widget;
-using AndroidX.Core.Content;
 using Google.Android.Material.Dialog;
 using keepass2android;
 
@@ -31,16 +29,7 @@ namespace keepass2android
 			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
-                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_12
-#if !NoNet
-					,Resource.Array.ChangeLog_1_12_net
-#endif
-                }, "1.12"),
-                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_11
-#if !NoNet
-                    ,Resource.Array.ChangeLog_1_11_net
-#endif
-                }, "1.11"),
+                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_11,Resource.Array.ChangeLog_1_11_net}, "1.11"),
                 BuildChangelogString(ctx, Resource.Array.ChangeLog_1_10, "1.10"),
                 BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09e, "1.09e"),
 				BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09d, "1.09d"),
@@ -110,28 +99,32 @@ namespace keepass2android
 				warning = ctx.GetString(Resource.String.PreviewWarning);
 			}
 
-			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => {((AndroidX.AppCompat.App.AlertDialog)dlgSender).Dismiss(); });
+			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => {((AlertDialog)dlgSender).Dismiss(); });
 			builder.SetCancelable(false);
 
 			WebView wv = new WebView(ctx);
 
-			
-            
-            
+			wv.SetBackgroundColor(Color.White);
+			wv.LoadDataWithBaseURL(null, GetLog(changeLog, warning, ctx), "text/html", "UTF-8", null);
 
+
+			//builder.SetMessage("");
 			builder.SetView(wv);
 			Dialog dialog = builder.Create();
-            dialog.DismissEvent += (sender, e) =>
+			dialog.DismissEvent += (sender, e) =>
 			{
 				onDismiss();
 			};
-            wv.SetBackgroundColor(Color.Transparent);
-            wv.LoadDataWithBaseURL(null, GetLog(changeLog, warning, dialog.Context), "text/html", "UTF-8", null);
+			dialog.Show();
+			/*TextView message = (TextView)dialog.FindViewById(Android.Resource.Id.Message);
+
+			
+			message.TextFormatted = Html.FromHtml(ConcatChangeLog(ctx, changeLog.ToArray()));
+			message.AutoLinkMask=MatchOptions.WebUrls;*/
 
-            dialog.Show();
 		}
 
-        private static string BuildChangelogString(Context ctx, int changeLogResId, string version)
+	    private static string BuildChangelogString(Context ctx, int changeLogResId, string version)
         {
             return BuildChangelogString(ctx, new List<int>() { changeLogResId }, version);
 
@@ -157,44 +150,32 @@ namespace keepass2android
 
         }
 
-		private const string HtmlEnd = @"</body>
-</html>";
-    
-		private static string GetLog(List<string> changeLog, string warning, Context ctx)
-        {
-            string secondaryColor = "31628D";
-            string onSurfaceColor = "171D1E";
-            if (((int)ctx.Resources.Configuration.UiMode & (int)UiMode.NightMask) == (int)UiMode.NightYes)
-            {
-                secondaryColor = "99CBFF";
-                onSurfaceColor = "E1E4D6";
-            }
-                
-
-            string HtmlStart = @"<html>
+        private const string HtmlStart = @"<html>
   <head>
     <style type='text/css'>
-      a            { color:#"+ onSurfaceColor + @" }
+      a            { color:#000000 }
       div.title    { 
-          color:"+ secondaryColor+@"; 
+          color:287AA9; 
           font-size:1.2em; 
           font-weight:bold; 
           margin-top:1em; 
           margin-bottom:0.5em; 
           text-align:center }
       div.subtitle { 
-          color:"+ secondaryColor+@"; 
+          color:287AA9; 
           font-size:0.8em; 
           margin-bottom:1em; 
           text-align:center }
-      div.freetext { color:#"+ onSurfaceColor + @" }
-      div.list     { color:#"+ onSurfaceColor + @" }
+      div.freetext { color:#000000 }
+      div.list     { color:#000000 }
     </style>
   </head>
   <body>";
-
-
-            StringBuilder sb = new StringBuilder(HtmlStart);
+		private const string HtmlEnd = @"</body>
+</html>";
+		private static string GetLog(List<string> changeLog, string warning, Context ctx)
+		{
+			StringBuilder sb = new StringBuilder(HtmlStart);
 			if (!string.IsNullOrEmpty(warning))
 			{
 				sb.Append(warning);

src/keepass2android-app/CreateDatabaseActivity.cs

@@ -183,7 +183,7 @@ namespace keepass2android
 			// Verify that a password or keyfile is set
 			if (password.Length == 0 && !keyfileCheckbox.Checked)
 			{
-				App.Kp2a.ShowMessage(this, Resource.String.error_nopass,  MessageSeverity.Error);
+				Toast.MakeText(this, Resource.String.error_nopass, ToastLength.Long).Show();
 				return;
 			}
 
@@ -207,7 +207,7 @@ namespace keepass2android
 				}
 				catch (Exception)
 				{
-					App.Kp2a.ShowMessage(this, Resource.String.error_adding_keyfile,  MessageSeverity.Error);
+					Toast.MakeText(this, Resource.String.error_adding_keyfile, ToastLength.Long).Show();
 					return;
 				}
 			}
@@ -235,7 +235,7 @@ namespace keepass2android
 			if (! pass.Equals(confpass))
 			{
 				// Passwords do not match
-				App.Kp2a.ShowMessage(this, Resource.String.error_pass_match,  MessageSeverity.Error);
+				Toast.MakeText(this, Resource.String.error_pass_match, ToastLength.Long).Show();
 				return false;
 			}
 			return true;

src/keepass2android-app/CreateNewFilename.cs

@@ -28,7 +28,7 @@ namespace keepass2android
 			}
 			catch (Exception e)
 			{
-				Finish(false, Util.GetErrorMessage(e));
+				Finish(false, e.Message);
 			}
 
 		}

src/keepass2android-app/DisableAutofillForQueryActivity.cs

@@ -19,7 +19,7 @@ using keepass2android.services.AutofillBase;
 
 namespace keepass2android
 {
-    [Activity(Label = "DisableAutofillForQueryActivity", Theme = "@style/Kp2aTheme_ActionBar")]
+    [Activity(Label = "DisableAutofillForQueryActivity")]
     public class DisableAutofillForQueryActivity : Activity
     {
         public IAutofillIntentBuilder IntentBuilder = new Kp2aAutofillIntentBuilder();
@@ -41,7 +41,7 @@ namespace keepass2android
             string requestedUrl = Intent.GetStringExtra(ChooseForAutofillActivityBase.ExtraQueryString);
             if (requestedUrl == null)
             {
-                App.Kp2a.ShowMessage(this, "Cannot execute query for null.",  MessageSeverity.Error);
+                Toast.MakeText(this, "Cannot execute query for null.", ToastLength.Long).Show();
                 RestartApp();
                 return;
             }
@@ -63,6 +63,8 @@ namespace keepass2android
 
             prefs.Edit().PutStringSet("AutoFillDisabledQueries", disabledValues).Commit();
 
+            bool isManual = Intent.GetBooleanExtra(ChooseForAutofillActivityBase.ExtraIsManualRequest, false);
+            
             Intent reply = new Intent();
             FillResponse.Builder builder = new FillResponse.Builder();
             AssistStructure structure = (AssistStructure)Intent.GetParcelableExtra(AutofillManager.ExtraAssistStructure);
@@ -75,7 +77,7 @@ namespace keepass2android
             StructureParser parser = new StructureParser(this, structure);
             try
             {
-                parser.ParseForFill();
+                parser.ParseForFill(isManual);
 
             }
             catch (Java.Lang.SecurityException e)

src/keepass2android-app/EntryActivity.cs

@@ -53,7 +53,6 @@ using keepass2android.fileselect;
 using KeeTrayTOTP.Libraries;
 using Boolean = Java.Lang.Boolean;
 using Android.Util;
-using AndroidX.Core.Content;
 using Google.Android.Material.Dialog;
 using keepass2android;
 
@@ -78,7 +77,7 @@ namespace keepass2android
             var task = new EntryActivity.WriteBinaryTask(_activity, App.Kp2a, new ActionOnFinish(_activity, (success, message, activity) =>
                 {
                     if (!success)
-                        App.Kp2a.ShowMessage(activity, message,  MessageSeverity.Error);
+                        Toast.MakeText(activity, message, ToastLength.Long).Show();
                 }
             ), ((EntryActivity)_activity).Entry.Binaries.Get(_binaryToSave), ioc);
             ProgressTask pt = new ProgressTask(App.Kp2a, _activity, task);
@@ -107,8 +106,8 @@ namespace keepass2android
 
 	    public const int requestCodeBinaryFilename = 42376;
         public const int requestCodeSelFileStorageForWriteAttachment = 42377;
+	    
 
-        protected override View? SnackbarAnchorView => FindViewById(Resource.Id.main_content);
 
         public static void Launch(Activity act, PwEntry pw, int pos, AppTask appTask, ActivityFlags? flags = null, int historyIndex=-1)
 		{
@@ -492,9 +491,9 @@ namespace keepass2android
 			App.Kp2a.LastOpenedEntry = new PwEntryOutput(Entry, App.Kp2a.CurrentDb);
 
 			_pluginActionReceiver = new PluginActionReceiver(this);
-			ContextCompat.RegisterReceiver(this, _pluginActionReceiver, new IntentFilter(Strings.ActionAddEntryAction), (int)ReceiverFlags.Exported);
+			RegisterReceiver(_pluginActionReceiver, new IntentFilter(Strings.ActionAddEntryAction), ReceiverFlags.Exported);
 			_pluginFieldReceiver = new PluginFieldReceiver(this);
-            ContextCompat.RegisterReceiver(this, _pluginFieldReceiver, new IntentFilter(Strings.ActionSetEntryField), (int)ReceiverFlags.Exported);
+			RegisterReceiver(_pluginFieldReceiver, new IntentFilter(Strings.ActionSetEntryField), ReceiverFlags.Exported);
 
             var notifyPluginsOnOpenThread = new Thread(NotifyPluginsOnOpen);
             notifyPluginsOnOpenThread.Start();
@@ -767,9 +766,9 @@ namespace keepass2android
 
 	            if (parent == null || (parent.Exists() && !parent.IsDirectory))
 	            {
-	                App.Kp2a.ShowMessage(this,
+	                Toast.MakeText(this,
 	                    Resource.String.error_invalid_path,
-	                     MessageSeverity.Error);
+	                    ToastLength.Long).Show();
 	                return null;
 	            }
 
@@ -778,9 +777,9 @@ namespace keepass2android
 	                // Create parent directory
 	                if (!parent.Mkdirs())
 	                {
-	                    App.Kp2a.ShowMessage(this,
+	                    Toast.MakeText(this,
 	                        Resource.String.error_could_not_create_parent,
-	                         MessageSeverity.Error);
+	                        ToastLength.Long).Show();
 	                    return null;
 
 	                }
@@ -794,18 +793,18 @@ namespace keepass2android
 	            }
 	            catch (Exception exWrite)
 	            {
-	                App.Kp2a.ShowMessage(this,
+	                Toast.MakeText(this,
 	                    GetString(Resource.String.SaveAttachment_Failed, new Java.Lang.Object[] {filename})
-	                    + Util.GetErrorMessage(exWrite),  MessageSeverity.Error);
+	                    + exWrite.Message, ToastLength.Long).Show();
 	                return null;
 	            }
 	            finally
 	            {
 	                MemUtil.ZeroByteArray(pbData);
 	            }
-	            App.Kp2a.ShowMessage(this,
+	            Toast.MakeText(this,
 	                GetString(Resource.String.SaveAttachment_doneMessage, new Java.Lang.Object[] {filename}),
-	                 MessageSeverity.Info);
+	                ToastLength.Short).Show();
 	            return Uri.Parse("content://" + AttachmentContentProvider.Authority + "/"
 	                             + filename);
 	        }
@@ -838,7 +837,7 @@ namespace keepass2android
 				catch (ActivityNotFoundException)
 				{
 					//ignore
-					App.Kp2a.ShowMessage(this, "Couldn't open file",  MessageSeverity.Error);
+					Toast.MakeText(this, "Couldn't open file", ToastLength.Short).Show();
 				}
 			}
 
@@ -1305,7 +1304,7 @@ namespace keepass2android
 	            }
 	            catch (Exception ex)
 	            {
-	                Finish(false, Util.GetErrorMessage(ex));
+	                Finish(false, ex.Message);
 	            }
 
 
@@ -1558,7 +1557,7 @@ namespace keepass2android
 			}
 			catch (ActivityNotFoundException)
 			{
-				App.Kp2a.ShowMessage(this, Resource.String.no_url_handler,  MessageSeverity.Error);
+				Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
 			}
 			return true;
 		}

src/keepass2android-app/EntryEditActivity.cs

@@ -37,7 +37,6 @@ using System.Net;
 using System.Text;
 using Android.Content.Res;
 using Android.Database;
-using Android.Gms.Common;
 using Android.Gms.Tasks;
 using Android.Graphics;
 using Android.Graphics.Drawables;
@@ -55,10 +54,8 @@ using Object = Java.Lang.Object;
 using Uri = Android.Net.Uri;
 using Resource = keepass2android.Resource;
 using Google.Android.Material.TextField;
-#if !NO_QR_SCANNER
 using Xamarin.Google.MLKit.Vision.Barcode.Common;
 using Xamarin.Google.MLKit.Vision.CodeScanner;
-#endif
 using Console = System.Console;
 using Task = Android.Gms.Tasks.Task;
 
@@ -66,10 +63,10 @@ namespace keepass2android
 {
 	[Activity(Label = "@string/app_name", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden, Theme = "@style/Kp2aTheme_ActionBar")]			
 	public class EntryEditActivity : LockCloseActivity {
+	    
 
-        protected override View? SnackbarAnchorView => FindViewById(Resource.Id.main_content);
-
-        public const String KeyEntry = "entry";
+	    
+		public const String KeyEntry = "entry";
 		public const String KeyParent = "parent";
 		public const String KeyTemplateUuid = "KeyTemplateUuid";
 		
@@ -333,18 +330,13 @@ namespace keepass2android
 
         }
 
-        private bool hasRequestedKeyboardActivation = false;
-        protected override void OnStart()
+	    protected override void OnStart()
 	    {
 	        base.OnStart();
 	        if (PreferenceManager.GetDefaultSharedPreferences(this)
-	            .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false)
-                && (!hasRequestedKeyboardActivation))
+	            .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false))
 	        {
-                //only try this once. if the user clicks cancel, we don't want to ask again
-				// (it may happen that the activity is restarted because of the NewTask flag immediately after the dialog)
-                hasRequestedKeyboardActivation = true;
-                CopyToClipboardService.ActivateKeyboard(this);
+	            CopyToClipboardService.ActivateKeyboard(this);
 	        }
         }
 
@@ -722,7 +714,7 @@ namespace keepass2android
 			}
 			catch(Exception exAttach)
 			{
-				App.Kp2a.ShowMessage(this, GetString(Resource.String.AttachFailed)+" "+ Util.GetErrorMessage(exAttach),  MessageSeverity.Error);
+				Toast.MakeText(this, GetString(Resource.String.AttachFailed)+" "+exAttach.Message, ToastLength.Long).Show();
 			}
 			State.EntryModified = true;
 			PopulateBinaries();
@@ -840,7 +832,7 @@ namespace keepass2android
 						string s = Util.GetFilenameFromInternalFileChooser(data, this);
 						if (s == null)
 						{
-							App.Kp2a.ShowMessage(this, "No URI retrieved.",  MessageSeverity.Error);
+							Toast.MakeText(this, "No URI retrieved.", ToastLength.Short).Show();
 							return;
 						}
 						uri = Uri.Parse(s);
@@ -1146,7 +1138,7 @@ namespace keepass2android
 				}
                 else
                 {
-					App.Kp2a.ShowMessage(this, "did not find target field",  MessageSeverity.Error);
+					Toast.MakeText(this, "did not find target field", ToastLength.Long).Show();
                 }
                 
 				
@@ -1160,18 +1152,9 @@ namespace keepass2android
             {
                 dlgView.FindViewById(Resource.Id.totp_custom_settings_group).Visibility = args.IsChecked ? ViewStates.Visible : ViewStates.Gone;
             };
-#if NO_QR_SCANNER
-            dlgView.FindViewById<Button>(Resource.Id.totp_scan).Visibility = ViewStates.Gone;
-#else
-			dlgView.FindViewById<Button>(Resource.Id.totp_scan).Click += async (object o, EventArgs args) =>
-            {
-                if (GoogleApiAvailability.Instance.IsGooglePlayServicesAvailable(this) != ConnectionResult.Success)
-                {
-                    App.Kp2a.ShowMessage(this, Resource.String.qr_scanning_error_no_google_play_services,
-                        MessageSeverity.Error);
-                    return;
-                }
 
+            dlgView.FindViewById<Button>(Resource.Id.totp_scan).Click += async (object o, EventArgs args) =>
+            {
 				GmsBarcodeScannerOptions options = new GmsBarcodeScannerOptions.Builder()
                     .SetBarcodeFormats(Barcode.FormatQrCode)
                     .Build();
@@ -1188,17 +1171,16 @@ namespace keepass2android
                         }
                         else
                         {
-                            App.Kp2a.ShowMessage(this, "Scanned code should contain an otpauth:// text.",  MessageSeverity.Warning);
+                            Toast.MakeText(this, "Scanned code should contain an otpauth:// text.", ToastLength.Long).Show();
                         }
                     }))
                     .AddOnFailureListener(new FailureListener((e) =>
                     {
-                        Console.WriteLine($"Scan failed: {Util.GetErrorMessage(e)}");
+                        Console.WriteLine($"Scan failed: {e.Message}");
                     }));
 
 
             };
-#endif
 
 			//copy values from entry into dialog
 			View ees = (View)sender.Parent;
@@ -1514,7 +1496,7 @@ namespace keepass2android
 			// Require title
 			String title = Util.GetEditText(this, Resource.Id.entry_title);
 			if ( title.Length == 0 ) {
-				App.Kp2a.ShowMessage(this, Resource.String.error_title_required,  MessageSeverity.Error);
+				Toast.MakeText(this, Resource.String.error_title_required, ToastLength.Long).Show();
 				return false;
 			}
 			
@@ -1524,7 +1506,7 @@ namespace keepass2android
 			DateTime newExpiry = new DateTime();
 			if ((State.Entry.Expires) && (!DateTime.TryParse( Util.GetEditText(this,Resource.Id.entry_expires), out newExpiry)))
 		    {
-				App.Kp2a.ShowMessage(this, Resource.String.error_invalid_expiry_date,  MessageSeverity.Error);
+				Toast.MakeText(this, Resource.String.error_invalid_expiry_date, ToastLength.Long).Show();
 				return false;
 			}
 			State.Entry.ExpiryTime = newExpiry.ToUniversalTime();
@@ -1538,13 +1520,13 @@ namespace keepass2android
 				string key = keyView.Text;
 				
 				if (String.IsNullOrEmpty(key)) {
-					App.Kp2a.ShowMessage(this, Resource.String.error_string_key,  MessageSeverity.Error);
+					Toast.MakeText(this, Resource.String.error_string_key, ToastLength.Long).Show();
 					return false;
 				}
 
 				if (allKeys.Contains(key))
 				{
-					App.Kp2a.ShowMessage(this, GetString(Resource.String.error_string_duplicate_key, new Object[]{key}),  MessageSeverity.Error);
+					Toast.MakeText(this, GetString(Resource.String.error_string_duplicate_key, new Object[]{key}), ToastLength.Long).Show();
 					return false;
 				}
 
@@ -1577,7 +1559,6 @@ namespace keepass2android
 
 		}
 	}
-#if !NO_QR_SCANNER
     public class SuccessListener : Object, IOnSuccessListener
     {
         private readonly Action<Barcode> _onSuccess;
@@ -1607,9 +1588,8 @@ namespace keepass2android
             _onFailure?.Invoke(e);
         }
     }
-#endif
 
-	public class DefaultEdit : EditModeBase
+    public class DefaultEdit : EditModeBase
 	{
 		
 	}

src/keepass2android-app/ExportDatabaseActivity.cs

@@ -29,9 +29,9 @@ namespace keepass2android
             var exportDb = new ExportDatabaseActivity.ExportDb(_activity, App.Kp2a, new ActionOnFinish(_activity, (success, message, activity) =>
                 {
                     if (!success)
-                        App.Kp2a.ShowMessage(activity, message,  MessageSeverity.Error);
+                        Toast.MakeText(activity, message, ToastLength.Long).Show();
                     else
-                        App.Kp2a.ShowMessage(activity, _activity.GetString(Resource.String.export_database_successful),  MessageSeverity.Info);
+                        Toast.MakeText(activity, _activity.GetString(Resource.String.export_database_successful), ToastLength.Long).Show();
                     activity.Finish();
                 }
             ), _ffp, ioc);
@@ -140,7 +140,7 @@ namespace keepass2android
 				}
 				catch (Exception ex)
 				{
-					Finish(false, Util.GetErrorMessage(ex));
+					Finish(false, ex.Message);
 				}
 
 

src/keepass2android-app/FileSaveProcessManager.cs

@@ -107,7 +107,7 @@ namespace keepass2android
                             {
                                 if (!success)
                                 {
-                                    App.Kp2a.ShowMessage(activity, messageOrFilename,  MessageSeverity.Error);
+                                    Toast.MakeText(activity, messageOrFilename, ToastLength.Long).Show();
                                     return;
                                 }
                                 SaveFile(new IOConnectionInfo { Path = FileSelectHelper.ConvertFilenameToIocPath(messageOrFilename) });

src/keepass2android-app/FileSelectHelper.cs

@@ -115,7 +115,6 @@ namespace keepass2android
 				string keyContent = keyContentTxt.Text;
 
 				string toastMsg = null;
-				MessageSeverity severity = MessageSeverity.Info;
                 if (!string.IsNullOrEmpty(keyName) && !string.IsNullOrEmpty(keyContent))
 				{
 					try
@@ -128,10 +127,8 @@ namespace keepass2android
 					catch (Exception e)
 					{
 						toastMsg = ctx.GetString(Resource.String.private_key_save_failed,
-							new Java.Lang.Object[] { Util.GetErrorMessage(e)});
-                        severity = MessageSeverity.Error;
-
-                    }
+							new Java.Lang.Object[] { e.Message });
+					}
 				}
 				else
 				{
@@ -139,7 +136,7 @@ namespace keepass2android
 				}
 
 				if (toastMsg!= null) {
-                    App.Kp2a.ShowMessage(_activity, toastMsg,  severity);
+                    Toast.MakeText(_activity, toastMsg, ToastLength.Long).Show();
                 }
 
 				UpdatePrivateKeyNames(keyNamesAdapter, fileStorage, ctx);
@@ -156,7 +153,7 @@ namespace keepass2android
 
 					int msgId = deleted ? Resource.String.private_key_delete : Resource.String.private_key_delete_failed;
 					string msg = ctx.GetString(msgId, new Java.Lang.Object[] { keyName });
-                    App.Kp2a.ShowMessage(_activity, msg,  deleted ? MessageSeverity.Info :MessageSeverity.Error);
+                    Toast.MakeText(_activity, msg, ToastLength.Long).Show();
 
 					UpdatePrivateKeyNames(keyNamesAdapter, fileStorage, ctx);
 					keySpinner.SetSelection(SftpKeySpinnerCreateNewIdx);
@@ -584,9 +581,9 @@ namespace keepass2android
 			// Make sure file name exists
 			if (filename.Length == 0)
 			{
-				App.Kp2a.ShowMessage(_activity,
+				Toast.MakeText(_activity,
 								Resource.String.error_filename_required,
-								 MessageSeverity.Error);
+								ToastLength.Long).Show();
 				return false;
 			}
 
@@ -607,9 +604,9 @@ namespace keepass2android
 			}
 			catch (NoFileStorageFoundException)
 			{
-				App.Kp2a.ShowMessage(_activity,
+				Toast.MakeText(_activity,
 								"Unexpected scheme in "+filename,
-								 MessageSeverity.Error);
+								ToastLength.Long).Show();
 				return false;
 			}
 
@@ -623,9 +620,9 @@ namespace keepass2android
 
 					if (parent == null || (parent.Exists() && !parent.IsDirectory))
 					{
-						App.Kp2a.ShowMessage(_activity,
+						Toast.MakeText(_activity,
 							            Resource.String.error_invalid_path,
-							             MessageSeverity.Error);
+							            ToastLength.Long).Show();
 						return false;
 					}
 
@@ -634,9 +631,9 @@ namespace keepass2android
 						// Create parent dircetory
 						if (!parent.Mkdirs())
 						{
-							App.Kp2a.ShowMessage(_activity,
+							Toast.MakeText(_activity,
 								            Resource.String.error_could_not_create_parent,
-								             MessageSeverity.Error);
+								            ToastLength.Long).Show();
 							return false;
 
 						}
@@ -646,11 +643,11 @@ namespace keepass2android
 				}
 				catch (Java.IO.IOException ex)
 				{
-					App.Kp2a.ShowMessage(
+					Toast.MakeText(
 						_activity,
 						_activity.GetText(Resource.String.error_file_not_create) + " "
 						+ ex.LocalizedMessage,
-						 MessageSeverity.Error);
+						ToastLength.Long).Show();
 					return false;
 				}
 
@@ -703,7 +700,7 @@ namespace keepass2android
 			_activity.StartActivityForResult(i, _requestCode);
 
 #else
-			App.Kp2a.ShowMessage(LocaleManager.LocalizedAppContext, "File chooser is excluded!",  MessageSeverity.Error);
+			Toast.MakeText(LocaleManager.LocalizedAppContext, "File chooser is excluded!", ToastLength.Long).Show();
 #endif
 			return true;
 		}
@@ -785,7 +782,7 @@ namespace keepass2android
 							{
 								if (!success)
 								{
-									App.Kp2a.ShowMessage(newActivity, messageOrFilename,  MessageSeverity.Error);
+									Toast.MakeText(newActivity, messageOrFilename, ToastLength.Long).Show();
 									return;
 								}
 								var ioc = new IOConnectionInfo { Path = ConvertFilenameToIocPath(messageOrFilename) };

src/keepass2android-app/FingerprintSetupActivity.cs

@@ -251,7 +251,7 @@ namespace keepass2android
 			catch (Exception e)
 			{
 				CheckCurrentRadioButton();
-				App.Kp2a.ShowMessage(this, e.ToString(),  MessageSeverity.Error);
+				Toast.MakeText(this, e.ToString(), ToastLength.Long).Show();
 				FindViewById(Resource.Id.radio_buttons).Visibility = ViewStates.Visible;
 				FindViewById(Resource.Id.fingerprint_auth_container).Visibility = ViewStates.Gone;
 			}

src/keepass2android-app/GeneratePasswordActivity.cs

@@ -543,7 +543,7 @@ namespace keepass2android
             }
             catch (Exception e) 
             {
-				App.Kp2a.ShowMessage(this, Util.GetErrorMessage(e),  MessageSeverity.Error);
+				Toast.MakeText(this, e.Message, ToastLength.Long).Show();
 			}
 			
 			return password;

src/keepass2android-app/GroupBaseActivity.cs

@@ -56,8 +56,6 @@ namespace keepass2android
 
         public const int RequestCodeActivateRealSearch = 12366;
 
-        protected override View? SnackbarAnchorView => FindViewById(Resource.Id.main_content);
-
         static readonly Dictionary<int /*resource id*/, int /*prio*/> bottomBarElementsPriority = new Dictionary<int, int>()
         {
             { Resource.Id.cancel_insert_element, 20 },
@@ -894,14 +892,9 @@ namespace keepass2android
                     RegisterInfoTextDisplay(
                         "DbReadOnly"); //this ensures that we don't show the general info texts too soon
 
-                    var infotext_view = FindViewById<TextView>(Resource.Id.dbreadonly_infotext_text);
-                    if (infotext_view != null)
-                    {
-                        infotext_view.Text =
-                            (GetString(Resource.String.FileReadOnlyMessagePre) + " " +
-                             App.Kp2a.GetResourceString(reason.Result));
-                    }
-                    
+                    FindViewById<TextView>(Resource.Id.dbreadonly_infotext_text).Text =
+                    (GetString(Resource.String.FileReadOnlyMessagePre) + " " +
+                     App.Kp2a.GetResourceString(reason.Result));
                 }
             }
             UpdateBottomBarElementVisibility(Resource.Id.dbreadonly_infotext, canShow);
@@ -934,7 +927,7 @@ namespace keepass2android
                 {
                     ((GroupBaseActivity)activity)?.StopMovingElements();
                     if (!String.IsNullOrEmpty(message))
-                        App.Kp2a.ShowMessage(activity, message,  MessageSeverity.Error);
+                        Toast.MakeText(activity, message, ToastLength.Long).Show();
                 }));
             var progressTask = new ProgressTask(App.Kp2a, this, moveElement);
             progressTask.Run();
@@ -1335,7 +1328,7 @@ namespace keepass2android
                 {
                     Handler.Post(() =>
                     {
-                        App.Kp2a.ShowMessage(ActiveActivity ?? LocaleManager.LocalizedAppContext, "Unrecoverable error: " + Message,  MessageSeverity.Error);
+                        Toast.MakeText(ActiveActivity ?? LocaleManager.LocalizedAppContext, "Unrecoverable error: " + Message, ToastLength.Long).Show();
                     });
 
                     App.Kp2a.Lock(false);

src/keepass2android-app/GroupEditActivity.cs

@@ -111,10 +111,9 @@ namespace keepass2android
 					SetResult (Result.Ok, intent);
 					
 					Finish ();
-				} else
-                {
-                    App.Kp2a.ShowMessage(this, Resource.String.error_no_name, MessageSeverity.Error);
-                }
+				} else {
+					Toast.MakeText (this, Resource.String.error_no_name, ToastLength.Long).Show ();
+				}
 			};
 
 			if (Intent.HasExtra(KeyGroupUuid))

src/keepass2android-app/IconPickerActivity.cs

@@ -185,56 +185,48 @@ namespace keepass2android
 
 			public override View GetView(int position, View convertView, ViewGroup parent)
 			{
-                try
-                {
-                    View currView;
-                    if (convertView == null)
-                    {
-                        LayoutInflater li = (LayoutInflater)_act.GetSystemService(LayoutInflaterService);
-                        currView = li.Inflate(Resource.Layout.icon, null);
-                    }
-                    else
-                    {
-                        currView = convertView;
-                    }
-                    TextView tv = (TextView)currView.FindViewById(Resource.Id.icon_text);
-                    ImageView iv = (ImageView)currView.FindViewById(Resource.Id.icon_image);
+				View currView;
+				if(convertView == null)
+				{
+					LayoutInflater li = (LayoutInflater) _act.GetSystemService(LayoutInflaterService); 
+					currView = li.Inflate(Resource.Layout.icon, null);
+				}
+				else
+				{
+					currView = convertView;
+				}
+				TextView tv = (TextView) currView.FindViewById(Resource.Id.icon_text);
+				ImageView iv = (ImageView) currView.FindViewById(Resource.Id.icon_image);
+						
+				if (position < (int)PwIcon.Count)
+				{
+					tv.Text = "" + position;
+					var drawable = App.Kp2a.CurrentDb						.DrawableFactory.GetIconDrawable(_act, App.Kp2a.CurrentDb.KpDatabase, (KeePassLib.PwIcon) position, null, false);
+					drawable = new BitmapDrawable(Util.DrawableToBitmap(drawable));
+					iv.SetImageDrawable(drawable);
+					//App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, _act, App.Kp2a.GetDb().KpDatabase, (KeePassLib.PwIcon) position, null, false);
 
-                    if (position < (int)PwIcon.Count)
-                    {
-                        tv.Text = "" + position;
-                        var drawable = App.Kp2a.CurrentDb.DrawableFactory.GetIconDrawable(_act, App.Kp2a.CurrentDb.KpDatabase, (KeePassLib.PwIcon)position, null, false);
-                        drawable = new BitmapDrawable(Util.DrawableToBitmap(drawable));
-                        iv.SetImageDrawable(drawable);
-                        //App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, _act, App.Kp2a.GetDb().KpDatabase, (KeePassLib.PwIcon) position, null, false);
+					if (
+						PreferenceManager.GetDefaultSharedPreferences(currView.Context)
+							.GetString("IconSetKey", currView.Context.PackageName) == currView.Context.PackageName)
+					{
+						Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop;
+						Color color = new Color(189, 189, 189);
+						iv.SetColorFilter(color, mMode);	
+					}
+					
+				}
+				else
+				{
+					int pos = position - (int)PwIcon.Count;
+					var icon = _db.CustomIcons[pos];
+					tv.Text = pos.ToString();
+					iv.SetColorFilter(null);
+					iv.SetImageBitmap(icon.Image);
+					
+				}
 
-                        if (PreferenceManager.GetDefaultSharedPreferences(currView.Context)
-                                .GetString("IconSetKey", currView.Context.PackageName) == currView.Context.PackageName)
-                        {
-                            Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop;
-                            Color color = new Color(189, 189, 189);
-                            iv.SetColorFilter(color, mMode);
-                        }
-
-                    }
-                    else
-                    {
-                        int pos = position - (int)PwIcon.Count;
-                        var icon = _db.CustomIcons[pos];
-                        tv.Text = pos.ToString();
-                        iv.SetColorFilter(null);
-                        iv.SetImageBitmap(icon.Image);
-
-                    }
-
-                    return currView;
-                }
-                catch (System.Exception e)
-                {
-                    Kp2aLog.LogUnexpectedError(e);
-                    throw;
-                }
-				
+				return currView;
 			}
 
 			public bool IsCustomIcon(int position)

src/keepass2android-app/KeeAutoExec.cs

@@ -316,7 +316,7 @@ namespace keepass2android
                 try { ck.AddUserKey(new KcpKeyFile(strAbs)); }
                 catch (InvalidOperationException)
                 {
-                    App.Kp2a.ShowMessage(LocaleManager.LocalizedAppContext,Resource.String.error_adding_keyfile, MessageSeverity.Error);
+                    Toast.MakeText(LocaleManager.LocalizedAppContext,Resource.String.error_adding_keyfile,ToastLength.Long).Show();
                     return false;
                 }
                 catch (Exception) { throw; }

src/keepass2android-app/KeeChallenge.cs

@@ -146,16 +146,7 @@ namespace KeeChallenge
             {
                 using (CryptoStream csDecrypt = (CryptoStream)aes.DecryptStream(msDecrypt, key, inf.IV))
                 {
-                    //read the secret from the stream
-                    int totalBytesRead = 0;
-
-                    int bytesRead = csDecrypt.Read(secret, totalBytesRead, secret.Length - totalBytesRead);
-                    while (bytesRead > 0 && totalBytesRead < secret.Length)
-                    {
-                        totalBytesRead += bytesRead;
-                        bytesRead = csDecrypt.Read(secret, totalBytesRead, secret.Length - totalBytesRead);
-                    }
-
+                    csDecrypt.Read(secret, 0, secret.Length);
                     csDecrypt.Close();
                 }
                 msDecrypt.Close();

src/keepass2android-app/LockCloseActivity.cs

@@ -21,7 +21,6 @@ using Android.OS;
 using Android.Preferences;
 using Android.Runtime;
 using Android.Views;
-using AndroidX.Core.Content;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -70,7 +69,7 @@ namespace keepass2android
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intents.DatabaseLocked);
 			filter.AddAction(Intent.ActionScreenOff);
-            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
+			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
 		}
 
 		protected override void OnDestroy()

src/keepass2android-app/LockCloseListActivity.cs

@@ -21,7 +21,6 @@ using Android.OS;
 using Android.Preferences;
 using Android.Runtime;
 using Android.Views;
-using AndroidX.Core.Content;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -56,7 +55,7 @@ namespace keepass2android
 
 			filter.AddAction(Intents.DatabaseLocked);
 			filter.AddAction(Intent.ActionScreenOff);
-            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
+			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
 
 		}
 		

src/keepass2android-app/LockingActivity.cs

@@ -21,10 +21,8 @@ using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Runtime;
-using Android.Views;
 using Google.Android.Material.Dialog;
 using keepass2android;
-using keepass2android.Utils;
 
 namespace keepass2android
 {
@@ -78,34 +76,19 @@ namespace keepass2android
 			base.OnPause();
 			
 			TimeoutHelper.Pause(this);
-			App.Kp2a.MessagePresenter = new NonePresenter();
-        }
+		}
 
 		protected override void OnDestroy()
 		{
 			base.OnDestroy();
 			GC.Collect();
 		}
-
-        protected override void OnResume()
-        {
-            base.OnResume();
-
-            TimeoutHelper.Resume(this);
-            var snackbarAnchorView = SnackbarAnchorView;
-            if (snackbarAnchorView != null)
-            {
-                App.Kp2a.MessagePresenter = new ChainedSnackbarPresenter(snackbarAnchorView);
-            }
-            else
-            {
-                App.Kp2a.MessagePresenter = new ToastPresenter();
-            }
-        }
-
-
-        protected virtual View? SnackbarAnchorView => null;
-    
+		
+		protected override void OnResume() {
+			base.OnResume();
+			
+			TimeoutHelper.Resume(this);
+		}
 
 	    public const int RequestCodeChallengeYubikey = 793;