1.05d release for nonet

Conflicts:
	src/keepass2android/Properties/AndroidManifest_nonet.xml

.github/ISSUE_TEMPLATE/bug_report.yaml

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/question.md

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

.github/workflows/build.yml

@@ -1,351 +0,0 @@
-name: Build keepass2android app
-
-on: [push, pull_request]
-
-jobs:
-  # macos:
-  # Disabled. Does not work, maybe due to nuget version, see https://github.com/PhilippC/keepass2android/actions/runs/4297640426/jobs/7490853348
-  # should work again when the Project solution is converted to sdk style .csproj files.
-
-  #   runs-on: macos-12
-
-  #   steps:
-  #   - uses: actions/checkout@v3
-
-  #   - name: Fetch submodules
-  #     run: git submodule init && git submodule update
-
-  #   - name: Setup Gradle
-  #     uses: gradle/gradle-build-action@v2
-
-  #   - name: Cache NuGet packages
-  #     uses: actions/cache@v3
-  #     with:
-  #       path: ~/.nuget/packages
-  #       key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
-  #       restore-keys: |
-  #         ${{ runner.os }}-nuget-
-
-  #   # As per https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#visual-studio-for-mac
-  #   - name: Switch to Visual Studio 2019
-  #     if: ${{ false }} # Not needed. We stay with the default 'Visual Studio 2022' of macos-12 runner.
-  #     run: |
-  #       mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app"
-  #       mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
-
-  #   # As of 2022-12-02, keepass2android doesn't build with Xamarin >= 12.1 because there is some issue with SamsungPass. Removing SamsungPass would make the build succeed.
-  #   - name: Set default Xamarin SDK versions
-  #     run: |
-  #       # If using the github runner 'macos-12'
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.3
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.1 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.2 # Build fails in this case, as of 2022-12-02 : Xamarin/Android/Xamarin.Android.D8.targets(79,5): error : java.lang.ArrayIndexOutOfBoundsException :  Index 4 out of bounds for length 4
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.3 # Build fails in this case, as of 2022-12-02
-  #       $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=13.1
-
-  #       # If using the github runner 'macos-11'
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.0
-  #       #$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=12.0
-
-  #       # If using the github runner 'macos-10.15'
-  #       # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
-
-  #   - name: Switch to JDK-11
-  #     uses: actions/setup-java@v3
-  #     with:
-  #       java-version: '11'
-  #       distribution: 'temurin'
-
-  #   - name: Display java version
-  #     run: java -version
-
-  #   # Some components of Keepass2Android currently target android API 26 which are not available on the runner
-  #   - name: Download android-26 API
-  #     run: $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-26"
-
-  #   - name: Build native dependencies
-  #     run: make native
-
-  #   - name: Build java dependencies
-  #     run: make java
-
-  #   - name: Install NuGet dependencies (net)
-  #     run: make nuget Flavor=Net
-
-  #   - name: Build keepass2android (net)
-  #     run: |
-  #       make msbuild Flavor=Net
-
-  #   - name: Build APK (net)
-  #     run: |
-  #       make apk Flavor=Net
-
-  #   - name: Archive production artifacts (net)
-  #     uses: actions/upload-artifact@v3
-  #     with:
-  #       name: signed APK ('net' built on ${{ github.job }})
-  #       path: |
-  #         src/keepass2android/bin/*/*-Signed.apk
-
-  #   - name: Install NuGet dependencies (nonet)
-  #     run: make nuget Flavor=NoNet
-
-  #   - name: Build keepass2android (nonet)
-  #     run: |
-  #       make msbuild Flavor=NoNet
-
-  #   - name: Build APK (nonet)
-  #     run: |
-  #       make apk Flavor=NoNet
-
-  #   - name: Archive production artifacts (nonet)
-  #     uses: actions/upload-artifact@v3
-  #     with:
-  #       name: signed APK ('nonet' built on ${{ github.job }})
-  #       path: |
-  #         src/keepass2android/bin/*/*-Signed.apk
-
-  #   - name: Perform "make distclean"
-  #     run: make distclean
-
-  # linux:
-  # disabled. 
-  # As per: xamarin/xamarin-android#7235 (comment)
-  # > Unfortunately the Classic OSS Xamarin.Android packages for Linux are no longer being built and as such they are not available for the v13.0 tag.
-  # we can re-enable this after porting to .net 6.0
-
-  #   runs-on: ubuntu-22.04
-
-  #   env:
-  #       # Build Artifact of xamarin.android-oss dated 2021-02-02, master branch (= version 11.2.99) - *.deb cannot be installed because "lxd" package is not anymore shipped in current ubuntu version
-  #       #xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzM0NTE3L2FydGlmYWN0TmFtZS9JbnN0YWxsZXJzKy0rTGludXg1/content?format=zip
-
-  #       # Build Artifact of xamarin.android-oss dated 2021-03-23, d16-9 branch (= version 11.2.2) - *.deb cannot be installed because "lxd" package is not anymore shipped in current ubuntu version
-  #       #xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzM3Njg0L2FydGlmYWN0TmFtZS9JbnN0YWxsZXJzKy0rTGludXg1/content?format=zip
-
-  #       # Build Artifact of xamarin.android-oss dated 2021-07-21, master branch (= version 11.4.99)
-  #       # xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzQzNjU5L2FydGlmYWN0TmFtZS9pbnN0YWxsZXJzLXVuc2lnbmVkKy0rTGludXg1/content?format=zip
-
-  #       # Build Artifact of xamarin.android-oss dated 2022-02-16, master branch (= version 12.2.99)
-  #       xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzU0OTUzL2FydGlmYWN0TmFtZS9pbnN0YWxsZXJzLXVuc2lnbmVkKy0rTGludXg1/content?format=zip
-  #   steps:
-  #   - uses: actions/checkout@v3
-
-  #   - name: Fetch submodules
-  #     run: git submodule init && git submodule update
-
-  #   - name: Setup Gradle
-  #     uses: gradle/gradle-build-action@v2
-
-  #   - name: Cache NuGet packages
-  #     uses: actions/cache@v3
-  #     with:
-  #       path: ~/.nuget/packages
-  #       key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
-  #       restore-keys: |
-  #         ${{ runner.os }}-nuget-
-
-  #   - name: Cache Xamarin.Android packages
-  #     id: xamarin_cache
-  #     uses: actions/cache@v3
-  #     with:
-  #       path: ~/xamarin.android-oss
-  #       key: ${{ runner.os }}-xamarin.android-oss-${{ env.xamarin_url }}
-  #       restore-keys: |
-  #         ${{ runner.os }}-xamarin.android-oss-${{ env.xamarin_url }}
-
-  #   - name: Install Mono
-  #     if: ${{ false }}  # disable for now since it is already installed on the runner which uses the same repo https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#language-and-runtime
-  #     run: |
-  #       sudo apt install gnupg ca-certificates &&
-  #       sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF &&
-  #       echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list &&
-  #       sudo apt update &&
-  #       sudo apt-get -y -t stable-focal install mono-complete
-
-  #   - name: Download & unpack Xamarin.Android
-  #     if: steps.xamarin_cache.outputs.cache-hit != 'true'
-  #     run: |
-  #       set -x
-  #       cd $HOME &&
-  #       wget -O "installers-unsigned - Linux.zip" ${{ env.xamarin_url }} &&
-  #       unzip "installers-unsigned - Linux.zip" &&
-  #       mkdir -p xamarin.android-oss &&
-  #       DIR=$(unzip -Z -1 installers-unsigned\ -\ Linux.zip   | cut -d '/' -f1 | sort -u) &&
-  #       tar -xvf "$DIR"/xamarin.android-oss-*.tar.* --strip-components=1 -C xamarin.android-oss &&
-  #       mv "$DIR"/*.deb xamarin.android-oss
-
-  #   - name: Setup Xamarin.Android
-  #     run: |
-  #       cd $HOME &&
-  #       sudo apt install -y ./xamarin.android-oss/*.deb &&
-  #       echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH
-
-  #   - name: Switch to JDK-11
-  #     uses: actions/setup-java@v3
-  #     with:
-  #       java-version: '11'
-  #       distribution: 'temurin'
-
-  #   - name: Display java version
-  #     run: java -version
-
-  #   # Some components of Keepass2Android currently target android API 26 which are not available on the runner
-  #   - name: Download android-26 API
-  #     run: $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-26"
-
-  #   - name: Install libzip4
-  #     if: ${{ false }}  # disable for now since it is already installed on the runner
-  #     run: sudo apt -y install libzip4
-
-  #   - name: Build native dependencies
-  #     run: make native
-
-  #   - name: Build java dependencies
-  #     run: make java
-
-  #   - name: Install NuGet dependencies (net)
-  #     run: make nuget Flavor=Net
-
-  #   - name: Build keepass2android (net)
-  #     run: |
-  #       make msbuild Flavor=Net
-
-  #   - name: Build APK (net)
-  #     run: |
-  #       make apk Flavor=Net
-
-  #   - name: Archive production artifacts (net)
-  #     uses: actions/upload-artifact@v3
-  #     with:
-  #       name: signed APK ('net' built on ${{ github.job }})
-  #       path: |
-  #         src/keepass2android/bin/*/*-Signed.apk
-
-  #   - name: Install NuGet dependencies (nonet)
-  #     run: make nuget Flavor=NoNet
-
-  #   - name: Build keepass2android (nonet)
-  #     run: |
-  #       make msbuild Flavor=NoNet
-
-  #   - name: Build APK (nonet)
-  #     run: |
-  #       make apk Flavor=NoNet
-
-  #   - name: Archive production artifacts (nonet)
-  #     uses: actions/upload-artifact@v3
-  #     with:
-  #       name: signed APK ('nonet' built on ${{ github.job }})
-  #       path: |
-  #         src/keepass2android/bin/*/*-Signed.apk
-
-  #   - name: Perform "make distclean"
-  #     run: make distclean
-
-  windows:
-
-    # on windows-2022 it builds with:
-    #    Microsoft Visual Studio\2022\Enterprise
-    #    Found Java SDK version 11.0.12
-    #    Found Xamarin.Android 13.1.0.1
-    #
-    runs-on: windows-2022
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-
-    - name: Cache NuGet packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
-    - name: Fetch submodules
-      run: git submodule init && git submodule update
-
-    # 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@v1.3
-      with:
-        minimum-size: 8GB
-
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
-      # If we want to also have nmake, use this instead
-      #uses: ilammy/msvc-dev-cmd@v1
-
-    - name: Switch to JDK-11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-
-    - name: Display java version
-      run: java -version
-
-    # Some components of Keepass2Android currently target android API 26 which are not available on the runner
-    - name: Download android-26 API
-      shell: cmd
-      run: |
-        %ANDROID_SDK_ROOT%\cmdline-tools\latest\bin\sdkmanager --install "platforms;android-26"
-
-    - 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: Build keepass2android (net)
-      run: |
-        make msbuild Flavor=Net
-
-    - name: Build APK (net)
-      run: |
-        make apk Flavor=Net
-
-    - name: Archive production artifacts (net)
-      uses: actions/upload-artifact@v3
-      with:
-        name: signed APK ('net' built on ${{ github.job }})
-        path: |
-          src/keepass2android/bin/*/*-Signed.apk
-
-    - name: Install NuGet dependencies (nonet)
-      run: make nuget Flavor=NoNet
-
-    - name: Build keepass2android (nonet)
-      run: |
-        make msbuild Flavor=NoNet
-    - name: Test Autofill
-      working-directory: ./src/Kp2aAutofillParserTest
-      run: dotnet test
-
-    - name: Build APK (nonet)
-      run: |
-        make apk Flavor=NoNet
-
-    - name: Archive production artifacts (nonet)
-      uses: actions/upload-artifact@v3
-      with:
-        name: signed APK ('nonet' built on ${{ github.job }})
-        path: |
-          src/keepass2android/bin/*/*-Signed.apk
-
-    - name: Perform "make distclean"
-      run: make distclean

.gitignore

@@ -7,10 +7,6 @@ PCtest
 bin
 obj
 
-# Makefile-related files
-/allow_git_clean
-/stamp.nuget_*
-
 Resource.designer.cs
 R.java
 
@@ -109,6 +105,7 @@ Thumbs.db
 /src/java/JavaFileStorageTest/gen/group/pals/android/lib/ui/filechooser/R.java
 /src/java/JavaFileStorageTest/gen/keepass2android/javafilestorage/R.java
 
+/src/TwofishCipher/Resources/Resource.Designer.cs
 /src/BindingLibrary1
 
 /src/PluginTOTP
@@ -163,16 +160,3 @@ src/java/Keepass2AndroidPluginSDK2/build/generated/mockable-Google-Inc.-Google-A
 /src/.vs
 /src/JavaFileStorageBindings/Jars/JavaFileStorage-release.aar
 /src/PluginSdkBinding/Jars/app-debug.aar
-/src/java/KP2AKdbLibrary/libs/arm64-v8a/libfinal-key.so
-/src/java/KP2AKdbLibrary/libs/x86_64/libfinal-key.so
-/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/arm64-v8a/libkp2akeyboard_jni.so
-/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/armeabi-v7a/libkp2akeyboard_jni.so
-/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/x86/libkp2akeyboard_jni.so
-/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/x86_64/libkp2akeyboard_jni.so
-/src/java/KP2AKdbLibrary/app/build
-/src/java/KP2ASoftkeyboard_AS/app/.cxx
-/src/java/KP2ASoftkeyboard_AS/app/src/main/libs
-/src/java/KP2AKdbLibrary/app/.cxx
-/src/ActionViewFilterTest
-/docs/gdrive-verification
-/src/MegaTest

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "src/SamsungPass"]
 	path = src/SamsungPass
 	url = https://github.com/PhilippC/Xamarin-Samsung-Pass.git
-[submodule "src/java/argon2/phc-winner-argon2"]
-	path = src/java/argon2/phc-winner-argon2
-	url = https://github.com/P-H-C/phc-winner-argon2
+[submodule "src/netftpandroid"]
+	path = src/netftpandroid
+	url = https://github.com/PhilippC/netftpandroid.git

Makefile

@@ -1,361 +0,0 @@
-#!/usr/bin/make -f
-
-#
-# This Makefile can be used on both unix-like (use make) & windows (with GNU make)
-#
-# append the Configuration variable to 'make' call with value to use in '/p:Configuration='
-# of msbuild command.
-#
-# append the Flavor variable to 'make' call with value to use in '/p:Flavor='
-# of msbuild command.
-#
-# Example:
-#    make Configuration=Release Flavor=NoNet
-#
-#
-# Some targets:
-#  - all: everything (including APK)
-#  - native: build the native libs
-#  - java: build the java libs
-#  - nuget: restore NuGet packages
-#  - msbuild: build the project
-#  - apk: same as all
-#
-#  - distclean: run a 'git clean -xdff'. Remove everyhing that is not in the git tree.
-#  - clean: all clean_* targets below
-#  - clean_native: clean native lib
-#  - clean_java: call clean target of java libs
-#  - clean_nuget: cleanup the 'nuget restore'
-#  - clean_msbuild: call clean target of msbuild
-#
-#
-#
-
-# Disable built-in rules to speed-up the Makefile processing.
-# for example when running 'make java' on Windows it could take ~10 sec more than on linux to start building
-# from what this option disables, the "clearing out the default list of suffixes for suffix rules"
-# gives the most speed gain.
-MAKEFLAGS += --no-builtin-rules
-
-ifeq ($(OS),Windows_NT)     # is Windows_NT on XP, 2000, 7, Vista, 10...
-    detected_OS := Windows
-    WHICH := where
-    RM := RMDIR /S /Q
-    RMFILE := DEL
-    CP := copy
-    GRADLEW := gradlew.bat
-    # Force use of cmd shell (don't use POSIX shell because the user may not have one installed)
-    SHELL := cmd
-else
-    detected_OS := $(shell uname)
-    WHICH := which
-    RM := rm -rf
-    RMFILE := $(RM)
-    CP := cp
-    GRADLEW := ./gradlew
-endif
-
-$(info MAKESHELL: $(MAKESHELL))
-$(info SHELL: $(SHELL))
-$(info )
-
-# On linux use xabuild, on Windows use MSBuild.exe, otherwise (macos?) use msbuild.
-ifeq ($(detected_OS),Linux)
-  MSBUILD_binary := xabuild
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary))
-else ifeq ($(detected_OS),Windows)
-  MSBUILD_binary := MSBuild.exe
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary) 2> nul)
-  ifeq ($(MSBUILD),)
-    # Additional heuristic to find MSBUILD_BINARY on Windows
-    VSWHERE := "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-    VSWHERE_CHECK := $(shell @echo off & $(VSWHERE) 2> nul || echo VSWHERE_NOT_FOUND)
-    ifneq ($(VSWHERE_CHECK),VSWHERE_NOT_FOUND)
-      MSBUILD := $(shell @echo off & $(VSWHERE) -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe)
-      VS_INSTALL_PATH := $(shell @echo off & $(VSWHERE) -property installationPath)
-    endif
-  endif
-else
-  MSBUILD_binary := msbuild
-  MSBUILD := $(shell $(WHICH) $(MSBUILD_binary))
-endif
-
-ifeq ($(MSBUILD),)
-  $(info )
-  $(info '$(MSBUILD_binary)' binary could not be found. Check it is in your PATH.)
-  ifeq ($(detected_OS),Windows)
-  ifneq ($(VSWHERE_CHECK),VSWHERE_NOT_FOUND)
-    $(info )
-    $(info You may retry after running in the command prompt:)
-    $(info )
-    $(info "$(VS_INSTALL_PATH)\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64)
-    $(info )
-    $(info If this doesn't work, install/find the location of vcvarsall.bat)
-    $(info or install and add msbuild.exe to your PATH)
-    $(info )
-  endif
-  endif
-  $(error )
-endif
-$(info MSBUILD: $(MSBUILD))
-$(info )
-
-ifeq ($(ANDROID_SDK_ROOT),)
-  $(error set ANDROID_SDK_ROOT environment variable)
-endif
-$(info ANDROID_SDK_ROOT: $(ANDROID_SDK_ROOT))
-
-ifeq ($(ANDROID_HOME),)
-  $(error set ANDROID_HOME environment variable)
-endif
-$(info ANDROID_HOME: $(ANDROID_SDK_ROOT))
-
-ifeq ($(ANDROID_NDK_ROOT),)
-  $(error set ANDROID_NDK_ROOT environment variable)
-endif
-$(info ANDROID_NDK_ROOT: $(ANDROID_NDK_ROOT))
-
-ifneq ($(Configuration),)
-  MSBUILD_PARAM = -p:Configuration="$(Configuration)"
-else
-  $(warning Configuration environment variable not set.)
-endif
-ifneq ($(Flavor),)
-  MSBUILD_PARAM += -p:Flavor="$(Flavor)"
-else
-  $(warning Flavor environment variable not set.)
-endif
-
-ifneq ($(KeyStore),)
-  MSBUILD_PARAM += -p:AndroidKeyStore=True -p:AndroidSigningKeyStore="$(KeyStore)" -p:AndroidSigningStorePass=env:MyAndroidSigningStorePass -p:AndroidSigningKeyPass=env:MyAndroidSigningKeyPass
-endif
-
-ifeq ($(detected_OS),Windows)
-  to_win_path=$(subst /,\,$(1))
-  to_posix_path=$(subst \,/,$(1))
-  define remove_dir
-    if exist $(1) ( $(RM) $(1) )
-  endef
-  define remove_files
-    $(foreach file,$(call to_win_path,$(1)), IF EXIST $(file) ( $(RMFILE) $(file) ) & )
-  endef
-else
-  define remove_dir
-    $(RM) $(1)
-  endef
-  define remove_files
-    $(RMFILE) $(1)
-  endef
-endif
-
-# Recursive wildcard: https://stackoverflow.com/a/18258352
-rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
-
-$(info MSBUILD_PARAM: $(MSBUILD_PARAM))
-$(info nuget path: $(shell $(WHICH) nuget))
-$(info )
-
-NATIVE_COMPONENTS := argon2
-NATIVE_CLEAN_TARGETS := clean_argon2
-
-OUTPUT_argon2 = src/java/argon2/libs/armeabi-v7a/libargon2.so \
-	src/java/argon2/libs/arm64-v8a/libargon2.so \
-	src/java/argon2/libs/x86/libargon2.so \
-	src/java/argon2/libs/x86_64/libargon2.so
-
-JAVA_COMPONENTS := \
-	JavaFileStorageTest-AS \
-	KP2ASoftkeyboard_AS \
-	Keepass2AndroidPluginSDK2 \
-	KP2AKdbLibrary
-	#PluginQR # Doesn't seem required
-JAVA_CLEAN_TARGETS := \
-	clean_JavaFileStorageTest-AS \
-	clean_KP2ASoftkeyboard_AS \
-	clean_Keepass2AndroidPluginSDK2 \
-	clean_KP2AKdbLibrary \
-	clean_PluginQR
-
-INPUT_android-filechooser-AS := $(filter-out $(filter %/app,$(wildcard src/java/android-filechooser-AS/*)),$(wildcard src/java/android-filechooser-AS/*)) \
-	$(filter-out $(filter %/build,$(wildcard src/java/android-filechooser-AS/app/*)),$(wildcard src/java/android-filechooser-AS/app/*)) \
-	$(call rwildcard,src/java/android-filechooser-AS/app/src,*)
-
-INPUT_JavaFileStorage := $(filter-out $(filter %/app,$(wildcard src/java/JavaFileStorage/*)),$(wildcard src/java/JavaFileStorage/*)) \
-	$(filter-out $(filter %/build,$(wildcard src/java/JavaFileStorage/app/*)),$(wildcard src/java/JavaFileStorage/app/*)) \
-	$(wildcard src/java/JavaFileStorage/libs/*) \
-	$(call rwildcard,src/java/JavaFileStorage/app/src,*) \
-
-INPUT_JavaFileStorageTest-AS := $(filter-out $(filter %/app,$(wildcard src/java/JavaFileStorageTest-AS/*)),$(wildcard src/java/JavaFileStorageTest-AS/*)) \
-	$(filter-out $(filter %/build,$(wildcard src/java/JavaFileStorageTest-AS/app/*)),$(wildcard src/java/JavaFileStorageTest-AS/app/*)) \
-	$(call rwildcard,src/java/JavaFileStorageTest-AS/app/src,*) \
-	$(INPUT_android-filechooser-AS) \
-	$(INPUT_JavaFileStorage)
-OUTPUT_JavaFileStorageTest-AS = src/java/android-filechooser-AS/app/build/outputs/aar/android-filechooser-debug.aar \
-	src/java/android-filechooser-AS/app/build/outputs/aar/android-filechooser-release.aar \
-	src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar \
-	src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar \
-	src/java/JavaFileStorageTest-AS/app/build/outputs/apk/debug/app-debug.apk \
-	src/java/JavaFileStorageTest-AS/app/build/outputs/apk/release/app-release-unsigned.apk
-
-INPUT_KP2ASoftkeyboard_AS := $(wildcard src/java/KP2ASoftkeyboard_AS/*) \
-	$(wildcard src/java/KP2ASoftkeyboard_AS/app/*) \
-	$(call rwildcard,src/java/KP2ASoftkeyboard_AS/app/src,*)
-OUTPUT_KP2ASoftkeyboard_AS = src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar \
-	src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-release.aar
-
-INPUT_Keepass2AndroidPluginSDK2 := $(wildcard src/java/Keepass2AndroidPluginSDK2/*) \
-	$(wildcard src/java/Keepass2AndroidPluginSDK2/app/*) \
-	$(call rwildcard,src/java/Keepass2AndroidPluginSDK2/app/src,*)
-OUTPUT_Keepass2AndroidPluginSDK2 = src/java/Keepass2AndroidPluginSDK2/app/build/outputs/aar/app-debug.aar \
-	src/java/Keepass2AndroidPluginSDK2/app/build/outputs/aar/app-release.aar
-
-INPUT_KP2AKdbLibrary := $(wildcard src/java/KP2AKdbLibrary/*) \
-	$(wildcard src/java/KP2AKdbLibrary/app/*) \
-	$(call rwildcard,src/java/KP2AKdbLibrary/app/src,*)
-OUTPUT_KP2AKdbLibrary = src/java/KP2AKdbLibrary/app/build/outputs/aar/app-debug.aar \
-	src/java/KP2AKdbLibrary/app/build/outputs/aar/app-release.aar
-
-INPUT_PluginQR := $(wildcard src/java/PluginQR/*) \
-	$(wildcard src/java/PluginQR/app/*) \
-	$(call rwildcard,src/java/PluginQR/app/src,*) \
-	$(INPUT_Keepass2AndroidPluginSDK2)
-OUTPUT_PluginQR = src/java/Keepass2AndroidPluginSDK2/app/build/outputs/aar/Keepass2AndroidPluginSDK2-debug.aar \
-	src/java/Keepass2AndroidPluginSDK2/app/build/outputs/aar/Keepass2AndroidPluginSDK2-release.aar \
-	src/java/PluginQR/app/build/outputs/apk/debug/app-debug.apk \
-	src/java/PluginQR/app/build/outputs/apk/debug/app-release-unsigned.apk
-
-##### Targets definition
-
-.PHONY: native $(NATIVE_COMPONENTS) clean_native $(NATIVE_CLEAN_TARGETS) \
-	java $(JAVA_COMPONENTS) clean_java $(JAVA_CLEAN_TARGETS) \
-	nuget clean_nuget \
-	msbuild clean_msbuild \
-	apk all clean
-
-all: apk
-
-##### Native Dependencies
-
-native: $(NATIVE_COMPONENTS)
-
-argon2: $(OUTPUT_argon2)
-$(OUTPUT_argon2): $(wildcard src/java/argon2/phc-winner-argon2/src/*)  $(wildcard src/java/argon2/phc-winner-argon2/src/blake2/*)
-	cd src/java/argon2 && $(ANDROID_NDK_ROOT)/ndk-build
-
-##### Java Dependencies
-
-java: $(JAVA_COMPONENTS)
-
-JavaFileStorageTest-AS: $(OUTPUT_JavaFileStorageTest-AS)
-KP2ASoftkeyboard_AS: $(OUTPUT_KP2ASoftkeyboard_AS)
-Keepass2AndroidPluginSDK2: $(OUTPUT_Keepass2AndroidPluginSDK2)
-KP2AKdbLibrary: $(OUTPUT_KP2AKdbLibrary)
-PluginQR: $(OUTPUT_PluginQR)
-
-$(OUTPUT_JavaFileStorageTest-AS): $(INPUT_JavaFileStorageTest-AS)
-	$(call remove_files,$(OUTPUT_JavaFileStorageTest-AS))
-	cd src/java/JavaFileStorageTest-AS && $(GRADLEW) assemble
-$(OUTPUT_KP2ASoftkeyboard_AS): $(INPUT_KP2ASoftkeyboard_AS)
-	$(call remove_files,$(OUTPUT_KP2ASoftkeyboard_AS))
-	cd src/java/KP2ASoftkeyboard_AS && $(GRADLEW) assemble
-$(OUTPUT_Keepass2AndroidPluginSDK2): $(INPUT_Keepass2AndroidPluginSDK2)
-	$(call remove_files,$(OUTPUT_Keepass2AndroidPluginSDK2))
-	cd src/java/Keepass2AndroidPluginSDK2 && $(GRADLEW) assemble
-$(OUTPUT_KP2AKdbLibrary): $(INPUT_KP2AKdbLibrary)
-	$(call remove_files,$(OUTPUT_KP2AKdbLibrary))
-	cd src/java/KP2AKdbLibrary && $(GRADLEW) assemble
-$(OUTPUT_PluginQR): $(INPUT_PluginQR)
-	$(call remove_files,$(OUTPUT_PluginQR))
-	cd src/java/PluginQR && $(GRADLEW) assemble
-
-
-##### Nuget Dependencies
-
-nuget: stamp.nuget_$(Flavor)
-stamp.nuget_$(Flavor): src/KeePass.sln $(wildcard src/*/*.csproj) $(wildcard src/*/packages.config)
-ifeq ($(shell $(WHICH) nuget),)
-	$(error "nuget" command not found. Check it is in your PATH)
-endif
-	$(RMFILE) stamp.nuget_*
-	nuget restore src/KeePass.sln
-	$(MSBUILD) src/KeePass.sln -t:restore $(MSBUILD_PARAM) -p:RestorePackagesConfig=true
-	@echo "" > stamp.nuget_$(Flavor)
-
-#####
-src/Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs:
-ifeq ($(detected_OS),Windows)
-	$(CP) src\Kp2aBusinessLogic\Io\DropboxFileStorageKeysDummy.cs src\Kp2aBusinessLogic\Io\DropboxFileStorageKeys.cs
-else
-	$(CP) src/Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs $@
-endif
-
-msbuild: native java nuget src/Kp2aBusinessLogic/Io/DropboxFileStorageKeys.cs
-	$(MSBUILD) src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(MSBUILD_PARAM) -p:Platform="Any CPU" -m
-
-apk: msbuild
-	$(MSBUILD) src/keepass2android/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m 
-
-build_all: msbuild
-
-##### Cleanup targets
-
-clean_native: $(NATIVE_CLEAN_TARGETS)
-clean_argon2:
-	cd src/java/argon2 && $(ANDROID_NDK_ROOT)/ndk-build clean
-
-clean_java: $(JAVA_CLEAN_TARGETS)
-clean_JavaFileStorageTest-AS:
-	cd src/java/JavaFileStorageTest-AS && $(GRADLEW) clean
-clean_KP2ASoftkeyboard_AS:
-	cd src/java/KP2ASoftkeyboard_AS && $(GRADLEW) clean
-clean_Keepass2AndroidPluginSDK2:
-	cd src/java/Keepass2AndroidPluginSDK2 && $(GRADLEW) clean
-clean_KP2AKdbLibrary:
-	cd src/java/KP2AKdbLibrary && $(GRADLEW) clean
-clean_PluginQR:
-	cd src/java/PluginQR && $(GRADLEW) clean
-clean_rm:
-	rm -rf src/*/obj
-	rm -rf src/*/bin
-	rm -rf src/java/*/app/build
-	rm -rf src/java/argon2/obj
-	rm -rf src/java/argon2/libs
-	rm -rf src/packages
-	rm -rf src/java/KP2AKdbLibrary/app/.cxx
-	rm -rf src/java/KP2ASoftkeyboard_AS/app/.cxx
-	rm -rf src/SamsungPass/Xamarin.SamsungPass/SamsungPass/bin
-	rm -rf src/SamsungPass/Xamarin.SamsungPass/SamsungPass/obj
-	
-
-# https://learn.microsoft.com/en-us/nuget/consume-packages/package-restore-troubleshooting#other-potential-conditions
-clean_nuget:
-	cd src && $(call remove_dir,packages)
-ifeq ($(detected_OS),Windows)
-	DEL /S src\project.assets.json
-	DEL /S src\*.nuget.*
-else
-	$(RM) src/*/obj/project.assets.json
-	$(RM) src/*/obj/*.nuget.*
-endif
-	$(RMFILE) stamp.nuget_*
-
-clean_msbuild:
-	$(MSBUILD) src/KeePass.sln -target:clean $(MSBUILD_PARAM)
-
-clean: clean_native clean_java clean_nuget clean_msbuild
-
-distclean: clean
-ifneq ("$(wildcard ./allow_git_clean)","")
-ifeq ($(shell $(WHICH) git),)
-	$(error "git" command not found. Check it is in your PATH)
-endif
-	git clean -xdff src
-else
-	$(warning 'git clean' skipped for safety reasons. See hint below:)
-	$(info )
-	$(info 'git clean' would delete all untracked files, those in '.gitignore' and those in '.git/info/exclude'.)
-	$(info )
-	$(info Check which files would be deleted by running: "git clean -n -xdff src")
-	$(info If listed files are acceptable, you can enable the call to "git clean" by creating an empty file named 'allow_git_clean' next to the Makefile.)
-	$(info )
-endif

crowdin.yml

@@ -1,34 +0,0 @@
-files:
-  - source: src/keepass2android/Resources/values/strings.xml
-    translation: >-
-      /src/keepass2android/Resources/values-%two_letters_code%/%original_file_name%
-    translate_attributes: '0'
-    content_segmentation: '0'
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh
-        zh-TW: zh-rTW
-        pt-PT: pt
-        pt-BR: pt-rBR
-  - source: src/java/android-filechooser-AS/app/src/main/res/values/strings.xml
-    translation: >-
-      /src/java/android-filechooser-AS/app/src/main/res/values-%two_letters_code%/%original_file_name%
-    translate_attributes: '0'
-    content_segmentation: '0'
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh
-        zh-TW: zh-rTW
-        pt-PT: pt
-        pt-BR: pt-rBR
-  - source: src/java/KP2ASoftkeyboard_AS/app/src/main/res/values/strings.xml
-    translation: >-
-      /src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-%two_letters_code%/%original_file_name%
-    translate_attributes: '0'
-    content_segmentation: '0'
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh
-        zh-TW: zh-rTW
-        pt-PT: pt
-        pt-BR: pt-rBR

docs/Build.readme.md

@@ -1,239 +0,0 @@
-# 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/Documentation.md

@@ -7,12 +7,11 @@ If you think something is missing in the documentation, please create an issue a
 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?
+** 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. 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
@@ -28,14 +27,14 @@ Select "Create new database" from the start screen. Tap the integrated help icon
 ## 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.
+* You can enable the Keepass2Android Autofill service in the system's accessibility settings which allows to fill data using Android's accessibility system. This works with many apps including Chrome browser but is not supported for Firefox on Android.
+* 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.
 
 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.
+If you have enabled the autofill service and open a (supported) app with a password field, a notification appears in the notification bar. Select this notification 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
@@ -68,58 +67,18 @@ Please see the [How to use Keepass2Android with YubiKey NEO](How-to-use-Keepass2
 ## 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?
+* 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. 
+* 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!
 
-## 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?
+* Why is Keepass2Android 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,53 +0,0 @@
-
-## 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

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

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

@@ -4,28 +4,28 @@
  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>
+<a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767825"><img title="OTPAuxFile" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767826" 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><a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767911"><img title="image" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767912" 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><a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767913"><img title="Screenshot_2013-12-13-06-38-50" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767914" 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>
+<a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767915"><img title="Screenshot_2013-12-13-06-38-12" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767916" 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>
+<a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767917"><img title="Screenshot_2013-12-13-06-38-36" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767918" 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>
+<a href="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767919"><img title="Screenshot_2013-12-13-06-39-47" src="http://download-codeplex.sec.s-msft.com/Download?ProjectName=keepass2android&DownloadId=767920" 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>
+</div><div class="ClearBoth"></div>

docs/Keepass2Android-Apk.md

@@ -2,7 +2,7 @@ Keepass2Android's apk is pretty big, e.g. when comparing to Keepassdroid. The ma
 
 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				
@@ -22,4 +22,4 @@ Java/Mono bindings					0.5 MB
 rest							0.3 MB		
 
 TOTAL							13 MB
-```
+}}

docs/Privacy-Policy.md

@@ -18,8 +18,6 @@ Keepass2Android does not collect personal identifiable information. For debuggin
 * **Internet** (Keepass2Android regular only): Required to allow the user to read/store password databases or key files on remote locations, e.g. Dropbox or via WebDav.
 * **Contacts/Accounts** (Keepass2Android regular only): Required by the Google Drive SDK. If you want to access files on Google Drive, you are prompted to select one of the Google Accounts on your phone to use. The permission is required to query the list of Google accounts on the device. Keepass2Android does not access your personal contacts.
 * **Storage**: Required to allow the user to read/store password databases or key files on the device locally.
-* **Fingerprint/Biometric**: Required if you want to use biometric unlock.
+* **Fingerprint**: Required if you want to use fingerprint 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

@@ -1,6 +1,3 @@
-<h1 align="center"><img src="/src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_online.png" align="center" width="100" alt="Keepass2Android Logo">Keepass2Android</h1>
-
-
 # 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". 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.
@@ -8,20 +5,14 @@ The password database file can be synchronized across different devices. This wo
 # Where to get it?
 Regular stable releases of Keepass2Android are available on [Google Play](https://play.google.com/store/apps/details?id=keepass2android.keepass2android).
 
-Beta-releases can be obtained by opting in to the [Beta testing channel](https://play.google.com/apps/testing/keepass2android.keepass2android) or [Beta testing channel for Keepass2Android Offline](https://play.google.com/apps/testing/keepass2android.keepass2android_nonet).
+Beta-releases can be obtained by opting in to the [Beta testing channel](https://play.google.com/apps/testing/keepass2android.keepass2android) or [Beta testing channel for Keepass2Android Offline](https://play.google.com/apps/testing/keepass2android.keepass2android_nonet). Please join the [Beta tester group](https://plus.google.com/communities/107293657110547776032) for news and discussions about the latest beta releases.
 
 # How can I contribute?
 * Help to translate Keepass2Android into your language or improve translations at [our Crowdin page](http://crowdin.net/project/keepass2android)
 * Add features by [creating a plugin](How-to-create-a-plug-in_.md) or creating a pull request. You might want to contact me before you start working so I can coordinate efforts.
-* [Become a GitHub sponsor to boost 🚀 development](https://github.com/sponsors/PhilippC)
 * [Make a donation](http://philipp.crocoll.net/donate.php)
 
 # How do I learn more?
 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)
+[![Build Status](https://www.bitrise.io/app/43a23ab54dee9f7e/status.svg?token=2vryTsMQzTX3XRPikhgRwA&branch=nonet)](https://www.bitrise.io/app/43a23ab54dee9f7e)

docs/SFTP-Credentials.md

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

src/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.GooglePlayServices" version="27.0.0.0" />
+</packages>

src/AdalBindings/AdalBindings.csproj

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0B109C0E-0514-4340-8779-5BD6A0DDE84E}</ProjectGuid>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AdalBindings</RootNamespace>
-    <AssemblyName>AdalBindings</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Jars\AboutJars.txt" />
-    <None Include="Additions\AboutAdditions.txt" />
-    <LibraryProjectZip Include="Jars\adal-1.14.0.aar" />
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\Metadata.xml" />
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gson-2.3.1.jar" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

src/AdalBindings/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/AdalBindings/Jars/AboutJars.txt

@@ -1,24 +0,0 @@
-This directory is for Android .jars.
-
-There are 2 types of jars that are supported:
-
-== Input Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jars ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".

src/AdalBindings/Properties/AssemblyInfo.cs

@@ -1,30 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("AdalBindings")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AdalBindings")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/AdalBindings/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/AdalBindings/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/AdalBindings/Transforms/Metadata.xml

@@ -1,13 +0,0 @@
-<metadata>
-  <!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-  <remove-node path="/api/package[@name='com.microsoft.aad.adal']/class[@name='AuthenticationActivity']" />
-  <remove-node path="/api/package[@name='com.microsoft.aad.adal']/class[@name='DateTimeAdapter']" />
-  <remove-node path="/api/package[@name='com.microsoft.aad.adal']" />
-
-</metadata>

src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj

@@ -10,10 +10,8 @@
     <RootNamespace>AndroidFileChooserBinding</RootNamespace>
     <AssemblyName>AndroidFileChooserBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
-    <AndroidClassParser>class-parse</AndroidClassParser>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,4 +78,4 @@
       <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
-</Project>
+</Project>

src/JavaFileStorageBindings/Jars/adal-1.1.19/res/layout/http_auth_dialog.xml

@@ -26,7 +26,6 @@
         android:hint="@string/http_auth_dialog_password"
         android:inputType="textPassword"
         android:paddingTop="10dp"
-        android:paddingBottom="20dp"
-        android:importantForAccessibility="no" />
+        android:paddingBottom="20dp" />
 
 </LinearLayout>

src/JavaFileStorageBindings/JavaFileStorageBindings.csproj

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.props')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.props" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,12 +10,8 @@
     <RootNamespace>JavaFileStorageBindings</RootNamespace>
     <AssemblyName>JavaFileStorageBindings</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,130 +44,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Java.Interop" />
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.AndroidX.Activity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Activity.1.6.0\lib\monoandroid12.0\Xamarin.AndroidX.Activity.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Annotation, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Annotation.1.5.0\lib\monoandroid12.0\Xamarin.AndroidX.Annotation.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Annotation.Experimental, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Annotation.Experimental.1.3.0\lib\monoandroid12.0\Xamarin.AndroidX.Annotation.Experimental.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.15\lib\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.15\lib\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Collection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Collection.1.2.0.4\lib\monoandroid12.0\Xamarin.AndroidX.Collection.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Concurrent.Futures, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.9\lib\monoandroid12.0\Xamarin.AndroidX.Concurrent.Futures.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Core.1.9.0\lib\monoandroid12.0\Xamarin.AndroidX.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Core.Core.Ktx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Core.Core.Ktx.1.9.0\lib\monoandroid12.0\Xamarin.AndroidX.Core.Core.Ktx.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.CustomView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.CustomView.1.1.0.13\lib\monoandroid12.0\Xamarin.AndroidX.CustomView.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Fragment, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Fragment.1.5.3\lib\monoandroid12.0\Xamarin.AndroidX.Fragment.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Common.2.5.1\lib\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.5.1\lib\monoandroid12.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.5.1\lib\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.5.1\lib\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.5.1\lib\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Loader, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Loader.1.1.0.14\lib\monoandroid12.0\Xamarin.AndroidX.Loader.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.MultiDex, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.MultiDex.2.0.1.13\lib\monoandroid12.0\Xamarin.AndroidX.MultiDex.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.SavedState, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.SavedState.1.2.0\lib\monoandroid12.0\Xamarin.AndroidX.SavedState.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Tracing.Tracing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.Tracing.Tracing.1.1.0.1\lib\monoandroid12.0\Xamarin.AndroidX.Tracing.Tracing.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.VersionedParcelable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.14\lib\monoandroid12.0\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.ViewPager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.AndroidX.ViewPager.1.0.0.14\lib\monoandroid12.0\Xamarin.AndroidX.ViewPager.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Google.Guava, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Google.Guava.28.2.0.1\lib\monoandroid90\Xamarin.Google.Guava.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Google.Guava.FailureAccess, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Google.Guava.FailureAccess.1.0.1.3\lib\monoandroid90\Xamarin.Google.Guava.FailureAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Google.Guava.ListenableFuture, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.9\lib\monoandroid12.0\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Auth, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.120.4.0\lib\monoandroid12.0\Xamarin.GooglePlayServices.Auth.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Auth.Api.Phone, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.118.0.1.2\lib\monoandroid12.0\Xamarin.GooglePlayServices.Auth.Api.Phone.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Auth.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Base.118.0.6\lib\monoandroid12.0\Xamarin.GooglePlayServices.Auth.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Base.118.1.0\lib\monoandroid12.0\Xamarin.GooglePlayServices.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.118.1.0.1\lib\monoandroid12.0\Xamarin.GooglePlayServices.Basement.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Fido, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Fido.119.0.0\lib\monoandroid12.0\Xamarin.GooglePlayServices.Fido.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.118.0.2\lib\monoandroid12.0\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Jetbrains.Annotations, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Jetbrains.Annotations.23.0.0.4\lib\monoandroid12.0\Xamarin.Jetbrains.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Kotlin.StdLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Kotlin.StdLib.1.7.10\lib\monoandroid12.0\Xamarin.Kotlin.StdLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Kotlin.StdLib.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Kotlin.StdLib.Common.1.7.10\lib\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Kotlin.StdLib.Jdk7, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.7.10\lib\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk7.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Kotlin.StdLib.Jdk8, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.7.10\lib\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk8.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.KotlinX.Coroutines.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.KotlinX.Coroutines.Android.1.6.4\lib\monoandroid12.0\Xamarin.KotlinX.Coroutines.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.KotlinX.Coroutines.Core.Jvm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.KotlinX.Coroutines.Core.Jvm.1.6.4\lib\monoandroid12.0\Xamarin.KotlinX.Coroutines.Core.Jvm.dll</HintPath>
+    <Reference Include="GooglePlayServicesLib">
+      <HintPath>..\Components\googleplayservices-19.0.0\lib\android\GooglePlayServicesLib.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -185,7 +60,7 @@
     </LibraryProjectZip>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
-    <None Include="packages.config" />
+    <LibraryProjectZip Include="Jars\adal-1.14.0.aar" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml" />
@@ -207,10 +82,10 @@
     </XamarinComponentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PCloudBindings\PCloudBindings.csproj">
-      <Project>{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}</Project>
-      <Name>PCloudBindings</Name>
-    </ProjectReference>
+    <EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gson-2.3.1.jar" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\msa-auth-0.8.6\classes-msa-auth.jar" />
@@ -221,12 +96,30 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\commons-logging-1.1.1.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-api-client-1.16.0-rc.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-api-client-android-1.16.0-rc.jar" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\google-api-services-drive-v2-rev102-1.16.0-rc.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-1.16.0-rc.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-android-1.16.0-rc.jar" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-jackson-1.16.0-rc.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-jackson2-1.16.0-rc.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\google-oauth-client-1.16.0-rc.jar" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\httpclient-4.0.3.jar" />
   </ItemGroup>
@@ -239,6 +132,9 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\json_simple-1.1.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\gdrive\jsr305-1.3.9.jar" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-gson-1.16.0-rc.jar" />
   </ItemGroup>
@@ -246,137 +142,12 @@
     <EmbeddedReferenceJar Include="Jars\jackson-core-2.7.4.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-digest-2.5.jar" />
+    <EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okio-2.9.0.jar" />
+    <EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-4.10.0-RC1.jar" />
+    <EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedJar Include="Jars\dropbox-core-sdk-4.0.0.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gson-2.8.6.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-android-1.32.1.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\jsr305-3.0.2.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-1.32.1.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-http-client-jackson2-1.32.1.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-api-client-1.30.5.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-api-client-android-1.30.5.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\google-oauth-client-1.30.4.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\opencensus-contrib-http-util-0.24.0.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\grpc-context-1.22.1.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\gdrive\opencensus-api-0.24.0.jar" />
-  </ItemGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Xamarin.Google.Guava.FailureAccess.1.0.1.3\build\monoandroid90\Xamarin.Google.Guava.FailureAccess.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Google.Guava.FailureAccess.1.0.1.3\build\monoandroid90\Xamarin.Google.Guava.FailureAccess.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Google.Guava.28.2.0.1\build\monoandroid90\Xamarin.Google.Guava.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Google.Guava.28.2.0.1\build\monoandroid90\Xamarin.Google.Guava.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.13\build\monoandroid12.0\Xamarin.AndroidX.MultiDex.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.MultiDex.2.0.1.13\build\monoandroid12.0\Xamarin.AndroidX.MultiDex.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.props'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.props'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.9\build\monoandroid12.0\Xamarin.Google.Guava.ListenableFuture.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.9\build\monoandroid12.0\Xamarin.Google.Guava.ListenableFuture.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Jetbrains.Annotations.23.0.0.4\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Jetbrains.Annotations.23.0.0.4\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.Common.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Annotation.1.5.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Annotation.1.5.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.3.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.Experimental.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Annotation.Experimental.1.3.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.Experimental.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Runtime.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Collection.1.2.0.4\build\monoandroid12.0\Xamarin.AndroidX.Collection.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Collection.1.2.0.4\build\monoandroid12.0\Xamarin.AndroidX.Collection.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.9\build\monoandroid12.0\Xamarin.AndroidX.Concurrent.Futures.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.9\build\monoandroid12.0\Xamarin.AndroidX.Concurrent.Futures.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Lifecycle.Common.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Lifecycle.Common.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Runtime.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.SavedState.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.SavedState.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.SavedState.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.SavedState.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Tracing.Tracing.1.1.0.1\build\monoandroid12.0\Xamarin.AndroidX.Tracing.Tracing.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Tracing.Tracing.1.1.0.1\build\monoandroid12.0\Xamarin.AndroidX.Tracing.Tracing.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.14\build\monoandroid12.0\Xamarin.AndroidX.VersionedParcelable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.14\build\monoandroid12.0\Xamarin.AndroidX.VersionedParcelable.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Core.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Core.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Core.Core.Ktx.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.Core.Ktx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Core.Core.Ktx.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.Core.Ktx.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.CustomView.1.1.0.13\build\monoandroid12.0\Xamarin.AndroidX.CustomView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.CustomView.1.1.0.13\build\monoandroid12.0\Xamarin.AndroidX.CustomView.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Loader.1.1.0.14\build\monoandroid12.0\Xamarin.AndroidX.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Loader.1.1.0.14\build\monoandroid12.0\Xamarin.AndroidX.Loader.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.ViewPager.1.0.0.14\build\monoandroid12.0\Xamarin.AndroidX.ViewPager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.ViewPager.1.0.0.14\build\monoandroid12.0\Xamarin.AndroidX.ViewPager.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk7.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk7.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk8.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.KotlinX.Coroutines.Core.Jvm.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Core.Jvm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.KotlinX.Coroutines.Core.Jvm.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Core.Jvm.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.KotlinX.Coroutines.Android.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.KotlinX.Coroutines.Android.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Android.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Activity.1.6.0\build\monoandroid12.0\Xamarin.AndroidX.Activity.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Activity.1.6.0\build\monoandroid12.0\Xamarin.AndroidX.Activity.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.AndroidX.Fragment.1.5.3\build\monoandroid12.0\Xamarin.AndroidX.Fragment.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Fragment.1.5.3\build\monoandroid12.0\Xamarin.AndroidX.Fragment.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.118.1.0.1\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.118.1.0.1\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Basement.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.118.0.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.118.0.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Tasks.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.118.1.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.118.1.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Base.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.118.0.1.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.118.0.1.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Api.Phone.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.118.0.6\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Base.118.0.6\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Base.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Fido.119.0.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Fido.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Fido.119.0.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Fido.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.120.4.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.120.4.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.targets'))" />
-  </Target>
-  <Import Project="..\packages\Xamarin.Google.Guava.FailureAccess.1.0.1.3\build\monoandroid90\Xamarin.Google.Guava.FailureAccess.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.FailureAccess.1.0.1.3\build\monoandroid90\Xamarin.Google.Guava.FailureAccess.targets')" />
-  <Import Project="..\packages\Xamarin.Google.Guava.28.2.0.1\build\monoandroid90\Xamarin.Google.Guava.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.28.2.0.1\build\monoandroid90\Xamarin.Google.Guava.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.MultiDex.2.0.1.13\build\monoandroid12.0\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.13\build\monoandroid12.0\Xamarin.AndroidX.MultiDex.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.10\build\monoandroid120\Xamarin.AndroidX.Migration.targets')" />
-  <Import Project="..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.4\build\Xamarin.Build.Download.targets')" />
-  <Import Project="..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.9\build\monoandroid12.0\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.9\build\monoandroid12.0\Xamarin.Google.Guava.ListenableFuture.targets')" />
-  <Import Project="..\packages\Xamarin.Jetbrains.Annotations.23.0.0.4\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.23.0.0.4\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets')" />
-  <Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets')" />
-  <Import Project="..\packages\Xamarin.Kotlin.StdLib.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Annotation.1.5.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.1.5.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.3.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.3.0\build\monoandroid12.0\Xamarin.AndroidX.Annotation.Experimental.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Common.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.15\build\monoandroid12.0\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Collection.1.2.0.4\build\monoandroid12.0\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Collection.1.2.0.4\build\monoandroid12.0\Xamarin.AndroidX.Collection.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.9\build\monoandroid12.0\Xamarin.AndroidX.Concurrent.Futures.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.9\build\monoandroid12.0\Xamarin.AndroidX.Concurrent.Futures.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Common.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Common.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Common.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.SavedState.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SavedState.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.SavedState.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Tracing.Tracing.1.1.0.1\build\monoandroid12.0\Xamarin.AndroidX.Tracing.Tracing.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Tracing.Tracing.1.1.0.1\build\monoandroid12.0\Xamarin.AndroidX.Tracing.Tracing.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.14\build\monoandroid12.0\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.14\build\monoandroid12.0\Xamarin.AndroidX.VersionedParcelable.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Core.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Core.Core.Ktx.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.Core.Ktx.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.Core.Ktx.1.9.0\build\monoandroid12.0\Xamarin.AndroidX.Core.Core.Ktx.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.CustomView.1.1.0.13\build\monoandroid12.0\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CustomView.1.1.0.13\build\monoandroid12.0\Xamarin.AndroidX.CustomView.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Loader.1.1.0.14\build\monoandroid12.0\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Loader.1.1.0.14\build\monoandroid12.0\Xamarin.AndroidX.Loader.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.ViewPager.1.0.0.14\build\monoandroid12.0\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager.1.0.0.14\build\monoandroid12.0\Xamarin.AndroidX.ViewPager.targets')" />
-  <Import Project="..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk7.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk7.targets')" />
-  <Import Project="..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk8.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.7.10\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Jdk8.targets')" />
-  <Import Project="..\packages\Xamarin.KotlinX.Coroutines.Core.Jvm.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Core.Jvm.targets" Condition="Exists('..\packages\Xamarin.KotlinX.Coroutines.Core.Jvm.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Core.Jvm.targets')" />
-  <Import Project="..\packages\Xamarin.KotlinX.Coroutines.Android.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Android.targets" Condition="Exists('..\packages\Xamarin.KotlinX.Coroutines.Android.1.6.4\build\monoandroid12.0\Xamarin.KotlinX.Coroutines.Android.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.5.1\build\monoandroid12.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Activity.1.6.0\build\monoandroid12.0\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Activity.1.6.0\build\monoandroid12.0\Xamarin.AndroidX.Activity.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.Fragment.1.5.3\build\monoandroid12.0\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Fragment.1.5.3\build\monoandroid12.0\Xamarin.AndroidX.Fragment.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.118.1.0.1\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.118.1.0.1\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Basement.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.118.0.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.118.0.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Tasks.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Base.118.1.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.118.1.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Base.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.118.0.1.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Api.Phone.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.118.0.1.2\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Base.118.0.6\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.118.0.6\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.Base.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Fido.119.0.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Fido.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Fido.119.0.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Fido.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.120.4.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.120.4.0\build\MonoAndroid12.0\Xamarin.GooglePlayServices.Auth.targets')" />
 </Project>

src/JavaFileStorageBindings/Transforms/Metadata.xml

@@ -11,8 +11,6 @@
 	<remove-node path="/api/package[@name='com.jcraft.jsch.jcraft']" />
 	<remove-node path="/api/package[@name='com.jcraft.jzlib']" />
 
-  <remove-node path="/api/package[@name='com.pcloud.sdk']" />
-
   <remove-node path="/api/package[@name='com.dropbox.core']" />
   <remove-node path="/api/package[@name='com.dropbox.core.util']" />
   <remove-node path="/api/package[@name='com.dropbox.core.http']" />

src/JavaFileStorageBindings/packages.config

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.AndroidX.Activity" version="1.6.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Annotation" version="1.5.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Annotation.Experimental" version="1.3.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Arch.Core.Common" version="2.1.0.15" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Arch.Core.Runtime" version="2.1.0.15" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Collection" version="1.2.0.4" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Concurrent.Futures" version="1.1.0.9" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Core" version="1.9.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Core.Core.Ktx" version="1.9.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.CustomView" version="1.1.0.13" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Fragment" version="1.5.3" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.Common" version="2.5.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.LiveData.Core" version="2.5.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.Runtime" version="2.5.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.ViewModel" version="2.5.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" version="2.5.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Loader" version="1.1.0.14" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Migration" version="1.0.10" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.MultiDex" version="2.0.1.13" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.SavedState" version="1.2.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.Tracing.Tracing" version="1.1.0.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.1.14" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.AndroidX.ViewPager" version="1.0.0.14" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Build.Download" version="0.11.4" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Google.Guava" version="28.2.0.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Google.Guava.FailureAccess" version="1.0.1.3" targetFramework="monoandroid90" />
-  <package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.9" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Auth" version="120.4.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Auth.Api.Phone" version="118.0.1.2" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Auth.Base" version="118.0.6" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Base" version="118.1.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Basement" version="118.1.0.1" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Fido" version="119.0.0" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.GooglePlayServices.Tasks" version="118.0.2" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Jetbrains.Annotations" version="23.0.0.4" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Kotlin.StdLib" version="1.7.10" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Kotlin.StdLib.Common" version="1.7.10" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Kotlin.StdLib.Jdk7" version="1.7.10" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.Kotlin.StdLib.Jdk8" version="1.7.10" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.KotlinX.Coroutines.Android" version="1.6.4" targetFramework="monoandroid13.0" />
-  <package id="Xamarin.KotlinX.Coroutines.Core.Jvm" version="1.6.4" targetFramework="monoandroid13.0" />
-</packages>

src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj

@@ -10,10 +10,8 @@
     <RootNamespace>KP2AKdbLibraryBinding</RootNamespace>
     <AssemblyName>KP2AKdbLibraryBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
-    <AndroidClassParser>class-parse</AndroidClassParser>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,11 +52,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <LibraryProjectZip Include="..\java\KP2AKdbLibrary\app\build\outputs\aar\app-debug.aar">
-      <Link>Jars\app-debug.aar</Link>
-    </LibraryProjectZip>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
+    <EmbeddedNativeLibrary Include="libs\armeabi-v7a\libfinal-key.so" />
+    <EmbeddedNativeLibrary Include="libs\armeabi\libfinal-key.so" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml">
@@ -68,7 +65,9 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="libs\" />
+    <EmbeddedJar Include="..\java\KP2AKdbLibrary\bin\kp2akdblibrary.jar">
+      <Link>Jars\kp2akdblibrary.jar</Link>
+    </EmbeddedJar>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -78,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/KeePass.sln

@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33205.214
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib2Android", "KeePassLib2Android\KeePassLib2Android.csproj", "{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android", "keepass2android\keepass2android.csproj", "{A6CF8A86-37C1-4197-80FE-519DE2C842F5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aKeyboardBinding", "Kp2aKeyboardBinding\Kp2aKeyboardBinding.csproj", "{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aBusinessLogic", "Kp2aBusinessLogic\Kp2aBusinessLogic.csproj", "{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwofishCipher", "TwofishCipher\TwofishCipher.csproj", "{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaFileStorageBindings", "JavaFileStorageBindings\JavaFileStorageBindings.csproj", "{48574278-4779-4B3A-A9E4-9CF1BC285D0B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidFileChooserBinding", "AndroidFileChooserBinding\AndroidFileChooserBinding.csproj", "{3C0F7FE5-639F-4422-A087-8B26CF862D1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KP2AKdbLibraryBinding", "KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj", "{70D3844A-D9FA-4A64-B205-A84C6A822196}"
@@ -21,13 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginSdkBinding", "PluginS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZlibAndroid", "ZlibAndroid\ZlibAndroid.csproj", "{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCloudBindings", "PCloudBindings\PCloudBindings.csproj", "{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android-app", "keepass2android\keepass2android-app.csproj", "{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParser", "Kp2aAutofillParser\Kp2aAutofillParser.csproj", "{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aAutofillParserTest", "Kp2aAutofillParserTest\Kp2aAutofillParserTest.csproj", "{3D1560FF-86BB-4CB4-8367-80BA13B81C38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamsungPass", "SamsungPass\Xamarin.SamsungPass\SamsungPass\SamsungPass.csproj", "{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,6 +61,34 @@ Global
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.Build.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.Build.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Deploy.0 = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -83,8 +105,8 @@ Global
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Win32.Build.0 = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.ActiveCfg = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.Build.0 = Release|Any CPU
-		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.Build.0 = Debug|Any CPU
+		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -125,30 +147,6 @@ Global
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.Build.0 = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.Build.0 = ReleaseNoNet|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -161,8 +159,8 @@ Global
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -179,8 +177,8 @@ Global
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Win32.ActiveCfg = Release|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|x64.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -197,8 +195,8 @@ Global
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -227,114 +225,24 @@ Global
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|Win32.Build.0 = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Debug|x64.Build.0 = Debug|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|Win32.Build.0 = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|x64.ActiveCfg = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.Release|x64.Build.0 = Release|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Win32.Build.0 = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
-		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|x64.Build.0 = ReleaseNoNet|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.Build.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.Deploy.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.Build.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|Win32.Build.0 = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Debug|x64.Build.0 = Debug|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Win32.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|Win32.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|x64.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.Release|x64.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|Win32.Build.0 = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Debug|x64.Build.0 = Debug|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Win32.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|Win32.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|x64.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.Release|x64.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{3D1560FF-86BB-4CB4-8367-80BA13B81C38}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
+		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/KeePassLib2Android/Collections/ProtectedBinarySet.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,11 +33,8 @@ namespace KeePassLib.Collections
 		private Dictionary<int, ProtectedBinary> m_d =
 			new Dictionary<int, ProtectedBinary>();
 
-		private readonly bool m_bDedupAdd;
-
-		public ProtectedBinarySet(bool bDedupAdd)
+		public ProtectedBinarySet()
 		{
-			m_bDedupAdd = bDedupAdd;
 		}
 
 		IEnumerator IEnumerable.GetEnumerator()
@@ -50,10 +47,15 @@ namespace KeePassLib.Collections
 			return m_d.GetEnumerator();
 		}
 
+		public void Clear()
+		{
+			m_d.Clear();
+		}
+
 		private int GetFreeID()
 		{
 			int i = m_d.Count;
-			while (m_d.ContainsKey(i)) { ++i; }
+			while(m_d.ContainsKey(i)) { ++i; }
 			Debug.Assert(i == m_d.Count); // m_d.Count should be free
 			return i;
 		}
@@ -61,7 +63,7 @@ namespace KeePassLib.Collections
 		public ProtectedBinary Get(int iID)
 		{
 			ProtectedBinary pb;
-			if (m_d.TryGetValue(iID, out pb)) return pb;
+			if(m_d.TryGetValue(iID, out pb)) return pb;
 
 			// Debug.Assert(false); // No assert
 			return null;
@@ -69,12 +71,12 @@ namespace KeePassLib.Collections
 
 		public int Find(ProtectedBinary pb)
 		{
-			if (pb == null) { Debug.Assert(false); return -1; }
+			if(pb == null) { Debug.Assert(false); return -1; }
 
 			// Fast search by reference
-			foreach (KeyValuePair<int, ProtectedBinary> kvp in m_d)
+			foreach(KeyValuePair<int, ProtectedBinary> kvp in m_d)
 			{
-				if (object.ReferenceEquals(pb, kvp.Value))
+				if(object.ReferenceEquals(pb, kvp.Value))
 				{
 					Debug.Assert(pb.Equals(kvp.Value));
 					return kvp.Key;
@@ -82,9 +84,9 @@ namespace KeePassLib.Collections
 			}
 
 			// Slow search by content
-			foreach (KeyValuePair<int, ProtectedBinary> kvp in m_d)
+			foreach(KeyValuePair<int, ProtectedBinary> kvp in m_d)
 			{
-				if (pb.Equals(kvp.Value)) return kvp.Key;
+				if(pb.Equals(kvp.Value)) return kvp.Key;
 			}
 
 			// Debug.Assert(false); // No assert
@@ -93,26 +95,28 @@ namespace KeePassLib.Collections
 
 		public void Set(int iID, ProtectedBinary pb)
 		{
-			if (iID < 0) { Debug.Assert(false); return; }
-			if (pb == null) { Debug.Assert(false); return; }
+			if(iID < 0) { Debug.Assert(false); return; }
+			if(pb == null) { Debug.Assert(false); return; }
 
 			m_d[iID] = pb;
 		}
 
 		public void Add(ProtectedBinary pb)
 		{
-			if (pb == null) { Debug.Assert(false); return; }
+			if(pb == null) { Debug.Assert(false); return; }
 
-			if (m_bDedupAdd && (Find(pb) >= 0)) return; // Exists already
+			int i = Find(pb);
+			if(i >= 0) return; // Exists already
 
-			m_d[GetFreeID()] = pb;
+			i = GetFreeID();
+			m_d[i] = pb;
 		}
 
 		public void AddFrom(ProtectedBinaryDictionary d)
 		{
-			if (d == null) { Debug.Assert(false); return; }
+			if(d == null) { Debug.Assert(false); return; }
 
-			foreach (KeyValuePair<string, ProtectedBinary> kvp in d)
+			foreach(KeyValuePair<string, ProtectedBinary> kvp in d)
 			{
 				Add(kvp.Value);
 			}
@@ -120,16 +124,16 @@ namespace KeePassLib.Collections
 
 		public void AddFrom(PwGroup pg)
 		{
-			if (pg == null) { Debug.Assert(false); return; }
+			if(pg == null) { Debug.Assert(false); return; }
 
-			EntryHandler eh = delegate (PwEntry pe)
+			EntryHandler eh = delegate(PwEntry pe)
 			{
-				if (pe == null) { Debug.Assert(false); return true; }
+				if(pe == null) { Debug.Assert(false); return true; }
 
 				AddFrom(pe.Binaries);
-				foreach (PwEntry peHistory in pe.History)
+				foreach(PwEntry peHistory in pe.History)
 				{
-					if (peHistory == null) { Debug.Assert(false); continue; }
+					if(peHistory == null) { Debug.Assert(false); continue; }
 					AddFrom(peHistory.Binaries);
 				}
 
@@ -144,9 +148,9 @@ namespace KeePassLib.Collections
 			int n = m_d.Count;
 			ProtectedBinary[] v = new ProtectedBinary[n];
 
-			foreach (KeyValuePair<int, ProtectedBinary> kvp in m_d)
+			foreach(KeyValuePair<int, ProtectedBinary> kvp in m_d)
 			{
-				if ((kvp.Key < 0) || (kvp.Key >= n))
+				if((kvp.Key < 0) || (kvp.Key >= n))
 				{
 					Debug.Assert(false);
 					throw new InvalidOperationException();
@@ -155,9 +159,9 @@ namespace KeePassLib.Collections
 				v[kvp.Key] = kvp.Value;
 			}
 
-			for (int i = 0; i < n; ++i)
+			for(int i = 0; i < n; ++i)
 			{
-				if (v[i] == null)
+				if(v[i] == null)
 				{
 					Debug.Assert(false);
 					throw new InvalidOperationException();

src/KeePassLib2Android/Collections/StringDictionaryEx.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Text;
+using System.Diagnostics;
 
 using KeePassLib.Interfaces;
 
@@ -34,74 +34,48 @@ namespace KeePassLib.Collections
 	public sealed class StringDictionaryEx : IDeepCloneable<StringDictionaryEx>,
 		IEnumerable<KeyValuePair<string, string>>, IEquatable<StringDictionaryEx>
 	{
-		private SortedDictionary<string, string> m_d =
+		private SortedDictionary<string, string> m_dict =
 			new SortedDictionary<string, string>();
 
-		// Non-null if and only if last mod. times should be remembered
-		private Dictionary<string, DateTime> m_dLastMod = null;
-
 		public int Count
 		{
-			get { return m_d.Count; }
+			get { return m_dict.Count; }
 		}
 
 		public StringDictionaryEx()
 		{
 		}
 
-		internal StringDictionaryEx(bool bRememberLastMod)
-		{
-			if (bRememberLastMod) m_dLastMod = new Dictionary<string, DateTime>();
-		}
-
 		IEnumerator IEnumerable.GetEnumerator()
 		{
-			return m_d.GetEnumerator();
+			return m_dict.GetEnumerator();
 		}
 
 		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
 		{
-			return m_d.GetEnumerator();
+			return m_dict.GetEnumerator();
 		}
 
 		public StringDictionaryEx CloneDeep()
 		{
 			StringDictionaryEx sdNew = new StringDictionaryEx();
 
-			foreach (KeyValuePair<string, string> kvp in m_d)
-				sdNew.m_d[kvp.Key] = kvp.Value;
+			foreach(KeyValuePair<string, string> kvp in m_dict)
+				sdNew.m_dict[kvp.Key] = kvp.Value; // Strings are immutable
 
-			if (m_dLastMod != null)
-				sdNew.m_dLastMod = new Dictionary<string, DateTime>(m_dLastMod);
-
-			Debug.Assert(Equals(sdNew));
 			return sdNew;
 		}
 
 		public bool Equals(StringDictionaryEx sdOther)
 		{
-			if (sdOther == null) { Debug.Assert(false); return false; }
+			if(sdOther == null) { Debug.Assert(false); return false; }
 
-			if (m_d.Count != sdOther.m_d.Count) return false;
+			if(m_dict.Count != sdOther.m_dict.Count) return false;
 
-			foreach (KeyValuePair<string, string> kvp in sdOther.m_d)
+			foreach(KeyValuePair<string, string> kvp in sdOther.m_dict)
 			{
 				string str = Get(kvp.Key);
-				if ((str == null) || (str != kvp.Value)) return false;
-			}
-
-			int cLastModT = ((m_dLastMod != null) ? m_dLastMod.Count : -1);
-			int cLastModO = ((sdOther.m_dLastMod != null) ? sdOther.m_dLastMod.Count : -1);
-			if (cLastModT != cLastModO) return false;
-
-			if (m_dLastMod != null)
-			{
-				foreach (KeyValuePair<string, DateTime> kvp in sdOther.m_dLastMod)
-				{
-					DateTime? odt = GetLastModificationTime(kvp.Key);
-					if (!odt.HasValue) return false;
-					if (odt.Value != kvp.Value) return false;
-				}
+				if((str == null) || (str != kvp.Value)) return false;
 			}
 
 			return true;
@@ -109,62 +83,48 @@ namespace KeePassLib.Collections
 
 		public string Get(string strName)
 		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
+			if(strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
 
-			string str;
-			m_d.TryGetValue(strName, out str);
-			return str;
-		}
-
-		internal DateTime? GetLastModificationTime(string strName)
-		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
-
-			if (m_dLastMod == null) return null;
-
-			DateTime dt;
-			if (m_dLastMod.TryGetValue(strName, out dt)) return dt;
+			string s;
+			if(m_dict.TryGetValue(strName, out s)) return s;
 			return null;
 		}
 
 		public bool Exists(string strName)
 		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
+			if(strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
 
-			return m_d.ContainsKey(strName);
+			return m_dict.ContainsKey(strName);
 		}
 
-		public void Set(string strName, string strValue)
+		/// <summary>
+		/// Set a string.
+		/// </summary>
+		/// <param name="strField">Identifier of the string field to modify.</param>
+		/// <param name="strNewValue">New value. This parameter must not be <c>null</c>.</param>
+		/// <exception cref="System.ArgumentNullException">Thrown if one of the input
+		/// parameters is <c>null</c>.</exception>
+		public void Set(string strField, string strNewValue)
 		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
-			if (strValue == null) { Debug.Assert(false); throw new ArgumentNullException("strValue"); }
+			if(strField == null) { Debug.Assert(false); throw new ArgumentNullException("strField"); }
+			if(strNewValue == null) { Debug.Assert(false); throw new ArgumentNullException("strNewValue"); }
 
-			m_d[strName] = strValue;
-
-			if (m_dLastMod != null) m_dLastMod[strName] = DateTime.UtcNow;
+			m_dict[strField] = strNewValue;
 		}
 
-		internal void Set(string strName, string strValue, DateTime? odtLastMod)
+		/// <summary>
+		/// Delete a string.
+		/// </summary>
+		/// <param name="strField">Name of the string field to delete.</param>
+		/// <returns>Returns <c>true</c> if the field has been successfully
+		/// removed, otherwise the return value is <c>false</c>.</returns>
+		/// <exception cref="System.ArgumentNullException">Thrown if the input
+		/// parameter is <c>null</c>.</exception>
+		public bool Remove(string strField)
 		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
-			if (strValue == null) { Debug.Assert(false); throw new ArgumentNullException("strValue"); }
+			if(strField == null) { Debug.Assert(false); throw new ArgumentNullException("strField"); }
 
-			m_d[strName] = strValue;
-
-			if (m_dLastMod != null)
-			{
-				if (odtLastMod.HasValue) m_dLastMod[strName] = odtLastMod.Value;
-				else m_dLastMod.Remove(strName);
-			}
-		}
-
-		public bool Remove(string strName)
-		{
-			if (strName == null) { Debug.Assert(false); throw new ArgumentNullException("strName"); }
-
-			if (m_dLastMod != null) m_dLastMod.Remove(strName);
-
-			return m_d.Remove(strName);
+			return m_dict.Remove(strField);
 		}
 	}
 }

src/KeePassLib2Android/Cryptography/Cipher/ChaCha20Engine.cs

@@ -28,29 +28,15 @@ using KeePassLib.Resources;
 namespace KeePassLib.Cryptography.Cipher
 {
 	public sealed class ChaCha20Engine : ICipherEngine2
-    {
-        private static PwUuid m_uuid = null;
-
-        internal static PwUuid ChaCha20Uuid
-        {
-            get
-            {
-                PwUuid pu = m_uuid;
-                if (pu == null)
-                {
-                    pu = new PwUuid(new byte[] {
-                        0xD6, 0x03, 0x8A, 0x2B, 0x8B, 0x6F, 0x4C, 0xB5,
-                        0xA5, 0x24, 0x33, 0x9A, 0x31, 0xDB, 0xB5, 0x9A });
-                    m_uuid = pu;
-                }
-
-                return pu;
-            }
-        }
+	{
+		private PwUuid m_uuid = new PwUuid(new byte[] {
+			0xD6, 0x03, 0x8A, 0x2B, 0x8B, 0x6F, 0x4C, 0xB5,
+			0xA5, 0x24, 0x33, 0x9A, 0x31, 0xDB, 0xB5, 0x9A
+		});
 
 		public PwUuid CipherUuid
 		{
-			get { return ChaCha20Uuid; }
+			get { return m_uuid; }
 		}
 
 		public string DisplayName

src/KeePassLib2Android/Cryptography/CryptoRandom.cs

@@ -367,27 +367,5 @@ namespace KeePassLib.Cryptography
 			Debug.Assert(iPos == pbRes.Length);
 			return pbRes;
 		}
-
-
-        private static int g_iWeakSeed = 0;
-        public static Random NewWeakRandom()
-        {
-            long s64 = DateTime.UtcNow.ToBinary();
-            int s32 = (int)((s64 >> 32) ^ s64);
-
-            lock (g_oSyncRoot)
-            {
-                unchecked
-                {
-                    g_iWeakSeed += 0x78A8C4B7; // Prime number
-                    s32 ^= g_iWeakSeed;
-                }
-            }
-
-            // Prevent overflow in the Random constructor of .NET 2.0
-            if (s32 == int.MinValue) s32 = int.MaxValue;
-
-            return new Random(s32);
-        }
 	}
 }

src/KeePassLib2Android/Cryptography/CryptoUtil.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,67 +20,28 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Reflection;
 using System.Text;
 
 #if !KeePassUAP
 using System.Security.Cryptography;
 #endif
 
-using KeePassLib.Native;
 using KeePassLib.Utility;
 
 namespace KeePassLib.Cryptography
 {
 	public static class CryptoUtil
 	{
-		private static bool? g_obProtData = null;
-		public static bool IsProtectedDataSupported
-		{
-			get
-			{
-				if (g_obProtData.HasValue) return g_obProtData.Value;
-
-				bool b = false;
-				try
-				{
-					Random r = CryptoRandom.NewWeakRandom();
-
-					byte[] pbData = new byte[137];
-					r.NextBytes(pbData);
-
-					byte[] pbEnt = new byte[41];
-					r.NextBytes(pbEnt);
-
-					byte[] pbEnc = ProtectedData.Protect(pbData, pbEnt,
-						DataProtectionScope.CurrentUser);
-					if ((pbEnc != null) && !MemUtil.ArraysEqual(pbEnc, pbData))
-					{
-						byte[] pbDec = ProtectedData.Unprotect(pbEnc, pbEnt,
-							DataProtectionScope.CurrentUser);
-						if ((pbDec != null) && MemUtil.ArraysEqual(pbDec, pbData))
-							b = true;
-					}
-				}
-				catch (Exception) { Debug.Assert(false); }
-
-				Debug.Assert(b); // Should be supported on all systems
-				g_obProtData = b;
-				return b;
-			}
-		}
-
 		public static byte[] HashSha256(byte[] pbData)
 		{
-			if (pbData == null) throw new ArgumentNullException("pbData");
+			if(pbData == null) throw new ArgumentNullException("pbData");
 
 			return HashSha256(pbData, 0, pbData.Length);
 		}
 
 		public static byte[] HashSha256(byte[] pbData, int iOffset, int cbCount)
 		{
-			if (pbData == null) throw new ArgumentNullException("pbData");
+			if(pbData == null) throw new ArgumentNullException("pbData");
 
 #if DEBUG
 			byte[] pbCopy = new byte[pbData.Length];
@@ -88,7 +49,7 @@ namespace KeePassLib.Cryptography
 #endif
 
 			byte[] pbHash;
-			using (SHA256Managed h = new SHA256Managed())
+			using(SHA256Managed h = new SHA256Managed())
 			{
 				pbHash = h.ComputeHash(pbData, iOffset, cbCount);
 			}
@@ -105,22 +66,6 @@ namespace KeePassLib.Cryptography
 			return pbHash;
 		}
 
-		internal static byte[] HashSha256(string strFilePath)
-		{
-			byte[] pbHash = null;
-
-			using (FileStream fs = new FileStream(strFilePath, FileMode.Open,
-				FileAccess.Read, FileShare.Read))
-			{
-				using (SHA256Managed h = new SHA256Managed())
-				{
-					pbHash = h.ComputeHash(fs);
-				}
-			}
-
-			return pbHash;
-		}
-
 		/// <summary>
 		/// Create a cryptographic key of length <paramref name="cbOut" />
 		/// (in bytes) from <paramref name="pbIn" />.
@@ -128,34 +73,34 @@ namespace KeePassLib.Cryptography
 		public static byte[] ResizeKey(byte[] pbIn, int iInOffset,
 			int cbIn, int cbOut)
 		{
-			if (pbIn == null) throw new ArgumentNullException("pbIn");
-			if (cbOut < 0) throw new ArgumentOutOfRangeException("cbOut");
+			if(pbIn == null) throw new ArgumentNullException("pbIn");
+			if(cbOut < 0) throw new ArgumentOutOfRangeException("cbOut");
 
-			if (cbOut == 0) return MemUtil.EmptyByteArray;
+			if(cbOut == 0) return MemUtil.EmptyByteArray;
 
 			byte[] pbHash;
-			if (cbOut <= 32) pbHash = HashSha256(pbIn, iInOffset, cbIn);
+			if(cbOut <= 32) pbHash = HashSha256(pbIn, iInOffset, cbIn);
 			else
 			{
-				using (SHA512Managed h = new SHA512Managed())
+				using(SHA512Managed h = new SHA512Managed())
 				{
 					pbHash = h.ComputeHash(pbIn, iInOffset, cbIn);
 				}
 			}
 
-			if (cbOut == pbHash.Length) return pbHash;
+			if(cbOut == pbHash.Length) return pbHash;
 
 			byte[] pbRet = new byte[cbOut];
-			if (cbOut < pbHash.Length)
+			if(cbOut < pbHash.Length)
 				Array.Copy(pbHash, pbRet, cbOut);
 			else
 			{
 				int iPos = 0;
 				ulong r = 0;
-				while (iPos < cbOut)
+				while(iPos < cbOut)
 				{
 					Debug.Assert(pbHash.Length == 64);
-					using (HMACSHA256 h = new HMACSHA256(pbHash))
+					using(HMACSHA256 h = new HMACSHA256(pbHash))
 					{
 						byte[] pbR = MemUtil.UInt64ToBytes(r);
 						byte[] pbPart = h.ComputeHash(pbR);
@@ -180,75 +125,5 @@ namespace KeePassLib.Cryptography
 			MemUtil.ZeroByteArray(pbHash);
 			return pbRet;
 		}
-
-#if !KeePassUAP
-		private static bool? g_obAesCsp = null;
-		internal static SymmetricAlgorithm CreateAes()
-		{
-			if (g_obAesCsp.HasValue)
-				return (g_obAesCsp.Value ? CreateAesCsp() : new RijndaelManaged());
-
-			SymmetricAlgorithm a = CreateAesCsp();
-			g_obAesCsp = (a != null);
-			return (a ?? new RijndaelManaged());
-		}
-
-		private static SymmetricAlgorithm CreateAesCsp()
-		{
-			try
-			{
-				// On Windows, the CSP implementation is only minimally
-				// faster (and for key derivations it's not used anyway,
-				// as KeePass uses a native implementation based on
-				// CNG/BCrypt, which is much faster)
-				if (!NativeLib.IsUnix()) return null;
-
-				string strFqn = Assembly.CreateQualifiedName(
-					"System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
-					"System.Security.Cryptography.AesCryptoServiceProvider");
-
-				Type t = Type.GetType(strFqn);
-				if (t == null) return null;
-
-				return (Activator.CreateInstance(t) as SymmetricAlgorithm);
-			}
-			catch (Exception) { Debug.Assert(false); }
-
-			return null;
-		}
-#endif
-
-		public static byte[] ProtectData(byte[] pb, byte[] pbOptEntropy,
-			DataProtectionScope s)
-		{
-			return ProtectDataPriv(pb, true, pbOptEntropy, s);
-		}
-
-		public static byte[] UnprotectData(byte[] pb, byte[] pbOptEntropy,
-			DataProtectionScope s)
-		{
-			return ProtectDataPriv(pb, false, pbOptEntropy, s);
-		}
-
-		private static byte[] ProtectDataPriv(byte[] pb, bool bProtect,
-			byte[] pbOptEntropy, DataProtectionScope s)
-		{
-			if (pb == null) throw new ArgumentNullException("pb");
-
-			if ((pbOptEntropy != null) && (pbOptEntropy.Length == 0))
-				pbOptEntropy = null;
-
-			if (CryptoUtil.IsProtectedDataSupported)
-			{
-				if (bProtect)
-					return ProtectedData.Protect(pb, pbOptEntropy, s);
-				return ProtectedData.Unprotect(pb, pbOptEntropy, s);
-			}
-
-			Debug.Assert(false);
-			byte[] pbCopy = new byte[pb.Length];
-			Array.Copy(pb, pbCopy, pb.Length);
-			return pbCopy;
-		}
 	}
 }

src/KeePassLib2Android/Cryptography/KeyDerivation/AesKdf.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
-using keepass2android;
+
 #if KeePassUAP
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Engines;
@@ -144,7 +144,6 @@ namespace KeePassLib.Cryptography.KeyDerivation
 		public static bool TransformKeyManaged(byte[] pbNewKey32, byte[] pbKeySeed32,
 			ulong uNumRounds)
 		{
-		    Kp2aLog.Log("Warning: transforming key managed. Expect this to be slow!");
 #if KeePassUAP
 			KeyParameter kp = new KeyParameter(pbKeySeed32);
 			AesEngine aes = new AesEngine();

src/KeePassLib2Android/Cryptography/KeyDerivation/Argon2Kdf.Core.cs

@@ -46,8 +46,6 @@ namespace KeePassLib.Cryptography.KeyDerivation
 		private const ulong NbBlockSizeInQW = NbBlockSize / 8UL;
 		private const ulong NbSyncPoints = 4;
 
-        private const ulong NbAddressesInBlock = 128;
-
 		private const int NbPreHashDigestLength = 64;
 		private const int NbPreHashSeedLength = NbPreHashDigestLength + 8;
 
@@ -58,7 +56,6 @@ namespace KeePassLib.Cryptography.KeyDerivation
 
 		private sealed class Argon2Ctx
 		{
-            public Argon2Type Type = Argon2Type.D;
 			public uint Version = 0;
 
 			public ulong Lanes = 0;
@@ -92,9 +89,9 @@ namespace KeePassLib.Cryptography.KeyDerivation
 			}
 		}
 
-        private byte[] Argon2Transform(byte[] pbMsg, byte[] pbSalt, uint uParallel,
-            ulong uMem, ulong uIt, int cbOut, uint uVersion, byte[] pbSecretKey,
-            byte[] pbAssocData)
+		private static byte[] Argon2d(byte[] pbMsg, byte[] pbSalt, uint uParallel,
+			ulong uMem, ulong uIt, int cbOut, uint uVersion, byte[] pbSecretKey,
+			byte[] pbAssocData)
 		{
 			pbSecretKey = (pbSecretKey ?? MemUtil.EmptyByteArray);
 			pbAssocData = (pbAssocData ?? MemUtil.EmptyByteArray);
@@ -104,7 +101,6 @@ namespace KeePassLib.Cryptography.KeyDerivation
 #endif
 
 			Argon2Ctx ctx = new Argon2Ctx();
-            ctx.Type = m_t;
 			ctx.Version = uVersion;
 
 			ctx.Lanes = uParallel;
@@ -141,7 +137,7 @@ namespace KeePassLib.Cryptography.KeyDerivation
 			h.TransformBlock(pbBuf, 0, pbBuf.Length, pbBuf, 0);
 			MemUtil.UInt32ToBytesEx(uVersion, pbBuf, 0);
 			h.TransformBlock(pbBuf, 0, pbBuf.Length, pbBuf, 0);
-            MemUtil.UInt32ToBytesEx((uint)m_t, pbBuf, 0);
+			MemUtil.UInt32ToBytesEx(0, pbBuf, 0); // Argon2d type = 0
 			h.TransformBlock(pbBuf, 0, pbBuf.Length, pbBuf, 0);
 			MemUtil.UInt32ToBytesEx((uint)pbMsg.Length, pbBuf, 0);
 			h.TransformBlock(pbBuf, 0, pbBuf.Length, pbBuf, 0);
@@ -491,43 +487,18 @@ namespace KeePassLib.Cryptography.KeyDerivation
 		private static void FillSegmentThr(object o)
 		{
 			Argon2ThreadInfo ti = (o as Argon2ThreadInfo);
-			if (ti == null) { Debug.Assert(false); return; }
+			if(ti == null) { Debug.Assert(false); return; }
 
 			try
 			{
 				Argon2Ctx ctx = ti.Context;
-				if (ctx == null) { Debug.Assert(false); return; }
+				if(ctx == null) { Debug.Assert(false); return; }
 
 				Debug.Assert(ctx.Version >= MinVersion);
 				bool bCanXor = (ctx.Version >= 0x13U);
 
-				ulong[] pbR = new ulong[NbBlockSizeInQW];
-				ulong[] pbTmp = new ulong[NbBlockSizeInQW];
-				ulong[] pbAddrInputZero = null;
-
-				bool bDataIndependentAddr = ((ctx.Type == Argon2Type.ID) &&
-					(ti.Pass == 0) && (ti.Slice < (NbSyncPoints / 2)));
-				if (bDataIndependentAddr)
-				{
-					pbAddrInputZero = new ulong[NbBlockSizeInQW * 3];
-
-					const int iInput = (int)NbBlockSizeInQW;
-					pbAddrInputZero[iInput] = ti.Pass;
-					pbAddrInputZero[iInput + 1] = ti.Lane;
-					pbAddrInputZero[iInput + 2] = ti.Slice;
-					pbAddrInputZero[iInput + 3] = ctx.MemoryBlocks;
-					pbAddrInputZero[iInput + 4] = ctx.TCost;
-					pbAddrInputZero[iInput + 5] = (ulong)ctx.Type;
-				}
-
 				ulong uStart = 0;
-				if ((ti.Pass == 0) && (ti.Slice == 0))
-				{
-					uStart = 2;
-
-					if (bDataIndependentAddr)
-						NextAddresses(pbAddrInputZero, pbR, pbTmp);
-				}
+				if((ti.Pass == 0) && (ti.Slice == 0)) uStart = 2;
 
 				ulong uCur = (ti.Lane * ctx.LaneLength) + (ti.Slice *
 					ctx.SegmentLength) + uStart;
@@ -535,23 +506,17 @@ namespace KeePassLib.Cryptography.KeyDerivation
 				ulong uPrev = (((uCur % ctx.LaneLength) == 0) ?
 					(uCur + ctx.LaneLength - 1UL) : (uCur - 1UL));
 
-				for (ulong i = uStart; i < ctx.SegmentLength; ++i)
+				ulong[] pbR = new ulong[NbBlockSizeInQW];
+				ulong[] pbTmp = new ulong[NbBlockSizeInQW];
+
+				for(ulong i = uStart; i < ctx.SegmentLength; ++i)
 				{
-					if ((uCur % ctx.LaneLength) == 1)
+					if((uCur % ctx.LaneLength) == 1)
 						uPrev = uCur - 1UL;
 
-					ulong uPseudoRand;
-					if (bDataIndependentAddr)
-					{
-						ulong iMod = i % NbAddressesInBlock;
-						if (iMod == 0)
-							NextAddresses(pbAddrInputZero, pbR, pbTmp);
-						uPseudoRand = pbAddrInputZero[iMod];
-					}
-					else uPseudoRand = ctx.Mem[uPrev * NbBlockSizeInQW];
-
+					ulong uPseudoRand = ctx.Mem[uPrev * NbBlockSizeInQW];
 					ulong uRefLane = (uPseudoRand >> 32) % ctx.Lanes;
-					if ((ti.Pass == 0) && (ti.Slice == 0))
+					if((ti.Pass == 0) && (ti.Slice == 0))
 						uRefLane = ti.Lane;
 
 					ti.Index = i;
@@ -571,12 +536,11 @@ namespace KeePassLib.Cryptography.KeyDerivation
 
 				MemUtil.ZeroArray<ulong>(pbR);
 				MemUtil.ZeroArray<ulong>(pbTmp);
-				if (pbAddrInputZero != null) MemUtil.ZeroArray<ulong>(pbAddrInputZero);
 			}
-			catch (Exception) { Debug.Assert(false); }
+			catch(Exception) { Debug.Assert(false); }
 
 			try { ti.Finished.Set(); }
-			catch (Exception) { Debug.Assert(false); }
+			catch(Exception) { Debug.Assert(false); }
 		}
 
 #if ARGON2_B2ROUND_ARRAYS
@@ -646,19 +610,6 @@ namespace KeePassLib.Cryptography.KeyDerivation
 			XorBlock(pMem, uNext, pbR, 0);
 		}
 
-        private static void NextAddresses(ulong[] pbAddrInputZero, ulong[] pbR,
-            ulong[] pbTmp)
-        {
-            // pbAddrInputZero contains an address block, an input block and a zero block
-            const ulong uAddr = 0;
-            const ulong uInput = NbBlockSizeInQW;
-            const ulong uZero = NbBlockSizeInQW * 2;
-
-            ++pbAddrInputZero[uInput + 6];
-            FillBlock(pbAddrInputZero, uZero, uInput, uAddr, false, pbR, pbTmp);
-            FillBlock(pbAddrInputZero, uZero, uAddr, uAddr, false, pbR, pbTmp);
-        }
-
 		private static byte[] FinalHash(Argon2Ctx ctx, int cbOut, Blake2b h)
 		{
 			ulong[] pqBlockHash = new ulong[NbBlockSizeInQW];

src/KeePassLib2Android/Cryptography/KeyDerivation/Argon2Kdf.cs

@@ -20,27 +20,15 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace KeePassLib.Cryptography.KeyDerivation
 {
-    public enum Argon2Type
-    {
-        // The values must be the same as in the Argon2 specification
-        D = 0,
-        ID = 2
-    }
-    public sealed partial class Argon2Kdf : KdfEngine
+	public sealed partial class Argon2Kdf : KdfEngine
 	{
-       
-
-        private static readonly PwUuid g_uuidD = new PwUuid(new byte[] {
-            0xEF, 0x63, 0x6D, 0xDF, 0x8C, 0x29, 0x44, 0x4B,
-            0x91, 0xF7, 0xA9, 0xA4, 0x03, 0xE3, 0x0A, 0x0C });
-        private static readonly PwUuid g_uuidID = new PwUuid(new byte[] {
-            0x9E, 0x29, 0x8B, 0x19, 0x56, 0xDB, 0x47, 0x73,
-            0xB2, 0x3D, 0xFC, 0x3E, 0xC6, 0xF0, 0xA1, 0xE6 });
+		private static readonly PwUuid g_uuid = new PwUuid(new byte[] {
+			0xEF, 0x63, 0x6D, 0xDF, 0x8C, 0x29, 0x44, 0x4B,
+			0x91, 0xF7, 0xA9, 0xA4, 0x03, 0xE3, 0x0A, 0x0C });
 
 		public const string ParamSalt = "S"; // Byte[]
 		public const string ParamParallelism = "P"; // UInt32
@@ -66,37 +54,28 @@ namespace KeePassLib.Cryptography.KeyDerivation
 		internal const uint MinParallelism = 1;
 		internal const uint MaxParallelism = (1 << 24) - 1;
 
-        internal const ulong DefaultIterations = 2;
-        internal const ulong DefaultMemory = 64 * 1024 * 1024; // 64 MB
-        internal const uint DefaultParallelism = 2;
+		internal const ulong DefaultIterations = 2;
+		internal const ulong DefaultMemory = 1024 * 1024; // 1 MB
+		internal const uint DefaultParallelism = 2;
 
-        private readonly Argon2Type m_t;
+		public override PwUuid Uuid
+		{
+			get { return g_uuid; }
+		}
 
-        public override PwUuid Uuid
-        {
-            get { return ((m_t == Argon2Type.D) ? g_uuidD : g_uuidID); }
-        }
+		public override string Name
+		{
+			get { return "Argon2"; }
+		}
 
-        public override string Name
-        {
-            get { return ((m_t == Argon2Type.D) ? "Argon2d" : "Argon2id"); }
-        }
-
-        public Argon2Kdf() : this(Argon2Type.D)
-        {
-        }
-
-        public Argon2Kdf(Argon2Type t)
-        {
-            if ((t != Argon2Type.D) && (t != Argon2Type.ID))
-                throw new NotSupportedException();
-
-            m_t = t;
-        }
         public override byte[] GetSeed(KdfParameters p)
         { return p.GetByteArray(ParamSalt); }
 
-        public override KdfParameters GetDefaultParameters()
+        public Argon2Kdf()
+		{
+		}
+
+		public override KdfParameters GetDefaultParameters()
 		{
 			KdfParameters p = base.GetDefaultParameters();
 
@@ -112,7 +91,7 @@ namespace KeePassLib.Cryptography.KeyDerivation
 		public override void Randomize(KdfParameters p)
 		{
 			if(p == null) { Debug.Assert(false); return; }
-            Debug.Assert(p.KdfUuid.Equals(this.Uuid));
+			Debug.Assert(g_uuid.Equals(p.KdfUuid));
 
 			byte[] pb = CryptoRandom.Instance.GetRandomBytes(32);
 			p.SetByteArray(ParamSalt, pb);
@@ -148,59 +127,10 @@ namespace KeePassLib.Cryptography.KeyDerivation
 			byte[] pbSecretKey = p.GetByteArray(ParamSecretKey);
 			byte[] pbAssocData = p.GetByteArray(ParamAssocData);
 
-            byte[] pbRet;
+			byte[] pbRet = Argon2d(pbMsg, pbSalt, uPar, uMem, uIt,
+				32, v, pbSecretKey, pbAssocData);
 
-			if (m_t == Argon2Type.ID)
-            {
-                 pbRet = Argon2Transform(pbMsg, pbSalt, uPar, uMem,
-                    uIt, 32, v, pbSecretKey, pbAssocData);
-			}
-            else
-            {
-                if (pbSecretKey != null)
-                {
-                    throw new ArgumentOutOfRangeException("Unsupported configuration: non-null pbSecretKey");
-                }
-
-                if (pbAssocData != null)
-                {
-                    throw new ArgumentOutOfRangeException("Unsupported configuration: non-null pbAssocData");
-                }
-
-                /*
-                byte[] pbRet = Argon2d(pbMsg, pbSalt, uPar, uMem, uIt,
-                    32, v, pbSecretKey, pbAssocData);
-                */
-
-                IntPtr msgPtr = Marshal.AllocHGlobal(pbMsg.Length);
-                IntPtr saltPtr = Marshal.AllocHGlobal(pbSalt.Length);
-                IntPtr retPtr = Marshal.AllocHGlobal(32);
-                Marshal.Copy(pbMsg, 0, msgPtr, pbMsg.Length);
-                Marshal.Copy(pbSalt, 0, saltPtr, pbSalt.Length);
-
-                const UInt32 Argon2_d = 0;
-
-                int ret = argon2_hash(
-                    (UInt32)uIt, (UInt32)(uMem / 1024), uPar,
-                    msgPtr, (IntPtr)pbMsg.Length,
-                    saltPtr, (IntPtr)pbSalt.Length,
-                    retPtr, (IntPtr)32,
-                    (IntPtr)0, (IntPtr)0, Argon2_d, v);
-
-                if (ret != 0)
-                {
-                    throw new Exception("argon2_hash failed with " + ret);
-                }
-
-                pbRet = new byte[32];
-                Marshal.Copy(retPtr, pbRet, 0, 32);
-
-                Marshal.FreeHGlobal(msgPtr);
-                Marshal.FreeHGlobal(saltPtr);
-                Marshal.FreeHGlobal(retPtr);
-			}
-
-            if(uMem > (100UL * 1024UL * 1024UL)) GC.Collect();
+			if(uMem > (100UL * 1024UL * 1024UL)) GC.Collect();
 			return pbRet;
 		}
 
@@ -213,14 +143,5 @@ namespace KeePassLib.Cryptography.KeyDerivation
 				MaxIterations, uMilliseconds, true);
 			return p;
 		}
-
-		[DllImport("argon2")]
-		static extern int argon2_hash(
-				UInt32 t_cost, UInt32 m_cost, UInt32 parallelism,
-				IntPtr pwd, IntPtr pwdlen,
-				IntPtr salt, IntPtr saltlen,
-				IntPtr hash, IntPtr hashlen,
-				IntPtr encoded, IntPtr encodedlen,
-				UInt32 type, UInt32 version);
 	}
 }

src/KeePassLib2Android/Cryptography/KeyDerivation/KdfParameters.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

src/KeePassLib2Android/Cryptography/KeyDerivation/KdfPool.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,11 +41,10 @@ namespace KeePassLib.Cryptography.KeyDerivation
 
 		private static void EnsureInitialized()
 		{
-			if(g_l.Count != 0) return;
+			if(g_l.Count > 0) return;
 
 			g_l.Add(new AesKdf());
-			g_l.Add(new Argon2Kdf(Argon2Type.D));
-			g_l.Add(new Argon2Kdf(Argon2Type.ID));
+			g_l.Add(new Argon2Kdf());
 		}
 
 		internal static KdfParameters GetDefaultParameters()

src/KeePassLib2Android/Interfaces/IStructureItem.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,22 +21,17 @@ using System;
 
 namespace KeePassLib.Interfaces
 {
-    public interface IStructureItem : ITimeLogger // Provides LocationChanged
-    {
-        PwUuid Uuid
-        {
-            get;
-            set;
-        }
+	public interface IStructureItem : ITimeLogger // Provides LocationChanged
+	{
+		PwUuid Uuid
+		{
+			get;
+			set;
+		}
 
-        PwGroup ParentGroup
-        {
-            get;
-        }
-
-        PwUuid PreviousParentGroup
-        {
-            get;
-        }
-    }
-}
+		PwGroup ParentGroup
+		{
+			get;
+		}
+	}
+}

src/KeePassLib2Android/KeePassLib2Android.csproj

@@ -12,8 +12,8 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AssemblyName>KeePassLib2Android</AssemblyName>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <NuGetPackageImportStamp>8482b288</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -50,7 +50,6 @@
       <HintPath>..\ProtoBuf\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
@@ -72,9 +71,7 @@
     <Compile Include="Cryptography\KeyDerivation\KdfParameters.cs" />
     <Compile Include="Cryptography\KeyDerivation\KdfPool.cs" />
     <Compile Include="IDatabaseFormat.cs" />
-    <Compile Include="Keys\KcpKeyFile.Xml.cs" />
     <Compile Include="Kp2aLog.cs" />
-    <Compile Include="PwGroup.Search.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Resources\KLRes.Generated.cs" />
     <Compile Include="Resources\KSRes.Generated.cs" />
@@ -163,7 +160,6 @@
     <Compile Include="Utility\UrlUtil.cs" />
     <Compile Include="Utility\TimeUtil.cs" />
     <Compile Include="Delegates\Handlers.cs" />
-    <Compile Include="Utility\XmlUtilEx.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/KeePassLib2Android/Keys/IUserKey.cs

@@ -38,11 +38,9 @@ namespace KeePassLib.Keys
 			get;
 		}
 
-        // /// <summary>
-        // /// Clear the key and securely erase all security-critical information.
-        // /// </summary>
-        // void Clear();
-
-        uint GetMinKdbxVersion();
+		// /// <summary>
+		// /// Clear the key and securely erase all security-critical information.
+		// /// </summary>
+		// void Clear();
 	}
 }

src/KeePassLib2Android/Keys/KcpCustomKey.cs

@@ -45,12 +45,7 @@ namespace KeePassLib.Keys
 			get { return m_pbKey; }
 		}
 
-	    public uint GetMinKdbxVersion()
-	    {
-	        return 0;
-	    }
-
-	    public KcpCustomKey(string strName, byte[] pbKeyData, bool bPerformHash)
+		public KcpCustomKey(string strName, byte[] pbKeyData, bool bPerformHash)
 		{
 			Debug.Assert(strName != null); if(strName == null) throw new ArgumentNullException("strName");
 			Debug.Assert(pbKeyData != null); if(pbKeyData == null) throw new ArgumentNullException("pbKeyData");

src/KeePassLib2Android/Keys/KcpKeyFile.Xml.cs

@@ -1,281 +0,0 @@
-/*
-  KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-using KeePassLib.Cryptography;
-using KeePassLib.Resources;
-using KeePassLib.Serialization;
-using KeePassLib.Utility;
-
-namespace KeePassLib.Keys
-{
-	[XmlType("KeyFile")]
-	public sealed class KfxFile
-	{
-		private const ulong KfxVersionCriticalMask = 0xFFFF000000000000UL;
-		private const int KfxDataHashLength = 4;
-
-		private KfxMeta m_meta = new KfxMeta();
-		public KfxMeta Meta
-		{
-			get { return m_meta; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_meta = value;
-			}
-		}
-
-		private KfxKey m_key = new KfxKey();
-		public KfxKey Key
-		{
-			get { return m_key; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_key = value;
-			}
-		}
-
-		public static KfxFile Create(ulong uVersion, byte[] pbKey, byte[] pbHash)
-		{
-			if(pbKey == null) throw new ArgumentNullException("pbKey");
-			if(pbKey.Length == 0) throw new ArgumentOutOfRangeException("pbKey");
-
-			if(uVersion == 0) uVersion = 0x0002000000000000;
-
-			// Null hash: generate one, empty hash: store no hash
-			if(pbHash == null) pbHash = HashData(pbKey);
-			VerifyHash(pbKey, pbHash);
-
-			KfxFile kf = new KfxFile();
-
-			if(uVersion == 0x0001000000000000)
-				kf.Meta.Version = "1.00"; // KeePass <= 2.46 used two zeros
-			else kf.Meta.Version = StrUtil.VersionToString(uVersion, 2);
-
-			if(uVersion == 0x0001000000000000)
-				kf.Key.Data.Value = Convert.ToBase64String(pbKey);
-			else if(uVersion == 0x0002000000000000)
-			{
-				kf.Key.Data.Value = FormatKeyHex(pbKey, 3);
-
-				if(pbHash.Length != 0)
-					kf.Key.Data.Hash = MemUtil.ByteArrayToHexString(pbHash);
-			}
-			else throw new NotSupportedException(KLRes.FileVersionUnsupported);
-
-			return kf;
-		}
-
-		internal static KfxFile Create(ulong uVersion, string strKey, string strHash)
-		{
-			byte[] pbKey = ParseKey(uVersion, strKey);
-			byte[] pbHash = ((strHash != null) ? ParseHash(strHash) : null);
-
-			return Create(uVersion, pbKey, pbHash);
-		}
-
-		internal static bool CanLoad(string strFilePath)
-		{
-			if(string.IsNullOrEmpty(strFilePath)) { Debug.Assert(false); return false; }
-
-			try
-			{
-				IOConnectionInfo ioc = IOConnectionInfo.FromPath(strFilePath);
-				using(Stream s = IOConnection.OpenRead(ioc))
-				{
-					return (Load(s) != null);
-				}
-			}
-			catch(Exception) { }
-
-			return false;
-		}
-
-		public static KfxFile Load(Stream s)
-		{
-			return XmlUtilEx.Deserialize<KfxFile>(s);
-		}
-
-		public void Save(Stream s)
-		{
-			XmlUtilEx.Serialize<KfxFile>(s, this, true);
-		}
-
-		private static string FormatKeyHex(byte[] pb, int cTabs)
-		{
-			StringBuilder sb = new StringBuilder();
-			string str = MemUtil.ByteArrayToHexString(pb);
-
-			for(int i = 0; i < str.Length; ++i)
-			{
-				if((i & 0x1F) == 0)
-				{
-					sb.AppendLine();
-					sb.Append('\t', cTabs);
-				}
-				else if((i & 0x07) == 0) sb.Append(' ');
-
-				sb.Append(str[i]);
-			}
-
-			sb.AppendLine();
-			if(cTabs > 0) sb.Append('\t', cTabs - 1);
-			return sb.ToString();
-		}
-
-		private ulong GetVersion()
-		{
-			string str = m_meta.Version;
-			if(string.IsNullOrEmpty(str)) return 0;
-
-			return StrUtil.ParseVersion(str);
-		}
-
-		public byte[] GetKey()
-		{
-			ulong uVersion = GetVersion();
-
-			byte[] pbKey = ParseKey(uVersion, m_key.Data.Value);
-			if((pbKey == null) || (pbKey.Length == 0))
-				throw new FormatException(KLRes.FileCorrupted);
-
-			byte[] pbHash = ParseHash(m_key.Data.Hash);
-			VerifyHash(pbKey, pbHash);
-
-			return pbKey;
-		}
-
-		private static byte[] HashData(byte[] pb)
-		{
-			return MemUtil.Mid(CryptoUtil.HashSha256(pb), 0, KfxDataHashLength);
-		}
-
-		private static void VerifyHash(byte[] pbKey, byte[] pbHash)
-		{
-			// The hash is optional; empty hash means success
-			if((pbHash == null) || (pbHash.Length == 0)) return;
-
-			byte[] pbHashCmp = HashData(pbKey);
-			if(!MemUtil.ArraysEqual(pbHash, pbHashCmp))
-				throw new Exception("Keyfile hash mismatch!");
-		}
-
-		private static byte[] ParseKey(ulong uVersion, string strKey)
-		{
-			if(strKey == null) throw new ArgumentNullException("strKey");
-
-			strKey = StrUtil.RemoveWhiteSpace(strKey);
-			if(string.IsNullOrEmpty(strKey)) return MemUtil.EmptyByteArray;
-
-			uVersion &= KfxVersionCriticalMask;
-
-			byte[] pbKey;
-			if(uVersion == 0x0001000000000000)
-				pbKey = Convert.FromBase64String(strKey);
-			else if(uVersion == 0x0002000000000000)
-				pbKey = ParseHex(strKey);
-			else throw new NotSupportedException(KLRes.FileVersionUnsupported);
-
-			return pbKey;
-		}
-
-		private static byte[] ParseHash(string strHash)
-		{
-			return ParseHex(strHash);
-		}
-
-		private static byte[] ParseHex(string str)
-		{
-			if(str == null) throw new ArgumentNullException("str");
-			if(str.Length == 0) return MemUtil.EmptyByteArray;
-
-			if(((str.Length & 1) != 0) || !StrUtil.IsHexString(str, true))
-				throw new FormatException();
-
-			return MemUtil.HexStringToByteArray(str);
-		}
-	}
-
-	public sealed class KfxMeta
-	{
-		private string m_strVersion = string.Empty;
-		[DefaultValue("")]
-		public string Version
-		{
-			get { return m_strVersion; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_strVersion = value;
-			}
-		}
-	}
-
-	public sealed class KfxKey
-	{
-		private KfxData m_data = new KfxData();
-		public KfxData Data
-		{
-			get { return m_data; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_data = value;
-			}
-		}
-	}
-
-	public sealed class KfxData
-	{
-		private string m_strHash = string.Empty;
-		[DefaultValue("")]
-		[XmlAttribute("Hash")]
-		public string Hash
-		{
-			get { return m_strHash; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_strHash = value;
-			}
-		}
-
-		private string m_strValue = string.Empty;
-		[DefaultValue("")]
-		[XmlText]
-		public string Value
-		{
-			get { return m_strValue; }
-			set
-			{
-				if(value == null) throw new ArgumentNullException("value");
-				m_strValue = value;
-			}
-		}
-	}
-}

src/KeePassLib2Android/Keys/KcpKeyFile.cs

@@ -64,12 +64,7 @@ namespace KeePassLib.Keys
 			get { return m_pbKeyData; }
 		}
 
-	    public uint GetMinKdbxVersion()
-	    {
-	        return 0;
-	    }
-
-	    public IOConnectionInfo Ioc
+		public IOConnectionInfo Ioc
 		{
 			get { return m_ioc; }
 		}
@@ -127,9 +122,10 @@ namespace KeePassLib.Keys
 #endif
 			}
 
-            byte[] pbKey = LoadKeyFile(pbFileData);
+			byte[] pbKey = LoadXmlKeyFile(pbFileData);
+			if(pbKey == null) pbKey = LoadKeyFile(pbFileData);
 
-			if (pbKey == null) throw new InvalidOperationException();
+			if(pbKey == null) throw new InvalidOperationException();
 
 			m_ioc = iocKeyFile;
 			m_pbKeyData = new ProtectedBinary(true, pbKey);
@@ -149,60 +145,54 @@ namespace KeePassLib.Keys
 		// }
 
 
-        private static byte[] LoadKeyFile(byte[] pbFileData)
-        {
-            if (pbFileData == null) throw new ArgumentNullException("pbFileData");
+		private static byte[] LoadKeyFile(byte[] pbFileData)
+		{
+			if(pbFileData == null) { Debug.Assert(false); return null; }
 
-            byte[] pbKey = LoadKeyFileXml(pbFileData);
-            if (pbKey != null) return pbKey;
+			int iLength = pbFileData.Length;
 
-            int cb = pbFileData.Length;
-            if (cb == 32) return pbFileData;
+			byte[] pbKey = null;
+			if(iLength == 32) pbKey = LoadBinaryKey32(pbFileData);
+			else if(iLength == 64) pbKey = LoadHexKey32(pbFileData);
 
-            if (cb == 64)
-            {
-                pbKey = LoadKeyFileHex(pbFileData);
-                if (pbKey != null) return pbKey;
-            }
+			if(pbKey == null)
+				pbKey = CryptoUtil.HashSha256(pbFileData);
 
-            return CryptoUtil.HashSha256(pbFileData);
-        }
+			return pbKey;
+		}
 
-        private static byte[] LoadKeyFileXml(byte[] pbFileData)
-        {
-            KfxFile kf;
-            try
-            {
-                using (MemoryStream ms = new MemoryStream(pbFileData, false))
-                {
-                    kf = KfxFile.Load(ms);
-                }
-            }
-            catch (Exception) { return null; }
+		private static byte[] LoadBinaryKey32(byte[] pbFileData)
+		{
+			if(pbFileData == null) { Debug.Assert(false); return null; }
+			if(pbFileData.Length != 32) { Debug.Assert(false); return null; }
 
-            // We have a syntactically valid XML key file;
-            // failing to verify the key should throw an exception
-            return ((kf != null) ? kf.GetKey() : null);
-        }
+			return pbFileData;
+		}
 
-        private static byte[] LoadKeyFileHex(byte[] pbFileData)
-        {
-            if (pbFileData == null) { Debug.Assert(false); return null; }
+		private static byte[] LoadHexKey32(byte[] pbFileData)
+		{
+			if(pbFileData == null) { Debug.Assert(false); return null; }
+			if(pbFileData.Length != 64) { Debug.Assert(false); return null; }
 
-            try
-            {
-                int cc = pbFileData.Length;
-                if ((cc & 1) != 0) { Debug.Assert(false); return null; }
+			try
+			{
+				if(!StrUtil.IsHexString(pbFileData, true)) return null;
 
-                if (!StrUtil.IsHexString(pbFileData, true)) return null;
+				string strHex = StrUtil.Utf8.GetString(pbFileData);
+				byte[] pbKey = MemUtil.HexStringToByteArray(strHex);
+				if((pbKey == null) || (pbKey.Length != 32))
+				{
+					Debug.Assert(false);
+					return null;
+				}
 
-                string strHex = StrUtil.Utf8.GetString(pbFileData);
-                return MemUtil.HexStringToByteArray(strHex);
-            }
-            catch (Exception) { Debug.Assert(false); }
+				return pbKey;
+			}
+			catch(Exception) { Debug.Assert(false); }
+
+			return null;
+		}
 
-            return null;
-        }
 		/// <summary>
 		/// Create a new, random key-file.
 		/// </summary>

src/KeePassLib2Android/Keys/KcpPassword.cs

@@ -53,12 +53,7 @@ namespace KeePassLib.Keys
 			get { return m_pbKeyData; }
 		}
 
-	    public uint GetMinKdbxVersion()
-	    {
-	        return 0;
-	    }
-
-	    public KcpPassword(byte[] pbPasswordUtf8)
+		public KcpPassword(byte[] pbPasswordUtf8)
 		{
 			SetKey(pbPasswordUtf8);
 		}

src/KeePassLib2Android/Keys/KcpUserAccount.cs

@@ -21,6 +21,7 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Security;
 
 #if !KeePassUAP
@@ -59,12 +60,7 @@ namespace KeePassLib.Keys
 			get { return m_pbKeyData; }
 		}
 
-	    public uint GetMinKdbxVersion()
-	    {
-	        return 0;
-	    }
-
-	    /// <summary>
+		/// <summary>
 		/// Construct a user account key.
 		/// </summary>
 		public KcpUserAccount()
@@ -77,7 +73,26 @@ namespace KeePassLib.Keys
 		//	m_pbKeyData = null;
 		// }
 
-	    private static byte[] LoadUserKey(bool bShowWarning)
+		private static string GetUserKeyFilePath(bool bCreate)
+		{
+#if KeePassRT
+			string strUserDir = Windows.Storage.ApplicationData.Current.RoamingFolder.Path;
+#else
+			string strUserDir = Environment.GetFolderPath(
+				Environment.SpecialFolder.ApplicationData);
+#endif
+
+			strUserDir = UrlUtil.EnsureTerminatingSeparator(strUserDir, false);
+			strUserDir += PwDefs.ShortProductName;
+
+			if (bCreate && !Directory.Exists(strUserDir))
+				Directory.CreateDirectory(strUserDir);
+
+			strUserDir = UrlUtil.EnsureTerminatingSeparator(strUserDir, false);
+			return strUserDir + UserKeyFileName;
+		}
+
+		private static byte[] LoadUserKey(bool bShowWarning)
 		{
 			byte[] pbKey = null;
 

src/KeePassLib2Android/Kp2aLog.cs

@@ -58,12 +58,12 @@ namespace keepass2android
 
 		}
 
-		public static string LogFilename
+		private static string LogFilename
 		{
 			get { return Application.Context.FilesDir.CanonicalPath +"/keepass2android.log"; }
 		}
 
-		public static bool LogToFile
+		private static bool LogToFile
 		{
 			get
 			{
@@ -85,8 +85,8 @@ namespace keepass2android
 		{
 			if (!File.Exists(LogFilename))
 			{
-				File.Create(LogFilename).Dispose();
-                _logToFile = true;
+				File.Create(LogFilename);
+				_logToFile = true;
 			}
 			
 
@@ -100,7 +100,8 @@ namespace keepass2android
 				int count = 0;
 				while (File.Exists(LogFilename + "." + count))
 					count++;
-                File.Move(LogFilename, LogFilename + "." + count);
+                if (count > 0)
+				    File.Move(LogFilename, LogFilename + "." + count);
 				
 			}
 				
@@ -118,10 +119,5 @@ namespace keepass2android
 			sendIntent.SetType("text/plain");
 			ctx.StartActivity(Intent.CreateChooser(sendIntent, "Send log to..."));
 		}
-
-        public static void LogTask(object task, string activityName)
-        {
-			Log($"Task in activity {activityName} changed to {task?.GetType()?.Name ?? "null"}");
-        }
-    }
+	}
 }

src/KeePassLib2Android/Native/NativeLib.cs

@@ -302,7 +302,7 @@ namespace KeePassLib.Native
 			}
 			catch (Exception e)
 			{
-				Kp2aLog.Log(e.ToString());
+				Kp2aLog.Log(e.Message);
 				return false;
 			}
 

src/KeePassLib2Android/PwCustomIcon.cs

@@ -1,6 +1,8 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de>
+  
+  Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,106 +20,61 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-
-#if !KeePassUAP
 using System.Drawing;
-#endif
+using System.IO;
 
 using KeePassLib.Utility;
 
+
 namespace KeePassLib
 {
+
+	/// <summary>
+	/// Custom icon. <c>PwCustomIcon</c> objects are immutable.
+	/// </summary>
 	public sealed class PwCustomIcon
 	{
-		// Recommended maximum sizes, not obligatory
-		internal const int MaxWidth = 128;
-		internal const int MaxHeight = 128;
-
-		private readonly PwUuid m_uuid;
-		private readonly byte[] m_pbImageDataPng;
-
-		private string m_strName = string.Empty;
-		private DateTime? m_odtLastMod = null;
-
-		private Dictionary<long, Android.Graphics.Bitmap> m_dImageCache = new Dictionary<long, Android.Graphics.Bitmap>();
+		private PwUuid m_pwUuid;
+		private byte[] m_pbImageDataPng;
+		private Android.Graphics.Bitmap m_pCachedImage;
 
 		public PwUuid Uuid
 		{
-			get { return m_uuid; }
+			get { return m_pwUuid; }
 		}
 
 		public byte[] ImageDataPng
 		{
 			get { return m_pbImageDataPng; }
-			// When allowing 'set', do not copy the cache in 'Clone'
 		}
 
-		public string Name
-		{
-			get { return m_strName; }
-			set
-			{
-				if (value == null) throw new ArgumentNullException("value");
-				m_strName = value;
-			}
-		}
-
-		public DateTime? LastModificationTime
-		{
-			get { return m_odtLastMod; }
-			set { m_odtLastMod = value; }
-		}
-
-		[Obsolete("Use GetImage instead.")]
 		public Android.Graphics.Bitmap Image
 		{
-			get { return GetImage(); } // Backward compatibility
-        }
+			get { return m_pCachedImage; }
+		}
 
-		public PwCustomIcon(PwUuid pu, byte[] pbImageDataPng)
+		public PwCustomIcon(PwUuid pwUuid, byte[] pbImageDataPng)
 		{
-			if (pu == null) { Debug.Assert(false); throw new ArgumentNullException("pu"); }
-			if (pu.Equals(PwUuid.Zero)) { Debug.Assert(false); throw new ArgumentOutOfRangeException("pu"); }
-			if (pbImageDataPng == null) { Debug.Assert(false); throw new ArgumentNullException("pbImageDataPng"); }
+			Debug.Assert(pwUuid != null);
+			if(pwUuid == null) throw new ArgumentNullException("pwUuid");
+			Debug.Assert(!pwUuid.Equals(PwUuid.Zero));
+			if(pwUuid.Equals(PwUuid.Zero)) throw new ArgumentException("pwUuid == 0");
 
-			m_uuid = pu;
+			Debug.Assert(pbImageDataPng != null);
+			if(pbImageDataPng == null) throw new ArgumentNullException("pbImageDataPng");
+
+			m_pwUuid = pwUuid;
 			m_pbImageDataPng = pbImageDataPng;
-		}
 
-		private static long GetKey(int w, int h)
-		{
-			return (((long)w << 32) ^ (long)h);
-		}
-
-		/// <summary>
-		/// Get the icon as an <c>Image</c> (original size).
-		/// </summary>
-		public Android.Graphics.Bitmap GetImage()
-		{
-			const long lKey = -1;
-
-            Android.Graphics.Bitmap img;
-			if (m_dImageCache.TryGetValue(lKey, out img)) return img;
-
-			try { img = GfxUtil.LoadImage(m_pbImageDataPng); }
-			catch (Exception) { Debug.Assert(false); }
-
-			m_dImageCache[lKey] = img;
-			return img;
-		}
-
-		internal PwCustomIcon Clone()
-		{
-			PwCustomIcon ico = new PwCustomIcon(m_uuid, m_pbImageDataPng);
-
-			ico.m_strName = m_strName;
-			ico.m_odtLastMod = m_odtLastMod;
-
-			ico.m_dImageCache = m_dImageCache; // Same image data
-
-			return ico;
+#if !KeePassLibSD
+			// MemoryStream ms = new MemoryStream(m_pbImageDataPng, false);
+			// m_pCachedImage = Image.FromStream(ms);
+			// ms.Close();
+			m_pCachedImage = GfxUtil.LoadImage(m_pbImageDataPng);
+#else
+			m_pCachedImage = null;
+#endif
 		}
 	}
 }

src/KeePassLib2Android/PwDatabase.cs

@@ -97,7 +97,7 @@ namespace KeePassLib
 		private int m_nHistoryMaxItems = DefaultHistoryMaxItems;
 		private long m_lHistoryMaxSize = DefaultHistoryMaxSize; // In bytes
 
-		private StringDictionaryEx m_dCustomData = new StringDictionaryEx(true);
+		private StringDictionaryEx m_dCustomData = new StringDictionaryEx();
 		private VariantDictionary m_dPublicCustomData = new VariantDictionary();
 
 		private byte[] m_pbHashOfFileOnDisk = null;
@@ -485,6 +485,12 @@ namespace KeePassLib
 			set { m_pbHashOfLastIO = value; }
 		}
 
+		public bool UseFileTransactions
+		{
+			get { return m_bUseFileTransactions; }
+			set { m_bUseFileTransactions = value; }
+		}
+
 		public bool UseFileLocks
 		{
 			get { return m_bUseFileLocks; }
@@ -587,7 +593,7 @@ namespace KeePassLib
 		/// </summary>
 		/// <param name="ioConnection">IO connection of the new database.</param>
 		/// <param name="pwKey">Key to open the database.</param>
-		public void New(IOConnectionInfo ioConnection, CompositeKey pwKey, string filenameWithoutPathAndExt)
+		public void New(IOConnectionInfo ioConnection, CompositeKey pwKey)
 		{
 			Debug.Assert(ioConnection != null);
 			if(ioConnection == null) throw new ArgumentNullException("ioConnection");
@@ -602,11 +608,26 @@ namespace KeePassLib
 			m_bDatabaseOpened = true;
 			m_bModified = true;
 
-			m_pgRootGroup = new PwGroup(true, true, filenameWithoutPathAndExt,
+			m_pgRootGroup = new PwGroup(true, true,
+				UrlUtil.StripExtension(UrlUtil.GetFileName(ioConnection.Path)),
 				PwIcon.FolderOpen);
 			m_pgRootGroup.IsExpanded = true;
 		}
 
+		/// <summary>
+		/// Open a database. The URL may point to any supported data source.
+		/// </summary>
+		/// <param name="ioSource">IO connection to load the database from.</param>
+		/// <param name="pwKey">Key used to open the specified database.</param>
+		/// <param name="slLogger">Logger, which gets all status messages.</param>
+		public void Open(IOConnectionInfo ioSource, CompositeKey pwKey,
+			IStatusLogger slLogger, IDatabaseFormat format)
+
+		{
+			Open(IOConnection.OpenRead(ioSource), UrlUtil.StripExtension(
+					UrlUtil.GetFileName(ioSource.Path)), ioSource, pwKey, slLogger, format);
+
+		}
 
 		/// <summary>
 		/// Open a database. The URL may point to any supported data source.
@@ -654,7 +675,37 @@ namespace KeePassLib
 				throw;
 			}
 		}
-        
+
+		/// <summary>
+		/// Save the currently opened database. The file is written to the location
+		/// it has been opened from.
+		/// </summary>
+		/// <param name="slLogger">Logger that recieves status information.</param>
+		public void Save(IStatusLogger slLogger)
+		{
+			Debug.Assert(!HasDuplicateUuids());
+
+			FileLock fl = null;
+			if(m_bUseFileLocks) fl = new FileLock(m_ioSource);
+			try
+			{
+				FileTransactionEx ft = new FileTransactionEx(m_ioSource,
+					m_bUseFileTransactions);
+				Stream s = ft.OpenWrite();
+
+				KdbxFile kdb = new KdbxFile(this);
+				kdb.Save(s, null, KdbpFile.GetFormatToUse(m_ioSource), slLogger);
+
+				ft.CommitWrite();
+
+				m_pbHashOfLastIO = kdb.HashOfFileOnDisk;
+				m_pbHashOfFileOnDisk = kdb.HashOfFileOnDisk;
+				Debug.Assert(m_pbHashOfFileOnDisk != null);
+			}
+			finally { if(fl != null) fl.Dispose(); }
+
+			m_bModified = false;
+		}
 
 		/// <summary>
 		/// Save the currently opened database. The file is written to the given stream which is expected to be the original location.
@@ -672,6 +723,46 @@ namespace KeePassLib
 			m_bModified = false;
 		}
 
+		/// <summary>
+		/// Save the currently opened database to a different location. If
+		/// <paramref name="bIsPrimaryNow" /> is <c>true</c>, the specified
+		/// location is made the default location for future saves
+		/// using <c>SaveDatabase</c>.
+		/// </summary>
+		/// <param name="ioConnection">New location to serialize the database to.</param>
+		/// <param name="bIsPrimaryNow">If <c>true</c>, the new location is made the
+		/// standard location for the database. If <c>false</c>, a copy of the currently
+		/// opened database is saved to the specified location, but it isn't
+		/// made the default location (i.e. no lock files will be moved for
+		/// example).</param>
+		/// <param name="slLogger">Logger that recieves status information.</param>
+		public void SaveAs(IOConnectionInfo ioConnection, bool bIsPrimaryNow,
+			IStatusLogger slLogger)
+		{
+			Debug.Assert(ioConnection != null);
+			if(ioConnection == null) throw new ArgumentNullException("ioConnection");
+
+			IOConnectionInfo ioCurrent = m_ioSource; // Remember current
+			m_ioSource = ioConnection;
+
+			byte[] pbHashCopy = m_pbHashOfFileOnDisk;
+
+			try { this.Save(slLogger); }
+			catch(Exception)
+			{
+				m_ioSource = ioCurrent; // Restore
+				m_pbHashOfFileOnDisk = pbHashCopy;
+
+				m_pbHashOfLastIO = null;
+				throw;
+			}
+
+			if(!bIsPrimaryNow)
+			{
+				m_ioSource = ioCurrent; // Restore
+				m_pbHashOfFileOnDisk = pbHashCopy;
+			}
+		}
 
 		/// <summary>
 		/// Closes the currently opened database. No confirmation message is shown
@@ -690,9 +781,9 @@ namespace KeePassLib
 		public void MergeIn(PwDatabase pdSource, PwMergeMethod mm,
 			IStatusLogger slStatus)
 		{
-			if (pdSource == null) throw new ArgumentNullException("pdSource");
+			if(pdSource == null) throw new ArgumentNullException("pdSource");
 
-			if (mm == PwMergeMethod.CreateNewUuids)
+			if(mm == PwMergeMethod.CreateNewUuids)
 			{
 				pdSource.RootGroup.Uuid = new PwUuid(true);
 				pdSource.RootGroup.CreateNewItemUuids(true, true, true);
@@ -707,7 +798,7 @@ namespace KeePassLib
 			PwObjectPoolEx ppOrg = PwObjectPoolEx.FromGroup(m_pgRootGroup);
 			PwObjectPoolEx ppSrc = PwObjectPoolEx.FromGroup(pdSource.RootGroup);
 
-			GroupHandler ghSrc = delegate (PwGroup pg)
+			GroupHandler ghSrc = delegate(PwGroup pg)
 			{
 				// if(pg == pdSource.m_pgRootGroup) return true;
 
@@ -716,11 +807,11 @@ namespace KeePassLib
 				// pool should not be modified)
 				PwGroup pgLocal = m_pgRootGroup.FindGroup(pg.Uuid, true);
 
-				if (pgLocal == null)
+				if(pgLocal == null)
 				{
 					PwGroup pgSourceParent = pg.ParentGroup;
 					PwGroup pgLocalContainer;
-					if (pgSourceParent == null)
+					if(pgSourceParent == null)
 					{
 						// pg is the root group of pdSource, and no corresponding
 						// local group was found; create the group within the
@@ -728,23 +819,17 @@ namespace KeePassLib
 						Debug.Assert(pg == pdSource.m_pgRootGroup);
 						pgLocalContainer = m_pgRootGroup;
 					}
-					else if (pgSourceParent == pdSource.m_pgRootGroup)
+					else if(pgSourceParent == pdSource.m_pgRootGroup)
 						pgLocalContainer = m_pgRootGroup;
 					else
 						pgLocalContainer = m_pgRootGroup.FindGroup(pgSourceParent.Uuid, true);
 					Debug.Assert(pgLocalContainer != null);
-					if (pgLocalContainer == null) pgLocalContainer = m_pgRootGroup;
+					if(pgLocalContainer == null) pgLocalContainer = m_pgRootGroup;
 
 					PwGroup pgNew = new PwGroup(false, false);
 					pgNew.Uuid = pg.Uuid;
 					pgNew.AssignProperties(pg, false, true);
 
-					if (!pgLocalContainer.CanAddGroup(pgNew))
-					{
-						Debug.Assert(false);
-						pgLocalContainer = m_pgRootGroup;
-						pgLocalContainer.CheckCanAddGroup(pgNew);
-					}
 					// pgLocalContainer.AddGroup(pgNew, true);
 					InsertObjectAtBestPos<PwGroup>(pgLocalContainer.Groups, pgNew, ppSrc);
 					pgNew.ParentGroup = pgLocalContainer;
@@ -753,9 +838,9 @@ namespace KeePassLib
 				{
 					Debug.Assert(mm != PwMergeMethod.CreateNewUuids);
 
-					if (mm == PwMergeMethod.OverwriteExisting)
+					if(mm == PwMergeMethod.OverwriteExisting)
 						pgLocal.AssignProperties(pg, false, false);
-					else if ((mm == PwMergeMethod.OverwriteIfNewer) ||
+					else if((mm == PwMergeMethod.OverwriteIfNewer) ||
 						(mm == PwMergeMethod.Synchronize))
 					{
 						pgLocal.AssignProperties(pg, true, false);
@@ -766,23 +851,23 @@ namespace KeePassLib
 				return ((slStatus != null) ? slStatus.ContinueWork() : true);
 			};
 
-			EntryHandler ehSrc = delegate (PwEntry pe)
+			EntryHandler ehSrc = delegate(PwEntry pe)
 			{
 				// PwEntry peLocal = m_pgRootGroup.FindEntry(pe.Uuid, true);
 				PwEntry peLocal = (ppOrg.GetItemByUuid(pe.Uuid) as PwEntry);
 				Debug.Assert(object.ReferenceEquals(peLocal,
 					m_pgRootGroup.FindEntry(pe.Uuid, true)));
 
-				if (peLocal == null)
+				if(peLocal == null)
 				{
 					PwGroup pgSourceParent = pe.ParentGroup;
 					PwGroup pgLocalContainer;
-					if (pgSourceParent == pdSource.m_pgRootGroup)
+					if(pgSourceParent == pdSource.m_pgRootGroup)
 						pgLocalContainer = m_pgRootGroup;
 					else
 						pgLocalContainer = m_pgRootGroup.FindGroup(pgSourceParent.Uuid, true);
 					Debug.Assert(pgLocalContainer != null);
-					if (pgLocalContainer == null) pgLocalContainer = m_pgRootGroup;
+					if(pgLocalContainer == null) pgLocalContainer = m_pgRootGroup;
 
 					PwEntry peNew = new PwEntry(false, false);
 					peNew.Uuid = pe.Uuid;
@@ -802,19 +887,19 @@ namespace KeePassLib
 					bool bEquals = peLocal.EqualsEntry(pe, cmpOpt, MemProtCmpMode.None);
 
 					bool bOrgBackup = !bEquals;
-					if (mm != PwMergeMethod.OverwriteExisting)
+					if(mm != PwMergeMethod.OverwriteExisting)
 						bOrgBackup &= (TimeUtil.CompareLastMod(pe, peLocal, true) > 0);
 					bOrgBackup &= !pe.HasBackupOfData(peLocal, false, true);
-					if (bOrgBackup) peLocal.CreateBackup(null); // Maintain at end
+					if(bOrgBackup) peLocal.CreateBackup(null); // Maintain at end
 
 					bool bSrcBackup = !bEquals && (mm != PwMergeMethod.OverwriteExisting);
 					bSrcBackup &= (TimeUtil.CompareLastMod(peLocal, pe, true) > 0);
 					bSrcBackup &= !peLocal.HasBackupOfData(pe, false, true);
-					if (bSrcBackup) pe.CreateBackup(null); // Maintain at end
+					if(bSrcBackup) pe.CreateBackup(null); // Maintain at end
 
-					if (mm == PwMergeMethod.OverwriteExisting)
+					if(mm == PwMergeMethod.OverwriteExisting)
 						peLocal.AssignProperties(pe, false, false, false);
-					else if ((mm == PwMergeMethod.OverwriteIfNewer) ||
+					else if((mm == PwMergeMethod.OverwriteIfNewer) ||
 						(mm == PwMergeMethod.Synchronize))
 					{
 						peLocal.AssignProperties(pe, true, false, false);
@@ -828,13 +913,13 @@ namespace KeePassLib
 			};
 
 			ghSrc(pdSource.RootGroup);
-			if (!pdSource.RootGroup.TraverseTree(TraversalMethod.PreOrder, ghSrc, ehSrc))
+			if(!pdSource.RootGroup.TraverseTree(TraversalMethod.PreOrder, ghSrc, ehSrc))
 				throw new InvalidOperationException();
 
 			IStatusLogger slPrevStatus = m_slStatus;
 			m_slStatus = slStatus;
 
-			if (mm == PwMergeMethod.Synchronize)
+			if(mm == PwMergeMethod.Synchronize)
 			{
 				RelocateGroups(ppOrg, ppSrc);
 				RelocateEntries(ppOrg, ppSrc);
@@ -844,24 +929,24 @@ namespace KeePassLib
 				MergeInLocationChanged(m_pgRootGroup, ppOrg, ppSrc);
 				ppOrg = null; // Pools are now invalid, because the location
 				ppSrc = null; // changed times have been merged in
-			}
 
-			// Delete *after* relocating, because relocating might empty
-			// some groups that are marked for deletion (and objects
-			// that weren't relocated yet might prevent the deletion)
-			Dictionary<PwUuid, PwDeletedObject> dDel = CreateDeletedObjectsPool();
-			if (mm == PwMergeMethod.Synchronize)
-				MergeInDeletionInfo(pdSource.m_vDeletedObjects, dDel);
-			ApplyDeletions(m_pgRootGroup, dDel);
-			// The list and the dictionary should be kept in sync
-			Debug.Assert(m_vDeletedObjects.UCount == (uint)dDel.Count);
+				// Delete *after* relocating, because relocating might
+				// empty some groups that are marked for deletion (and
+				// objects that weren't relocated yet might prevent the
+				// deletion)
+				Dictionary<PwUuid, PwDeletedObject> dOrgDel = CreateDeletedObjectsPool();
+				MergeInDeletionInfo(pdSource.m_vDeletedObjects, dOrgDel);
+				ApplyDeletions(m_pgRootGroup, dOrgDel);
+
+				// The list and the dictionary should be kept in sync
+				Debug.Assert(m_vDeletedObjects.UCount == (uint)dOrgDel.Count);
+			}
 
 			// Must be called *after* merging groups, because group UUIDs
 			// are required for recycle bin and entry template UUIDs
 			MergeInDbProperties(pdSource, mm);
 
-			MergeInCustomIcons(pdSource, dDel);
-			Debug.Assert(m_vDeletedObjects.UCount == (uint)dDel.Count);
+			MergeInCustomIcons(pdSource);
 
 			MaintainBackups();
 
@@ -869,79 +954,15 @@ namespace KeePassLib
 			m_slStatus = slPrevStatus;
 		}
 
-
-		private void MergeInCustomIcons(PwDatabase pdSource,
-			Dictionary<PwUuid, PwDeletedObject> dDel)
+		private void MergeInCustomIcons(PwDatabase pdSource)
 		{
-			bool bIconsMod = false;
-
-			Dictionary<PwUuid, int> d = new Dictionary<PwUuid, int>();
-			for (int i = m_vCustomIcons.Count - 1; i >= 0; --i)
-				d[m_vCustomIcons[i].Uuid] = i;
-			Debug.Assert(d.Count == m_vCustomIcons.Count); // UUIDs unique
-
-			foreach (PwCustomIcon ciS in pdSource.m_vCustomIcons)
+			foreach(PwCustomIcon pwci in pdSource.CustomIcons)
 			{
-				int iT;
-				if (d.TryGetValue(ciS.Uuid, out iT))
-				{
-					PwCustomIcon ciT = m_vCustomIcons[iT];
+				if(GetCustomIconIndex(pwci.Uuid) >= 0) continue;
 
-					DateTime? odtT = ciT.LastModificationTime;
-					DateTime? odtS = ciS.LastModificationTime;
-
-					if (odtT.HasValue && odtS.HasValue)
-					{
-						if (odtT.Value >= odtS.Value) continue;
-					}
-					else if (odtT.HasValue) continue;
-					else if (!odtS.HasValue) continue; // Both no time
-
-					m_vCustomIcons[iT] = ciS.Clone();
-				}
-				else
-				{
-					d[ciS.Uuid] = m_vCustomIcons.Count;
-					m_vCustomIcons.Add(ciS.Clone());
-				}
-
-				bIconsMod = true;
+				m_vCustomIcons.Add(pwci); // PwCustomIcon is immutable
+				m_bUINeedsIconUpdate = true;
 			}
-
-			List<PwDeletedObject> lObsoleteDel = new List<PwDeletedObject>();
-			foreach (KeyValuePair<PwUuid, PwDeletedObject> kvpDel in dDel)
-			{
-				int iT;
-				if (d.TryGetValue(kvpDel.Key, out iT))
-				{
-					PwCustomIcon ci = m_vCustomIcons[iT];
-					if (ci == null) { Debug.Assert(false); continue; } // Dup. del. obj.?
-
-					DateTime? odt = ci.LastModificationTime;
-
-					if (odt.HasValue && (odt.Value > kvpDel.Value.DeletionTime))
-						lObsoleteDel.Add(kvpDel.Value);
-					else
-					{
-						m_vCustomIcons[iT] = null; // Preserve indices, removed below
-						bIconsMod = true;
-					}
-				}
-			}
-
-			Predicate<PwCustomIcon> f = delegate (PwCustomIcon ci) { return (ci == null); };
-			m_vCustomIcons.RemoveAll(f);
-
-			foreach (PwDeletedObject pdo in lObsoleteDel)
-			{
-				// Prevent future deletion attempts
-				if (!m_vDeletedObjects.Remove(pdo)) { Debug.Assert(false); }
-				if (!dDel.Remove(pdo.Uuid)) { Debug.Assert(false); }
-			}
-
-			if (bIconsMod) m_bUINeedsIconUpdate = true;
-
-			FixCustomIconRefs();
 		}
 
 		private Dictionary<PwUuid, PwDeletedObject> CreateDeletedObjectsPool()
@@ -1282,9 +1303,7 @@ namespace KeePassLib
 				PwObjectBlock<T> b = new PwObjectBlock<T>();
 
 				DateTime dtLoc;
-                PwUuid puPrevParent;
-                PwObjectPoolEx pPool = GetBestPool(t, ppOrg, ppSrc, out dtLoc,
-                    out puPrevParent);
+				PwObjectPoolEx pPool = GetBestPool(t, ppOrg, ppSrc, out dtLoc);
 				b.Add(t, dtLoc, pPool);
 
 				lBlocks.Add(b);
@@ -1319,7 +1338,7 @@ namespace KeePassLib
 					}
 					if(idSrcNext == 0) break;
 
-					pPool = GetBestPool(tNext, ppOrg, ppSrc, out dtLoc, out puPrevParent);
+					pPool = GetBestPool(tNext, ppOrg, ppSrc, out dtLoc);
 					b.Add(tNext, dtLoc, pPool);
 
 					++u;
@@ -1332,31 +1351,28 @@ namespace KeePassLib
 		}
 
 		private static PwObjectPoolEx GetBestPool<T>(T t, PwObjectPoolEx ppOrg,
-			PwObjectPoolEx ppSrc, out DateTime dtLoc, out PwUuid puPrevParent)
+			PwObjectPoolEx ppSrc, out DateTime dtLoc)
 			where T : class, ITimeLogger, IStructureItem, IDeepCloneable<T>
 		{
-            PwObjectPoolEx p = null;
-            dtLoc = TimeUtil.SafeMinValueUtc;
-            puPrevParent = PwUuid.Zero;
+			PwObjectPoolEx p = null;
+			dtLoc = TimeUtil.SafeMinValueUtc;
 
-            IStructureItem ptOrg = ppOrg.GetItemByUuid(t.Uuid);
-            if (ptOrg != null)
-            {
-                dtLoc = ptOrg.LocationChanged;
-                puPrevParent = ptOrg.PreviousParentGroup;
-                p = ppOrg;
-            }
+			IStructureItem ptOrg = ppOrg.GetItemByUuid(t.Uuid);
+			if(ptOrg != null)
+			{
+				dtLoc = ptOrg.LocationChanged;
+				p = ppOrg;
+			}
 
-            IStructureItem ptSrc = ppSrc.GetItemByUuid(t.Uuid);
-            if ((ptSrc != null) && (ptSrc.LocationChanged > dtLoc))
-            {
-                dtLoc = ptSrc.LocationChanged;
-                puPrevParent = ptSrc.PreviousParentGroup;
-                p = ppSrc;
-            }
+			IStructureItem ptSrc = ppSrc.GetItemByUuid(t.Uuid);
+			if((ptSrc != null) && (ptSrc.LocationChanged > dtLoc))
+			{
+				dtLoc = ptSrc.LocationChanged;
+				p = ppSrc;
+			}
 
-            Debug.Assert(p != null);
-            return p;
+			Debug.Assert(p != null);
+			return p;
 		}
 
 		private static int FindLocationChangedPivot<T>(List<PwObjectBlock<T>> lBlocks,
@@ -1382,40 +1398,30 @@ namespace KeePassLib
 			return iPosMax;
 		}
 
-        private static void MergeInLocationChanged(PwGroup pg,
-            PwObjectPoolEx ppOrg, PwObjectPoolEx ppSrc)
-        {
-            GroupHandler gh = delegate (PwGroup pgSub)
-            {
-                DateTime dt;
-                PwUuid puPrevParent;
-                if (GetBestPool<PwGroup>(pgSub, ppOrg, ppSrc, out dt,
-                    out puPrevParent) != null)
-                {
-                    pgSub.LocationChanged = dt;
-                    pgSub.PreviousParentGroup = puPrevParent;
-                }
-                else { Debug.Assert(false); }
-                return true;
-            };
+		private static void MergeInLocationChanged(PwGroup pg,
+			PwObjectPoolEx ppOrg, PwObjectPoolEx ppSrc)
+		{
+			GroupHandler gh = delegate(PwGroup pgSub)
+			{
+				DateTime dt;
+				if(GetBestPool<PwGroup>(pgSub, ppOrg, ppSrc, out dt) != null)
+					pgSub.LocationChanged = dt;
+				else { Debug.Assert(false); }
+				return true;
+			};
 
-            EntryHandler eh = delegate (PwEntry pe)
-            {
-                DateTime dt;
-                PwUuid puPrevParent;
-                if (GetBestPool<PwEntry>(pe, ppOrg, ppSrc, out dt,
-                    out puPrevParent) != null)
-                {
-                    pe.LocationChanged = dt;
-                    pe.PreviousParentGroup = puPrevParent;
-                }
-                else { Debug.Assert(false); }
-                return true;
-            };
+			EntryHandler eh = delegate(PwEntry pe)
+			{
+				DateTime dt;
+				if(GetBestPool<PwEntry>(pe, ppOrg, ppSrc, out dt) != null)
+					pe.LocationChanged = dt;
+				else { Debug.Assert(false); }
+				return true;
+			};
 
-            gh(pg);
-            pg.TraverseTree(TraversalMethod.PreOrder, gh, eh);
-        }
+			gh(pg);
+			pg.TraverseTree(TraversalMethod.PreOrder, gh, eh);
+		}
 
 		private static void InsertObjectAtBestPos<T>(PwObjectList<T> lItems,
 			T tNew, PwObjectPoolEx ppSrc)
@@ -1530,18 +1536,12 @@ namespace KeePassLib
 			foreach(KeyValuePair<string, string> kvp in pdSource.m_dCustomData)
 			{
 				if(bSourceNewer || !m_dCustomData.Exists(kvp.Key))
-					m_dCustomData.Set(kvp.Key, kvp.Value, null);
+					m_dCustomData.Set(kvp.Key, kvp.Value);
 			}
 
-            // 'Clone' duplicates deep values (e.g. byte arrays)
-            VariantDictionary vdS = (VariantDictionary)pdSource.m_dPublicCustomData.Clone();
-            if (bForce || bSourceNewer)
-                vdS.CopyTo(m_dPublicCustomData);
-            else
-            {
-                m_dPublicCustomData.CopyTo(vdS);
-                m_dPublicCustomData = vdS;
-            }
+			VariantDictionary vdLocal = m_dPublicCustomData; // Backup
+			m_dPublicCustomData = (VariantDictionary)pdSource.m_dPublicCustomData.Clone();
+			if(!bSourceNewer) vdLocal.CopyTo(m_dPublicCustomData); // Merge
 		}
 
 		private void MergeEntryHistory(PwEntry pe, PwEntry peSource,
@@ -1634,12 +1634,12 @@ namespace KeePassLib
 		/// <returns>Index of the icon.</returns>
 		public int GetCustomIconIndex(PwUuid pwIconId)
 		{
-            for (int i = 0; i < m_vCustomIcons.Count; ++i)
-            {
-                PwCustomIcon pwci = m_vCustomIcons[i];
-                if (pwci.Uuid.Equals(pwIconId))
-                    return i;
-            }
+			for(int i = 0; i < m_vCustomIcons.Count; ++i)
+			{
+				PwCustomIcon pwci = m_vCustomIcons[i];
+				if(pwci.Uuid.Equals(pwIconId))
+					return i;
+			}
 
 			// Debug.Assert(false); // Do not assert
 			return -1;
@@ -1649,15 +1649,15 @@ namespace KeePassLib
 		{
 			if(pbPngData == null) { Debug.Assert(false); return -1; }
 
-            for (int i = 0; i < m_vCustomIcons.Count; ++i)
-            {
-                PwCustomIcon pwci = m_vCustomIcons[i];
-                byte[] pbEx = pwci.ImageDataPng;
-                if (pbEx == null) { Debug.Assert(false); continue; }
+			for(int i = 0; i < m_vCustomIcons.Count; ++i)
+			{
+				PwCustomIcon pwci = m_vCustomIcons[i];
+				byte[] pbEx = pwci.ImageDataPng;
+				if(pbEx == null) { Debug.Assert(false); continue; }
 
-                if (MemUtil.ArraysEqual(pbEx, pbPngData))
-                    return i;
-            }
+				if(MemUtil.ArraysEqual(pbEx, pbPngData))
+					return i;
+			}
 
 			return -1;
 		}
@@ -1676,64 +1676,68 @@ namespace KeePassLib
 			else { Debug.Assert(false); return null; }
 		}
 
-        public bool DeleteCustomIcons(List<PwUuid> lUuids)
-        {
-            if (lUuids == null) { Debug.Assert(false); throw new ArgumentNullException("lUuids"); }
-            if (lUuids.Count == 0) return false;
+		public bool DeleteCustomIcons(List<PwUuid> vUuidsToDelete)
+		{
+			Debug.Assert(vUuidsToDelete != null);
+			if(vUuidsToDelete == null) throw new ArgumentNullException("vUuidsToDelete");
+			if(vUuidsToDelete.Count <= 0) return true;
 
-            Dictionary<PwUuid, bool> dToDel = new Dictionary<PwUuid, bool>();
-            foreach (PwUuid pu in lUuids) { dToDel[pu] = true; }
+			GroupHandler gh = delegate(PwGroup pg)
+			{
+				PwUuid uuidThis = pg.CustomIconUuid;
+				if(uuidThis.Equals(PwUuid.Zero)) return true;
 
-            DateTime dt = DateTime.UtcNow;
-            for (int i = m_vCustomIcons.Count - 1; i >= 0; --i)
-            {
-                PwUuid pu = m_vCustomIcons[i].Uuid;
-                if (dToDel.ContainsKey(pu))
-                {
-                    m_vCustomIcons[i] = null; // Removed below
-                    m_vDeletedObjects.Add(new PwDeletedObject(pu, dt));
-                }
-            }
+				foreach(PwUuid uuidDelete in vUuidsToDelete)
+				{
+					if(uuidThis.Equals(uuidDelete))
+					{
+						pg.CustomIconUuid = PwUuid.Zero;
+						break;
+					}
+				}
 
-            Predicate<PwCustomIcon> f = delegate (PwCustomIcon ci) { return (ci == null); };
-            m_vCustomIcons.RemoveAll(f);
+				return true;
+			};
 
-            FixCustomIconRefs();
-            return true;
-        }
+			EntryHandler eh = delegate(PwEntry pe)
+			{
+				RemoveCustomIconUuid(pe, vUuidsToDelete);
+				return true;
+			};
 
-        private void FixCustomIconRefs()
-        {
-            Dictionary<PwUuid, bool> d = new Dictionary<PwUuid, bool>();
-            foreach (PwCustomIcon ci in m_vCustomIcons) { d[ci.Uuid] = true; }
+			gh(m_pgRootGroup);
+			if(!m_pgRootGroup.TraverseTree(TraversalMethod.PreOrder, gh, eh))
+			{
+				Debug.Assert(false);
+				return false;
+			}
 
-            GroupHandler gh = delegate (PwGroup pg)
-            {
-                PwUuid pu = pg.CustomIconUuid;
-                if (pu.Equals(PwUuid.Zero)) return true;
-                if (!d.ContainsKey(pu)) pg.CustomIconUuid = PwUuid.Zero;
-                return true;
-            };
+			foreach(PwUuid pwUuid in vUuidsToDelete)
+			{
+				int nIndex = GetCustomIconIndex(pwUuid);
+				if(nIndex >= 0) m_vCustomIcons.RemoveAt(nIndex);
+			}
 
-            EntryHandler eh = delegate (PwEntry pe)
-            {
-                FixCustomIconRefs(pe, d);
-                return true;
-            };
+			return true;
+		}
 
-            gh(m_pgRootGroup);
-            m_pgRootGroup.TraverseTree(TraversalMethod.PreOrder, gh, eh);
-        }
+		private static void RemoveCustomIconUuid(PwEntry pe, List<PwUuid> vToDelete)
+		{
+			PwUuid uuidThis = pe.CustomIconUuid;
+			if(uuidThis.Equals(PwUuid.Zero)) return;
 
-        private void FixCustomIconRefs(PwEntry pe, Dictionary<PwUuid, bool> d)
-        {
-            PwUuid pu = pe.CustomIconUuid;
-            if (pu.Equals(PwUuid.Zero)) return;
-            if (!d.ContainsKey(pu)) pe.CustomIconUuid = PwUuid.Zero;
-
-            foreach (PwEntry peH in pe.History) FixCustomIconRefs(peH, d);
-        }
+			foreach(PwUuid uuidDelete in vToDelete)
+			{
+				if(uuidThis.Equals(uuidDelete))
+				{
+					pe.CustomIconUuid = PwUuid.Zero;
+					break;
+				}
+			}
 
+			foreach(PwEntry peHistory in pe.History)
+				RemoveCustomIconUuid(peHistory, vToDelete);
+		}
 
 		private int GetTotalObjectUuidCount()
 		{
@@ -2022,119 +2026,61 @@ namespace KeePassLib
 			return uDeleted;
 		}
 
-
 		public uint DeleteUnusedCustomIcons()
 		{
-			Dictionary<PwUuid, bool> dToDel = new Dictionary<PwUuid, bool>();
-			foreach (PwCustomIcon ci in m_vCustomIcons) { dToDel[ci.Uuid] = true; }
+			List<PwUuid> lToDelete = new List<PwUuid>();
+			foreach(PwCustomIcon pwci in m_vCustomIcons)
+				lToDelete.Add(pwci.Uuid);
 
-			GroupHandler gh = delegate (PwGroup pg)
+			GroupHandler gh = delegate(PwGroup pg)
 			{
-				PwUuid pu = pg.CustomIconUuid;
-				if (!pu.Equals(PwUuid.Zero)) dToDel.Remove(pu);
+				PwUuid pwUuid = pg.CustomIconUuid;
+				if((pwUuid == null) || pwUuid.Equals(PwUuid.Zero)) return true;
+
+				for(int i = 0; i < lToDelete.Count; ++i)
+				{
+					if(lToDelete[i].Equals(pwUuid))
+					{
+						lToDelete.RemoveAt(i);
+						break;
+					}
+				}
+
 				return true;
 			};
 
-			EntryHandler eh = delegate (PwEntry pe)
+			EntryHandler eh = delegate(PwEntry pe)
 			{
-				RemoveCustomIconsFromDict(dToDel, pe);
+				PwUuid pwUuid = pe.CustomIconUuid;
+				if((pwUuid == null) || pwUuid.Equals(PwUuid.Zero)) return true;
+
+				for(int i = 0; i < lToDelete.Count; ++i)
+				{
+					if(lToDelete[i].Equals(pwUuid))
+					{
+						lToDelete.RemoveAt(i);
+						break;
+					}
+				}
+
 				return true;
 			};
 
 			gh(m_pgRootGroup);
 			m_pgRootGroup.TraverseTree(TraversalMethod.PreOrder, gh, eh);
 
-			uint cDel = (uint)dToDel.Count;
-			if (cDel != 0)
+			uint uDeleted = 0;
+			foreach(PwUuid pwDel in lToDelete)
 			{
-				DeleteCustomIcons(new List<PwUuid>(dToDel.Keys));
-				m_bUINeedsIconUpdate = true;
+				int nIndex = GetCustomIconIndex(pwDel);
+				if(nIndex < 0) { Debug.Assert(false); continue; }
+
+				m_vCustomIcons.RemoveAt(nIndex);
+				++uDeleted;
 			}
 
-			return cDel;
-		}
-
-		private static void RemoveCustomIconsFromDict(Dictionary<PwUuid, bool> d,
-			PwEntry pe)
-		{
-			PwUuid pu = pe.CustomIconUuid;
-			if (!pu.Equals(PwUuid.Zero)) d.Remove(pu);
-
-			foreach (PwEntry peH in pe.History) RemoveCustomIconsFromDict(d, peH);
-		}
-
-		internal static void CopyCustomIcons(PwDatabase pdFrom, PwDatabase pdTo,
-			PwGroup pgSelect, bool bResetIfUnknown)
-		{
-			if (pgSelect == null) { Debug.Assert(false); return; }
-
-			Dictionary<PwUuid, PwCustomIcon> dFrom = new Dictionary<PwUuid, PwCustomIcon>();
-			if (pdFrom != null)
-			{
-				foreach (PwCustomIcon ci in pdFrom.m_vCustomIcons)
-					dFrom[ci.Uuid] = ci;
-			}
-
-			Dictionary<PwUuid, int> dTo = new Dictionary<PwUuid, int>();
-			if (pdTo != null)
-			{
-				for (int i = pdTo.m_vCustomIcons.Count - 1; i >= 0; --i)
-					dTo[pdTo.m_vCustomIcons[i].Uuid] = i;
-			}
-
-    		Func<PwUuid, bool> fEnsureIcon = delegate (PwUuid puIcon)
-			{
-				if (puIcon.Equals(PwUuid.Zero)) return true;
-				if (pdTo == null) { Debug.Assert(false); return false; }
-
-				PwCustomIcon ciFrom;
-				if (!dFrom.TryGetValue(puIcon, out ciFrom)) { Debug.Assert(false); return false; }
-
-				int iTo;
-				if (dTo.TryGetValue(puIcon, out iTo))
-				{
-					PwCustomIcon ciTo = pdTo.m_vCustomIcons[iTo];
-
-					DateTime? odtFrom = ciFrom.LastModificationTime;
-					DateTime? odtTo = ciTo.LastModificationTime;
-
-					if (odtFrom.HasValue && odtTo.HasValue)
-					{
-						if (odtFrom.Value <= odtTo.Value) return true;
-					}
-					else if (odtTo.HasValue) return true;
-					else if (!odtFrom.HasValue) return true; // Both no time
-
-					pdTo.m_vCustomIcons[iTo] = ciFrom.Clone();
-				}
-				else
-				{
-					dTo[puIcon] = pdTo.m_vCustomIcons.Count;
-					pdTo.m_vCustomIcons.Add(ciFrom.Clone());
-				}
-
-				pdTo.Modified = true;
-				pdTo.UINeedsIconUpdate = true;
-				return true;
-			};
-
-			GroupHandler gh = delegate (PwGroup pgCur)
-			{
-				bool bTo = fEnsureIcon(pgCur.CustomIconUuid);
-				if (!bTo && bResetIfUnknown) pgCur.CustomIconUuid = PwUuid.Zero;
-				return true;
-			};
-
-			EntryHandler eh = delegate (PwEntry peCur)
-			{
-				bool bTo = fEnsureIcon(peCur.CustomIconUuid);
-				if (!bTo && bResetIfUnknown) peCur.CustomIconUuid = PwUuid.Zero;
-				return true;
-			};
-
-			gh(pgSelect);
-			pgSelect.TraverseTree(TraversalMethod.PreOrder, gh, eh);
+			if(uDeleted > 0) m_bUINeedsIconUpdate = true;
+			return uDeleted;
 		}
 	}
 }
-

src/KeePassLib2Android/PwDefs.cs

@@ -228,18 +228,6 @@ namespace KeePassLib
 	/// </summary>
 	public sealed class SearchParameters
 	{
-		private string m_strName = string.Empty;
-		[DefaultValue("")]
-		public string Name
-		{
-			get { return m_strName; }
-			set
-			{
-				if (value == null) throw new ArgumentNullException("value");
-				m_strName = value;
-			}
-		}
-
 		private string m_strText = string.Empty;
 		[DefaultValue("")]
 		public string SearchString
@@ -247,25 +235,17 @@ namespace KeePassLib
 			get { return m_strText; }
 			set
 			{
-				if (value == null) throw new ArgumentNullException("value");
+				if(value == null) throw new ArgumentNullException("value");
 				m_strText = value;
 			}
 		}
 
-		private PwSearchMode m_sm = PwSearchMode.Simple;
-		public PwSearchMode SearchMode
-		{
-			get { return m_sm; }
-			set { m_sm = value; }
-		}
-
+		private bool m_bRegex = false;
 		[DefaultValue(false)]
-		[Obsolete]
-		[XmlIgnore]
 		public bool RegularExpression
 		{
-			get { return (m_sm == PwSearchMode.Regular); }
-			set { m_sm = (value ? PwSearchMode.Regular : PwSearchMode.Simple); }
+			get { return m_bRegex; }
+			set { m_bRegex = value; }
 		}
 
 		private bool m_bSearchInTitles = true;
@@ -316,22 +296,6 @@ namespace KeePassLib
 			set { m_bSearchInOther = value; }
 		}
 
-		private bool m_bSearchInStringNames = false;
-		[DefaultValue(false)]
-		public bool SearchInStringNames
-		{
-			get { return m_bSearchInStringNames; }
-			set { m_bSearchInStringNames = value; }
-		}
-
-		private bool m_bSearchInTags = true;
-		[DefaultValue(true)]
-		public bool SearchInTags
-		{
-			get { return m_bSearchInTags; }
-			set { m_bSearchInTags = value; }
-		}
-
 		private bool m_bSearchInUuids = false;
 		[DefaultValue(false)]
 		public bool SearchInUuids
@@ -340,14 +304,6 @@ namespace KeePassLib
 			set { m_bSearchInUuids = value; }
 		}
 
-		private bool m_bSearchInGroupPaths = false;
-		[DefaultValue(false)]
-		public bool SearchInGroupPaths
-		{
-			get { return m_bSearchInGroupPaths; }
-			set { m_bSearchInGroupPaths = value; }
-		}
-
 		private bool m_bSearchInGroupNames = false;
 		[DefaultValue(false)]
 		public bool SearchInGroupNames
@@ -356,12 +312,12 @@ namespace KeePassLib
 			set { m_bSearchInGroupNames = value; }
 		}
 
-		private bool m_bSearchInHistory = false;
-		[DefaultValue(false)]
-		public bool SearchInHistory
+		private bool m_bSearchInTags = true;
+		[DefaultValue(true)]
+		public bool SearchInTags
 		{
-			get { return m_bSearchInHistory; }
-			set { m_bSearchInHistory = value; }
+			get { return m_bSearchInTags; }
+			set { m_bSearchInTags = value; }
 		}
 
 #if KeePassUAP
@@ -413,7 +369,7 @@ namespace KeePassLib
 			get { return m_strDataTrf; }
 			set
 			{
-				if (value == null) throw new ArgumentNullException("value");
+				if(value == null) throw new ArgumentNullException("value");
 				m_strDataTrf = value;
 			}
 		}
@@ -425,24 +381,20 @@ namespace KeePassLib
 			{
 				SearchParameters sp = new SearchParameters();
 
-				Debug.Assert(sp.m_strName.Length == 0);
-				Debug.Assert(sp.m_strText.Length == 0);
-				Debug.Assert(sp.m_sm == PwSearchMode.Simple);
+				// sp.m_strText = string.Empty;
+				// sp.m_bRegex = false;
 				sp.m_bSearchInTitles = false;
 				sp.m_bSearchInUserNames = false;
-				Debug.Assert(!sp.m_bSearchInPasswords);
+				// sp.m_bSearchInPasswords = false;
 				sp.m_bSearchInUrls = false;
 				sp.m_bSearchInNotes = false;
 				sp.m_bSearchInOther = false;
-				Debug.Assert(!sp.m_bSearchInStringNames);
+				// sp.m_bSearchInUuids = false;
+				// sp.SearchInGroupNames = false;
 				sp.m_bSearchInTags = false;
-				Debug.Assert(!sp.m_bSearchInUuids);
-				Debug.Assert(!sp.m_bSearchInGroupPaths);
-				Debug.Assert(!sp.m_bSearchInGroupNames);
-				Debug.Assert(!sp.m_bSearchInHistory);
-				// Debug.Assert(sp.m_scType == StringComparison.InvariantCultureIgnoreCase);
-				Debug.Assert(!sp.m_bExcludeExpired);
-				Debug.Assert(sp.m_bRespectEntrySearchingDisabled);
+				// sp.m_scType = StringComparison.InvariantCultureIgnoreCase;
+				// sp.m_bExcludeExpired = false;
+				// m_bRespectEntrySearchingDisabled = true;
 
 				return sp;
 			}

src/KeePassLib2Android/PwEntry.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2021 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,15 +42,14 @@ namespace KeePassLib
 		private PwUuid m_uuid = PwUuid.Zero;
 		private PwGroup m_pParentGroup = null;
 		private DateTime m_tParentGroupLastMod = PwDefs.DtDefaultNow;
-		private PwUuid m_puPrevParentGroup = PwUuid.Zero;
 
-		private ProtectedStringDictionary m_dStrings = new ProtectedStringDictionary();
-		private ProtectedBinaryDictionary m_dBinaries = new ProtectedBinaryDictionary();
-		private AutoTypeConfig m_cfgAutoType = new AutoTypeConfig();
-		private PwObjectList<PwEntry> m_lHistory = new PwObjectList<PwEntry>();
+		private ProtectedStringDictionary m_listStrings = new ProtectedStringDictionary();
+		private ProtectedBinaryDictionary m_listBinaries = new ProtectedBinaryDictionary();
+		private AutoTypeConfig m_listAutoType = new AutoTypeConfig();
+		private PwObjectList<PwEntry> m_listHistory = new PwObjectList<PwEntry>();
 
 		private PwIcon m_pwIcon = PwIcon.Key;
-		private PwUuid m_puCustomIcon = PwUuid.Zero;
+		private PwUuid m_pwCustomIconID = PwUuid.Zero;
 
 		private Color m_clrForeground = Color.Empty;
 		private Color m_clrBackground = Color.Empty;
@@ -63,21 +62,20 @@ namespace KeePassLib
 		private ulong m_uUsageCount = 0;
 
 		private string m_strOverrideUrl = string.Empty;
-		private bool m_bQualityCheck = true;
 
-		private List<string> m_lTags = new List<string>();
+		private List<string> m_vTags = new List<string>();
 
 		private StringDictionaryEx m_dCustomData = new StringDictionaryEx();
-
 		/// <summary>
 		/// UUID of this entry.
 		/// </summary>
+		/// </summary>
 		public PwUuid Uuid
 		{
 			get { return m_uuid; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
 				m_uuid = value;
 			}
 		}
@@ -89,7 +87,7 @@ namespace KeePassLib
 		{
 			get { return m_pParentGroup; }
 
-			// Plugins: use <c>PwGroup.AddEntry</c> instead.
+			/// Plugins: use <c>PwGroup.AddEntry</c> instead.
 			internal set { m_pParentGroup = value; }
 		}
 
@@ -102,26 +100,17 @@ namespace KeePassLib
 			set { m_tParentGroupLastMod = value; }
 		}
 
-		public PwUuid PreviousParentGroup
-		{
-			get { return m_puPrevParentGroup; }
-			set
-			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_puPrevParentGroup = value;
-			}
-		}
 
 		/// <summary>
 		/// Get or set all entry strings.
 		/// </summary>
 		public ProtectedStringDictionary Strings
 		{
-			get { return m_dStrings; }
+			get { return m_listStrings; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_dStrings = value;
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
+				m_listStrings = value;
 			}
 		}
 
@@ -130,11 +119,11 @@ namespace KeePassLib
 		/// </summary>
 		public ProtectedBinaryDictionary Binaries
 		{
-			get { return m_dBinaries; }
+			get { return m_listBinaries; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_dBinaries = value;
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
+				m_listBinaries = value;
 			}
 		}
 
@@ -143,11 +132,11 @@ namespace KeePassLib
 		/// </summary>
 		public AutoTypeConfig AutoType
 		{
-			get { return m_cfgAutoType; }
+			get { return m_listAutoType; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_cfgAutoType = value;
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
+				m_listAutoType = value;
 			}
 		}
 
@@ -156,11 +145,11 @@ namespace KeePassLib
 		/// </summary>
 		public PwObjectList<PwEntry> History
 		{
-			get { return m_lHistory; }
+			get { return m_listHistory; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_lHistory = value;
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
+				m_listHistory = value;
 			}
 		}
 
@@ -180,11 +169,11 @@ namespace KeePassLib
 		/// </summary>
 		public PwUuid CustomIconUuid
 		{
-			get { return m_puCustomIcon; }
+			get { return m_pwCustomIconID; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_puCustomIcon = value;
+				Debug.Assert(value != null); if (value == null) throw new ArgumentNullException("value");
+				m_pwCustomIconID = value;
 			}
 		}
 
@@ -263,34 +252,28 @@ namespace KeePassLib
 		}
 
 		/// <summary>
-		/// Entry-specific override URL.
+		/// Entry-specific override URL. If this string is non-empty,
 		/// </summary>
 		public string OverrideUrl
 		{
 			get { return m_strOverrideUrl; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
+				if (value == null) throw new ArgumentNullException("value");
 				m_strOverrideUrl = value;
 			}
 		}
 
-		public bool QualityCheck
-		{
-			get { return m_bQualityCheck; }
-			set { m_bQualityCheck = value; }
-		}
-
 		/// <summary>
 		/// List of tags associated with this entry.
 		/// </summary>
 		public List<string> Tags
 		{
-			get { StrUtil.NormalizeTags(m_lTags); return m_lTags; }
+			get { return m_vTags; }
 			set
 			{
-				if (value == null) { Debug.Assert(false); throw new ArgumentNullException("value"); }
-				m_lTags = value;
+				if (value == null) throw new ArgumentNullException("value");
+				m_vTags = value;
 			}
 		}
 
@@ -366,19 +349,19 @@ namespace KeePassLib
 		}
 
 #if DEBUG
-		// For display in debugger
+		/// <summary>
 		public override string ToString()
 		{
-			return ("PwEntry '" + m_dStrings.ReadSafe(PwDefs.TitleField) + "'");
+			return (@"PwEntry '" + m_listStrings.ReadSafe(PwDefs.TitleField) + @"'");
 		}
 #endif
-
-		/// <summary>
 		/// Clone the current entry. The returned entry is an exact value copy
 		/// of the current entry (including UUID and parent group reference).
 		/// All mutable members are cloned.
 		/// </summary>
 		/// <returns>Exact value clone. All references to mutable values changed.</returns>
+		/// </summary>
+		/// <returns>Exact value clone. All references to mutable values changed.</returns>
 		public PwEntry CloneDeep()
 		{
 			PwEntry peNew = new PwEntry(false, false);
@@ -386,15 +369,14 @@ namespace KeePassLib
 			peNew.m_uuid = m_uuid; // PwUuid is immutable
 			peNew.m_pParentGroup = m_pParentGroup;
 			peNew.m_tParentGroupLastMod = m_tParentGroupLastMod;
-			peNew.m_puPrevParentGroup = m_puPrevParentGroup;
 
-			peNew.m_dStrings = m_dStrings.CloneDeep();
-			peNew.m_dBinaries = m_dBinaries.CloneDeep();
-			peNew.m_cfgAutoType = m_cfgAutoType.CloneDeep();
-			peNew.m_lHistory = m_lHistory.CloneDeep();
+			peNew.m_listStrings = m_listStrings.CloneDeep();
+			peNew.m_listBinaries = m_listBinaries.CloneDeep();
+			peNew.m_listAutoType = m_listAutoType.CloneDeep();
+			peNew.m_listHistory = m_listHistory.CloneDeep();
 
 			peNew.m_pwIcon = m_pwIcon;
-			peNew.m_puCustomIcon = m_puCustomIcon;
+			peNew.m_pwCustomIconID = m_pwCustomIconID;
 
 			peNew.m_clrForeground = m_clrForeground;
 			peNew.m_clrBackground = m_clrBackground;
@@ -407,9 +389,8 @@ namespace KeePassLib
 			peNew.m_uUsageCount = m_uUsageCount;
 
 			peNew.m_strOverrideUrl = m_strOverrideUrl;
-			peNew.m_bQualityCheck = m_bQualityCheck;
 
-			peNew.m_lTags.AddRange(m_lTags);
+			peNew.m_vTags = new List<string>(m_vTags);
 
 			peNew.m_dCustomData = m_dCustomData.CloneDeep();
 
@@ -476,29 +457,27 @@ namespace KeePassLib
 				if (m_pParentGroup != pe.m_pParentGroup) return false;
 				if (!bIgnoreLastMod && (m_tParentGroupLastMod != pe.m_tParentGroupLastMod))
 					return false;
-				if (!m_puPrevParentGroup.Equals(pe.m_puPrevParentGroup))
-					return false;
 			}
 
-			if (!m_dStrings.EqualsDictionary(pe.m_dStrings, pwOpt, mpCmpStr))
+			if (!m_listStrings.EqualsDictionary(pe.m_listStrings, pwOpt, mpCmpStr))
 				return false;
-			if (!m_dBinaries.EqualsDictionary(pe.m_dBinaries)) return false;
+			if (!m_listBinaries.EqualsDictionary(pe.m_listBinaries)) return false;
 
-			if (!m_cfgAutoType.Equals(pe.m_cfgAutoType)) return false;
+			if (!m_listAutoType.Equals(pe.m_listAutoType)) return false;
 
 			if ((pwOpt & PwCompareOptions.IgnoreHistory) == PwCompareOptions.None)
 			{
 				bool bIgnoreLastBackup = ((pwOpt & PwCompareOptions.IgnoreLastBackup) !=
 					PwCompareOptions.None);
 
-				if (!bIgnoreLastBackup && (m_lHistory.UCount != pe.m_lHistory.UCount))
+				if (!bIgnoreLastBackup && (m_listHistory.UCount != pe.m_listHistory.UCount))
 					return false;
-				if (bIgnoreLastBackup && (m_lHistory.UCount == 0))
+				if (bIgnoreLastBackup && (m_listHistory.UCount == 0))
 				{
 					Debug.Assert(false);
 					return false;
 				}
-				if (bIgnoreLastBackup && ((m_lHistory.UCount - 1) != pe.m_lHistory.UCount))
+				if (bIgnoreLastBackup && ((m_listHistory.UCount - 1) != pe.m_listHistory.UCount))
 					return false;
 
 				PwCompareOptions cmpSub = PwCompareOptions.IgnoreParentGroup;
@@ -506,16 +485,16 @@ namespace KeePassLib
 				if (bIgnoreLastMod) cmpSub |= PwCompareOptions.IgnoreLastMod;
 				if (bIgnoreLastAccess) cmpSub |= PwCompareOptions.IgnoreLastAccess;
 
-				for (uint uHist = 0; uHist < pe.m_lHistory.UCount; ++uHist)
+				for (uint uHist = 0; uHist < pe.m_listHistory.UCount; ++uHist)
 				{
-					if (!m_lHistory.GetAt(uHist).EqualsEntry(pe.m_lHistory.GetAt(
+					if (!m_listHistory.GetAt(uHist).EqualsEntry(pe.m_listHistory.GetAt(
 						uHist), cmpSub, MemProtCmpMode.None))
 						return false;
 				}
 			}
 
 			if (m_pwIcon != pe.m_pwIcon) return false;
-			if (!m_puCustomIcon.Equals(pe.m_puCustomIcon)) return false;
+			if (!m_pwCustomIconID.Equals(pe.m_pwCustomIconID)) return false;
 
 			if (m_clrForeground != pe.m_clrForeground) return false;
 			if (m_clrBackground != pe.m_clrBackground) return false;
@@ -528,10 +507,12 @@ namespace KeePassLib
 			if (!bIgnoreLastAccess && (m_uUsageCount != pe.m_uUsageCount)) return false;
 
 			if (m_strOverrideUrl != pe.m_strOverrideUrl) return false;
-			if (m_bQualityCheck != pe.m_bQualityCheck) return false;
 
-			// The Tags property normalizes
-			if (!MemUtil.ListsEqual<string>(this.Tags, pe.Tags)) return false;
+			if (m_vTags.Count != pe.m_vTags.Count) return false;
+			for (int iTag = 0; iTag < m_vTags.Count; ++iTag)
+			{
+				if (m_vTags[iTag] != pe.m_vTags[iTag]) return false;
+			}
 
 			if (!m_dCustomData.Equals(pe.m_dCustomData)) return false;
 
@@ -562,19 +543,16 @@ namespace KeePassLib
 			m_uuid = peTemplate.m_uuid;
 
 			if (bAssignLocationChanged)
-			{
 				m_tParentGroupLastMod = peTemplate.m_tParentGroupLastMod;
-				m_puPrevParentGroup = peTemplate.m_puPrevParentGroup;
-			}
 
-			m_dStrings = peTemplate.m_dStrings.CloneDeep();
-			m_dBinaries = peTemplate.m_dBinaries.CloneDeep();
-			m_cfgAutoType = peTemplate.m_cfgAutoType.CloneDeep();
+			m_listStrings = peTemplate.m_listStrings.CloneDeep();
+			m_listBinaries = peTemplate.m_listBinaries.CloneDeep();
+			m_listAutoType = peTemplate.m_listAutoType.CloneDeep();
 			if (bIncludeHistory)
-				m_lHistory = peTemplate.m_lHistory.CloneDeep();
+				m_listHistory = peTemplate.m_listHistory.CloneDeep();
 
 			m_pwIcon = peTemplate.m_pwIcon;
-			m_puCustomIcon = peTemplate.m_puCustomIcon; // Immutable
+			m_pwCustomIconID = peTemplate.m_pwCustomIconID; // Immutable
 
 			m_clrForeground = peTemplate.m_clrForeground;
 			m_clrBackground = peTemplate.m_clrBackground;
@@ -587,9 +565,8 @@ namespace KeePassLib
 			m_uUsageCount = peTemplate.m_uUsageCount;
 
 			m_strOverrideUrl = peTemplate.m_strOverrideUrl;
-			m_bQualityCheck = peTemplate.m_bQualityCheck;
 
-			m_lTags = new List<string>(peTemplate.m_lTags);
+			m_vTags = new List<string>(peTemplate.m_vTags);
 
 			m_dCustomData = peTemplate.m_dCustomData.CloneDeep();
 		}
@@ -652,9 +629,9 @@ namespace KeePassLib
 		public void CreateBackup(PwDatabase pwHistMntcSettings)
 		{
 			PwEntry peCopy = CloneDeep();
-			peCopy.m_lHistory.Clear();
+			peCopy.History = new PwObjectList<PwEntry>(); // Remove history
 
-			m_lHistory.Add(peCopy); // Must be added at end, see EqualsEntry
+			m_listHistory.Add(peCopy); // Must be added at end, see EqualsEntry
 
 			if (pwHistMntcSettings != null) MaintainBackups(pwHistMntcSettings);
 		}
@@ -681,14 +658,12 @@ namespace KeePassLib
 		/// This parameter may be <c>null</c> (no maintenance then).</param>
 		public void RestoreFromBackup(uint uBackupIndex, PwDatabase pwHistMntcSettings)
 		{
-			if (uBackupIndex >= m_lHistory.UCount)
-			{
-				Debug.Assert(false);
+			Debug.Assert(uBackupIndex < m_listHistory.UCount);
+			if (uBackupIndex >= m_listHistory.UCount)
 				throw new ArgumentOutOfRangeException("uBackupIndex");
-			}
 
-			PwEntry pe = m_lHistory.GetAt(uBackupIndex);
-			if (pe == null) { Debug.Assert(false); throw new InvalidOperationException(); }
+			PwEntry pe = m_listHistory.GetAt(uBackupIndex);
+			Debug.Assert(pe != null); if (pe == null) throw new InvalidOperationException();
 
 			CreateBackup(pwHistMntcSettings); // Backup current data before restoring
 			AssignProperties(pe, false, false, false);
@@ -704,7 +679,7 @@ namespace KeePassLib
 			if (bIgnoreLastMod) cmpOpt |= PwCompareOptions.IgnoreLastMod;
 			if (bIgnoreLastAccess) cmpOpt |= PwCompareOptions.IgnoreLastAccess;
 
-			foreach (PwEntry pe in m_lHistory)
+			foreach (PwEntry pe in m_listHistory)
 			{
 				if (pe.EqualsEntry(peData, cmpOpt, MemProtCmpMode.None)) return true;
 			}
@@ -713,28 +688,21 @@ namespace KeePassLib
 		}
 
 		/// <summary>
-		/// Delete old history entries if there are too many or the
-		/// history size is too large.
-		/// <returns>If one or more history entries have been deleted,
-		/// <c>true</c> is returned. Otherwise <c>false</c>.</returns>
+		/// Delete old history items if there are too many or the history
+		/// size is too large.
+		/// <returns>If one or more history items have been deleted, <c>true</c>
+		/// is returned. Otherwise <c>false</c>.</returns>
 		/// </summary>
 		public bool MaintainBackups(PwDatabase pwSettings)
 		{
 			if (pwSettings == null) { Debug.Assert(false); return false; }
 
-			// Fix UUIDs of history entries; should not be necessary
-			PwUuid pu = m_uuid;
-			foreach (PwEntry pe in m_lHistory)
-			{
-				if (!pe.Uuid.Equals(pu)) { Debug.Assert(false); pe.Uuid = pu; }
-			}
-
 			bool bDeleted = false;
 
 			int nMaxItems = pwSettings.HistoryMaxItems;
 			if (nMaxItems >= 0)
 			{
-				while (m_lHistory.UCount > (uint)nMaxItems)
+				while (m_listHistory.UCount > (uint)nMaxItems)
 				{
 					RemoveOldestBackup();
 					bDeleted = true;
@@ -747,7 +715,7 @@ namespace KeePassLib
 				while (true)
 				{
 					ulong uHistSize = 0;
-					foreach (PwEntry pe in m_lHistory) { uHistSize += pe.GetSize(); }
+					foreach (PwEntry pe in m_listHistory) { uHistSize += pe.GetSize(); }
 
 					if (uHistSize > (ulong)lMaxSize)
 					{
@@ -766,9 +734,9 @@ namespace KeePassLib
 			DateTime dtMin = TimeUtil.SafeMaxValueUtc;
 			uint idxRemove = uint.MaxValue;
 
-			for (uint u = 0; u < m_lHistory.UCount; ++u)
+			for (uint u = 0; u < m_listHistory.UCount; ++u)
 			{
-				PwEntry pe = m_lHistory.GetAt(u);
+				PwEntry pe = m_listHistory.GetAt(u);
 				if (TimeUtil.Compare(pe.LastModificationTime, dtMin, true) < 0)
 				{
 					idxRemove = u;
@@ -776,12 +744,12 @@ namespace KeePassLib
 				}
 			}
 
-			if (idxRemove != uint.MaxValue) m_lHistory.RemoveAt(idxRemove);
+			if (idxRemove != uint.MaxValue) m_listHistory.RemoveAt(idxRemove);
 		}
 
 		public bool GetAutoTypeEnabled()
 		{
-			if (!m_cfgAutoType.Enabled) return false;
+			if (!m_listAutoType.Enabled) return false;
 
 			if (m_pParentGroup != null)
 				return m_pParentGroup.GetAutoTypeEnabledInherited();
@@ -791,7 +759,7 @@ namespace KeePassLib
 
 		public string GetAutoTypeSequence()
 		{
-			string strSeq = m_cfgAutoType.DefaultSequence;
+			string strSeq = m_listAutoType.DefaultSequence;
 
 			PwGroup pg = m_pParentGroup;
 			while (pg != null)
@@ -817,67 +785,69 @@ namespace KeePassLib
 		}
 
 		/// <summary>
-		/// Approximate the total size (in process memory) of this entry
-		/// in bytes (including strings, binaries and history entries).
+		/// Approximate the total size of this entry in bytes (including
+		/// strings, binaries and history entries).
 		/// </summary>
 		/// <returns>Size in bytes.</returns>
 		public ulong GetSize()
 		{
-			// This method assumes 64-bit pointers/references and Unicode
-			// strings (i.e. 2 bytes per character)
+			ulong uSize = 128; // Approx fixed length data
 
-			ulong cb = 276; // Number of bytes; approx. fixed length data
-			ulong cc = 0; // Number of characters
-
-			cb += (ulong)m_dStrings.UCount * 40;
-			foreach (KeyValuePair<string, ProtectedString> kvpStr in m_dStrings)
-				cc += (ulong)kvpStr.Key.Length + (ulong)kvpStr.Value.Length;
-
-			cb += (ulong)m_dBinaries.UCount * 65;
-			foreach (KeyValuePair<string, ProtectedBinary> kvpBin in m_dBinaries)
+			foreach (KeyValuePair<string, ProtectedString> kvpStr in m_listStrings)
 			{
-				cc += (ulong)kvpBin.Key.Length;
-				cb += (ulong)kvpBin.Value.Length;
+				uSize += (ulong)kvpStr.Key.Length;
+				uSize += (ulong)kvpStr.Value.Length;
 			}
 
-			cc += (ulong)m_cfgAutoType.DefaultSequence.Length;
-			cb += (ulong)m_cfgAutoType.AssociationsCount * 24;
-			foreach (AutoTypeAssociation a in m_cfgAutoType.Associations)
-				cc += (ulong)a.WindowName.Length + (ulong)a.Sequence.Length;
+			foreach (KeyValuePair<string, ProtectedBinary> kvpBin in m_listBinaries)
+			{
+				uSize += (ulong)kvpBin.Key.Length;
+				uSize += kvpBin.Value.Length;
+			}
 
-			cb += (ulong)m_lHistory.UCount * 8;
-			foreach (PwEntry peHistory in m_lHistory)
-				cb += peHistory.GetSize();
+			uSize += (ulong)m_listAutoType.DefaultSequence.Length;
+			foreach (AutoTypeAssociation a in m_listAutoType.Associations)
+			{
+				uSize += (ulong)a.WindowName.Length;
+				uSize += (ulong)a.Sequence.Length;
+			}
 
-			cc += (ulong)m_strOverrideUrl.Length;
+			foreach (PwEntry peHistory in m_listHistory)
+				uSize += peHistory.GetSize();
 
-			cb += (ulong)m_lTags.Count * 8;
-			foreach (string strTag in m_lTags)
-				cc += (ulong)strTag.Length;
+			uSize += (ulong)m_strOverrideUrl.Length;
+
+			foreach (string strTag in m_vTags)
+				uSize += (ulong)strTag.Length;
 
-			cb += (ulong)m_dCustomData.Count * 16;
 			foreach (KeyValuePair<string, string> kvp in m_dCustomData)
-				cc += (ulong)kvp.Key.Length + (ulong)kvp.Value.Length;
+				uSize += (ulong)kvp.Key.Length + (ulong)kvp.Value.Length;
 
-			return (cb + (cc << 1));
+			return uSize;
 		}
 
 		public bool HasTag(string strTag)
 		{
 			if (string.IsNullOrEmpty(strTag)) { Debug.Assert(false); return false; }
 
-			// this.Tags normalizes
-			return this.Tags.Contains(StrUtil.NormalizeTag(strTag));
+			for (int i = 0; i < m_vTags.Count; ++i)
+			{
+				if (m_vTags[i].Equals(strTag, StrUtil.CaseIgnoreCmp)) return true;
+			}
+
+			return false;
 		}
 
 		public bool AddTag(string strTag)
 		{
 			if (string.IsNullOrEmpty(strTag)) { Debug.Assert(false); return false; }
 
-			strTag = StrUtil.NormalizeTag(strTag);
-			if (this.Tags.Contains(strTag)) return false; // this.Tags normalizes
+			for (int i = 0; i < m_vTags.Count; ++i)
+			{
+				if (m_vTags[i].Equals(strTag, StrUtil.CaseIgnoreCmp)) return false;
+			}
 
-			m_lTags.Add(strTag);
+			m_vTags.Add(strTag);
 			return true;
 		}
 
@@ -885,17 +855,16 @@ namespace KeePassLib
 		{
 			if (string.IsNullOrEmpty(strTag)) { Debug.Assert(false); return false; }
 
-			// this.Tags normalizes
-			return this.Tags.Remove(StrUtil.NormalizeTag(strTag));
-		}
+			for (int i = 0; i < m_vTags.Count; ++i)
+			{
+				if (m_vTags[i].Equals(strTag, StrUtil.CaseIgnoreCmp))
+				{
+					m_vTags.RemoveAt(i);
+					return true;
+				}
+			}
 
-		internal List<string> GetTagsInherited()
-		{
-			List<string> l = ((m_pParentGroup != null) ?
-				m_pParentGroup.GetTagsInherited(false) : new List<string>());
-			l.AddRange(this.Tags);
-			StrUtil.NormalizeTags(l);
-			return l;
+			return false;
 		}
 
 		public bool IsContainedIn(PwGroup pgContainer)
@@ -917,8 +886,10 @@ namespace KeePassLib
 
 			if (bAlsoChangeHistoryUuids)
 			{
-				foreach (PwEntry peHist in m_lHistory)
+				foreach (PwEntry peHist in m_listHistory)
+				{
 					peHist.Uuid = pwNewUuid;
+				}
 			}
 		}