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

Serbian translation

.gitignore

@@ -160,3 +160,13 @@ 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

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "src/SamsungPass"]
 	path = src/SamsungPass
 	url = https://github.com/PhilippC/Xamarin-Samsung-Pass.git
-[submodule "src/netftpandroid"]
-	path = src/netftpandroid
-	url = https://github.com/PhilippC/netftpandroid.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

crowdin.yml

@@ -4,3 +4,31 @@ files:
       /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/Documentation.md

@@ -28,14 +28,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 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.
+* You can enable the Keepass2Android Autofill service in the system's Autofill settings (Android 8+) which allows to fill data using Android's accessibility system. This works with many apps including Firefox browser but is not supported for Chrome (when writing this).
+* The clipboard based approach can be used as well: Pull the notification bar down and select "Copy username/password to clipboard". Then long-tap the field where you want to paste the data. A small "paste" button should come up. Note, however, that information in the clipboard can be monitored by all apps on your device and clearing the clipboard is not always possible.
 
 These options can be used in different workflows:
 ### Browser-based workflow
 If you are browsing the web and need to enter crendentials for a webpage, a simple and powerful workflow is to use the "Share URL" option from the browser's menu. Then select Keepass2Android (or KP2A Offline). Open your database (if it's not already opened) and select the entry you want to enter (if KP2A did not already select the appropriate entry). Use the built-in keyboard or the clipboard to enter the password.
 ### Autofill service based workflow
-If you have enabled the autofill service and open a (supported) app with a password field, a 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.
+If you have enabled the autofill service and open a (supported) app with a password field, a dropdown appears. Select "Fill with Keepass2Android" to select the appropriate entry. When you return to the app, the password and user field should be filled already.
 ### KP2A based workflow for websites
 Open KP2A, open your database, select your entry (in this step, the notification bar items should show up already). Now click the URL link of the entry to open a browser window with the website. Use one of the methods described above to enter the credentials. 
 ### KP2A Keyboard based workflow
@@ -70,16 +70,51 @@ Please see the [Advanced usage of the Keepass2Android keyboard](Advanced-usage-o
 
 # 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!
+## 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. 
 
-* Why is Keepass2Android so big?
+## Doesn't Keepass2Android create automatic backups?
+Yes and no. Yes: Keepass2Android stores the last successfully opened file as a read-only backup locally on the phone (unless you disable this is in the settings). This should make sure that even if the file gets destroyed during a save operation or gets deleted by accident, you should always have a version that can be opened. (Don't mix this up with the internal file cache which is not meant as a backup and can easily be overwritten even with a corrupt file. This internal file cache is meant for providing writable access even when the original file is not reachable, e.g. when you're offline.)
+No: The local backup has two shortcomings: It is only one backup and does not allow to revert to older versions. So if you deleted an entry from the database, it might be deleted in the local backup soon as well. The even more important shortcoming is that it is just a local backup. It won't help when your phone gets lost or broken. Please create additional backups on seperate storage!
+
+## How do I backup the database?
+If you have stored your database on the cloud, you might rely on your cloud storage providers backups. Make sure they allow you to revert to older revisions in case the file gets corrupted for some reason.
+If you are working with a local database file, make sure you create regular backups. I suggest you have an aumotated mechanism, e.g. with FolderSync (Lite) which can copy local files from your device to other locations, e.g. your PC in a local network. You can also use USB or tools like MyPhoneExploror to transfer data to your PC. Or, you use a removable storage like an SD card which you keep in a safe place after making the backup. 
+In all cases, you need to verify that your backup is readable! It's even best to test this on another device (e.g. a PC), so you simulate the case that you may lose your phone.
+
+## I can open my database with fingerprint, but don't remember my master password!
+It's time for action! As soon as possible, select Settings - Database - Export and choose unencrypted XML (don't put this on the cloud but on a local file). Transfer this file to a PC and import it to a new kdbx file, e.g. with Keepass2. Choose a new master password and make sure you don't forget this password! 
+
+## How can I transfer data from one device to another?
+  * If you are about to get a new Android device, you should make sure you're not losing your passwords in the transition! The first thing you need to make sure is that you can access your .kdbx file (which stores the passwords) on the new device. If it is already stored in the cloud, you only need to make sure you know how to setup the cloud storage on the new device (it might require a password, so make sure you have access to that!). 
+  * If the .kdbx-file is stored locally on the old device, make sure you have an up-to-date backup (see above). You can then transfer that backup copy to the new device. (Note: transferring via USB causes data corruption in some cases, use MyPhoneExplorer or similar tools to be sure this does not happen.)
+  * If you are securing your password database with a keyfile, also transfer this key file to the new device.
+  * If you are opening your database with a fingerprint, make sure you also know the master password because fingerprint will not be available immediately on the new device.
+
+## Why is Keepass2Android's apk so big?
 Please see [Keepass2Android Apk](Keepass2Android-Apk.md) for more information.
 
+## I get a message "File is trashed" when reading or writing a file on Google Drive
+This happens because ocaml-fuse (I guess you are on Linux  and use that) moves files to trash and then creates a new one instead of correctly updating the file on Google Drive (each file has a unique ID which Keepass2Android uses). Fortunately, this was fixed: https://github.com/astrada/google-drive-ocamlfuse/issues/494After 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.

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

@@ -54,7 +54,7 @@ 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)). 
+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)
 

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/README.md

@@ -1,3 +1,6 @@
+<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.
@@ -10,9 +13,10 @@ Beta-releases can be obtained by opting in to the [Beta testing channel](https:/
 # 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).
 
-[![Build Status](https://www.bitrise.io/app/43a23ab54dee9f7e/status.svg?token=2vryTsMQzTX3XRPikhgRwA&branch=master)](https://www.bitrise.io/app/43a23ab54dee9f7e)
+[![Build Status](https://www.bitrise.io/app/43a23ab54dee9f7e/status.svg?token=2vryTsMQzTX3XRPikhgRwA&branch=nonet)](https://www.bitrise.io/app/43a23ab54dee9f7e)

src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj

@@ -10,8 +10,9 @@
     <RootNamespace>AndroidFileChooserBinding</RootNamespace>
     <AssemblyName>AndroidFileChooserBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/JavaFileStorageBindings/JavaFileStorageBindings.csproj

@@ -10,8 +10,10 @@
     <RootNamespace>JavaFileStorageBindings</RootNamespace>
     <AssemblyName>JavaFileStorageBindings</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,18 +83,8 @@
     </XamarinComponentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AdalBindings\AdalBindings.csproj">
-      <Project>{0b109c0e-0514-4340-8779-5bd6a0dde84e}</Project>
-      <Name>AdalBindings</Name>
-    </ProjectReference>
     <ProjectReference Include="..\PCloudBindings\PCloudBindings.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <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" />
   </ItemGroup>
@@ -148,12 +140,18 @@
     <EmbeddedReferenceJar Include="Jars\jackson-core-2.7.4.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
+    <EmbeddedJar Include="Jars\dropbox-core-sdk-3.1.1.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
+    <EmbeddedReferenceJar Include="Jars\gson-2.8.1.jar" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" />
+    <EmbeddedReferenceJar Include="Jars\okhttp-digest-2.5.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okio-2.9.0.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okhttp-4.10.0-RC1.jar" />
   </ItemGroup>
 </Project>

src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj

@@ -10,8 +10,9 @@
     <RootNamespace>KP2AKdbLibraryBinding</RootNamespace>
     <AssemblyName>KP2AKdbLibraryBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,10 +53,11 @@
     <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">
@@ -65,9 +67,7 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\java\KP2AKdbLibrary\bin\kp2akdblibrary.jar">
-      <Link>Jars\kp2akdblibrary.jar</Link>
-    </EmbeddedJar>
+    <Folder Include="libs\" />
   </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. 

src/KeePass.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29418.71
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib2Android", "KeePassLib2Android\KeePassLib2Android.csproj", "{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}"
 EndProject
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aBusinessLogic", "Kp2aBu
 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}"
@@ -23,14 +21,10 @@ 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}") = "System.Net.FtpClient.Android", "netftpandroid\System.Net.FtpClient\System.Net.FtpClient.Android.csproj", "{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamsungPass", "SamsungPass\Xamarin.SamsungPass\SamsungPass\SamsungPass.csproj", "{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCloudBindings", "PCloudBindings\PCloudBindings.csproj", "{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdalBindings", "AdalBindings\AdalBindings.csproj", "{0B109C0E-0514-4340-8779-5BD6A0DDE84E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,8 +107,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
@@ -191,8 +185,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
@@ -209,8 +203,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
@@ -227,8 +221,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
@@ -257,24 +251,6 @@ 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
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|Win32.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Release|x64.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.ReleaseNoNet|x64.ActiveCfg = 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
@@ -317,30 +293,6 @@ Global
 		{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
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|Win32.Build.0 = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Debug|x64.Build.0 = Debug|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|Win32.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|x64.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.Release|x64.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{0B109C0E-0514-4340-8779-5BD6A0DDE84E}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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,6 +144,7 @@ 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.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace KeePassLib.Cryptography.KeyDerivation
@@ -127,8 +128,44 @@ namespace KeePassLib.Cryptography.KeyDerivation
 			byte[] pbSecretKey = p.GetByteArray(ParamSecretKey);
 			byte[] pbAssocData = p.GetByteArray(ParamAssocData);
 
+			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);
+			}
+
+			byte[] 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();
 			return pbRet;
@@ -143,5 +180,14 @@ 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/KeePassLib2Android.csproj

@@ -12,8 +12,8 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AssemblyName>KeePassLib2Android</AssemblyName>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <NuGetPackageImportStamp>8482b288</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/KeePassLib2Android/Keys/IUserKey.cs

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

src/KeePassLib2Android/Keys/KcpCustomKey.cs

@@ -45,7 +45,12 @@ namespace KeePassLib.Keys
 			get { return m_pbKey; }
 		}
 
-		public KcpCustomKey(string strName, byte[] pbKeyData, bool bPerformHash)
+	    public uint GetMinKdbxVersion()
+	    {
+	        return 0;
+	    }
+
+	    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.cs

@@ -64,7 +64,12 @@ namespace KeePassLib.Keys
 			get { return m_pbKeyData; }
 		}
 
-		public IOConnectionInfo Ioc
+	    public uint GetMinKdbxVersion()
+	    {
+	        return 0;
+	    }
+
+	    public IOConnectionInfo Ioc
 		{
 			get { return m_ioc; }
 		}

src/KeePassLib2Android/Keys/KcpPassword.cs

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

src/KeePassLib2Android/Keys/KcpUserAccount.cs

@@ -21,7 +21,6 @@
 
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Security;
 
 #if !KeePassUAP
@@ -60,7 +59,12 @@ namespace KeePassLib.Keys
 			get { return m_pbKeyData; }
 		}
 
-		/// <summary>
+	    public uint GetMinKdbxVersion()
+	    {
+	        return 0;
+	    }
+
+	    /// <summary>
 		/// Construct a user account key.
 		/// </summary>
 		public KcpUserAccount()
@@ -73,26 +77,7 @@ namespace KeePassLib.Keys
 		//	m_pbKeyData = null;
 		// }
 
-		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)
+	    private static byte[] LoadUserKey(bool bShowWarning)
 		{
 			byte[] pbKey = null;
 

src/KeePassLib2Android/Kp2aLog.cs

@@ -85,8 +85,8 @@ namespace keepass2android
 		{
 			if (!File.Exists(LogFilename))
 			{
-				File.Create(LogFilename);
-				_logToFile = true;
+				File.Create(LogFilename).Dispose();
+                _logToFile = true;
 			}
 			
 
@@ -100,8 +100,7 @@ namespace keepass2android
 				int count = 0;
 				while (File.Exists(LogFilename + "." + count))
 					count++;
-                if (count > 0)
-				    File.Move(LogFilename, LogFilename + "." + count);
+                File.Move(LogFilename, LogFilename + "." + count);
 				
 			}
 				

src/KeePassLib2Android/Native/NativeLib.cs

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

src/KeePassLib2Android/PwDatabase.cs

@@ -485,12 +485,6 @@ namespace KeePassLib
 			set { m_pbHashOfLastIO = value; }
 		}
 
-		public bool UseFileTransactions
-		{
-			get { return m_bUseFileTransactions; }
-			set { m_bUseFileTransactions = value; }
-		}
-
 		public bool UseFileLocks
 		{
 			get { return m_bUseFileLocks; }
@@ -593,7 +587,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)
+		public void New(IOConnectionInfo ioConnection, CompositeKey pwKey, string filenameWithoutPathAndExt)
 		{
 			Debug.Assert(ioConnection != null);
 			if(ioConnection == null) throw new ArgumentNullException("ioConnection");
@@ -608,26 +602,11 @@ namespace KeePassLib
 			m_bDatabaseOpened = true;
 			m_bModified = true;
 
-			m_pgRootGroup = new PwGroup(true, true,
-				UrlUtil.StripExtension(UrlUtil.GetFileName(ioConnection.Path)),
+			m_pgRootGroup = new PwGroup(true, true, filenameWithoutPathAndExt,
 				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.
@@ -675,37 +654,7 @@ 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.
@@ -723,46 +672,6 @@ 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

src/KeePassLib2Android/Serialization/IOConnectionInfo.cs

@@ -360,5 +360,12 @@ namespace KeePassLib.Serialization
 				m_ioCredProtMode = IOCredProtMode.None;
 			}
 		}
+
+	    public bool IsSameFileAs(IOConnectionInfo other)
+	    {
+	        if (other == null)
+	            return false;
+	        return Path == other.Path && UserName == other.UserName;
+	    }
 	}
 }

src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs

@@ -23,7 +23,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Xml;
-
+using keepass2android;
 #if !KeePassUAP
 using System.Drawing;
 #endif
@@ -872,8 +872,17 @@ namespace KeePassLib.Serialization
 					pb = pb8;
 				}
 				long lSec = MemUtil.BytesToInt64(pb);
-				return new DateTime(lSec * TimeSpan.TicksPerSecond, DateTimeKind.Utc);
-			}
+                try
+                {
+                    return new DateTime(lSec * TimeSpan.TicksPerSecond, DateTimeKind.Utc);
+                }
+                catch (System.ArgumentOutOfRangeException e)
+                {
+                    //files might contain bad data, e.g. see #868. Fall back to MinValue
+                    Kp2aLog.Log("Failed to read date from file.");
+                    return DateTime.MinValue;
+                }
+            }
 			else
 			{
 				string str = ReadString(xr);

src/KeePassLib2Android/Serialization/KdbxFile.Read.cs

@@ -581,7 +581,7 @@ namespace KeePassLib.Serialization
 			return vEntries; */
 
 			PwDatabase pd = new PwDatabase();
-			pd.New(new IOConnectionInfo(), new CompositeKey());
+			pd.New(new IOConnectionInfo(), new CompositeKey(), "");
 
 			KdbxFile f = new KdbxFile(pd);
 			f.Load(msData, KdbxFormat.PlainXml, null);

src/KeePassLib2Android/Serialization/KdbxFile.Write.cs

@@ -1048,7 +1048,7 @@ namespace KeePassLib.Serialization
 			return true; */
 
 			PwDatabase pd = new PwDatabase();
-			pd.New(new IOConnectionInfo(), new CompositeKey());
+			pd.New(new IOConnectionInfo(), new CompositeKey(), "");
 
 			PwGroup pg = pd.RootGroup;
 			if (pg == null) { Debug.Assert(false); return false; }

src/KeePassLib2Android/Serialization/KdbxFile.cs

@@ -23,6 +23,7 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Security;
 using System.Text;
 using System.Xml;
@@ -126,8 +127,8 @@ namespace KeePassLib.Serialization
 		/// </summary>
 		private const uint FileVersion32 = 0x00040000;
 
-		internal const uint FileVersion32_4 = 0x00040000; // First of 4.x series
-		internal const uint FileVersion32_3 = 0x00030001; // Old format 3.1
+		public const uint FileVersion32_4 = 0x00040000; // First of 4.x series
+		public const uint FileVersion32_3 = 0x00030001; // Old format 3.1
 
 		private const uint FileVersionCriticalMask = 0xFFFF0000;
 
@@ -372,16 +373,22 @@ namespace KeePassLib.Serialization
 		{
 			if(m_uForceVersion != 0) return m_uForceVersion;
 
-			// See also KeePassKdb2x3.Export (KDBX 3.1 export module)
+            // See also KeePassKdb2x3.Export (KDBX 3.1 export module)
+		    uint minVersionForKeys = m_pwDatabase.MasterKey.UserKeys.Select(key => key.GetMinKdbxVersion()).Max();
 
-			AesKdf kdfAes = new AesKdf();
+		    uint minRequiredVersion = Math.Max(minVersionForKeys, m_uFileVersion); //don't save a version lower than what we read
+
+
+            AesKdf kdfAes = new AesKdf();
 			if(!kdfAes.Uuid.Equals(m_pwDatabase.KdfParameters.KdfUuid))
-				return FileVersion32;
+				return Math.Max(FileVersion32, minRequiredVersion);
 
 			if(m_pwDatabase.PublicCustomData.Count > 0)
-				return FileVersion32;
+			    return Math.Max(FileVersion32, minRequiredVersion);
 
-			bool bCustomData = false;
+
+
+            bool bCustomData = false;
 			GroupHandler gh = delegate(PwGroup pg)
 			{
 				if(pg == null) { Debug.Assert(false); return true; }
@@ -396,9 +403,10 @@ namespace KeePassLib.Serialization
 			};
 			gh(m_pwDatabase.RootGroup);
 			m_pwDatabase.RootGroup.TraverseTree(TraversalMethod.PreOrder, gh, eh);
-			if(bCustomData) return FileVersion32;
+			if(bCustomData)
+			    return Math.Max(FileVersion32, minRequiredVersion);
 
-			return FileVersion32_3; // KDBX 3.1 is sufficient
+            return Math.Max(FileVersion32_3, minRequiredVersion); ; // KDBX 3.1 is sufficient
 		}
 
 		private void ComputeKeys(out byte[] pbCipherKey, int cbCipherKey,

src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs

@@ -26,11 +26,11 @@ namespace KeePassLib.Serialization
 		/// <summary>
 		/// Determines whether the database pointed to by the specified ioc should be (de)serialised in default (xml) or protocol buffers format.
 		/// </summary>
-		public static KdbxFormat GetFormatToUse(IOConnectionInfo ioc)
+		public static KdbxFormat GetFormatToUse(string fileExt)
 		{
-			// If the filename ends in .kdbp, use ProtocolBuffers format.
-			return UrlUtil.GetExtension(UrlUtil.GetFileName(ioc.Path)).Equals(KdbpFile.FileNameExtension, StringComparison.OrdinalIgnoreCase) ? KdbxFormat.ProtocolBuffers : KdbxFormat.Default;
-		}
+            return fileExt.Equals(KdbpFile.FileNameExtension, StringComparison.OrdinalIgnoreCase) ? KdbxFormat.ProtocolBuffers :
+                (fileExt.Equals("xml", StringComparison.OrdinalIgnoreCase) ? KdbxFormat.PlainXml : KdbxFormat.Default);
+        }
 
 		public static void WriteDocument(PwDatabase database, Stream stream, byte[] protectedStreamKey, byte[] hashOfHeader)
 		{

src/Kp2aBusinessLogic/ElementAndDatabaseId.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using keepass2android.Io;
+using KeePassLib;
+using KeePassLib.Interfaces;
+using KeePassLib.Utility;
+
+namespace keepass2android
+{
+    public class ElementAndDatabaseId
+    {
+        private const char Separator = '+';
+
+        public ElementAndDatabaseId(Database db, IStructureItem element)
+        {
+            DatabaseId = db.IocAsHexString();
+            ElementIdString = element.Uuid.ToHexString();
+        }
+
+        public ElementAndDatabaseId(string fullId)
+        {
+            string[] parts = fullId.Split(Separator);
+            if (parts.Length != 2)
+                throw new Exception("Invalid full id " + fullId);
+            DatabaseId = parts[0];
+            ElementIdString = parts[1];
+        }
+
+        public string DatabaseId { get; set; }
+        public string ElementIdString { get; set; }
+        public PwUuid ElementId {  get {  return new PwUuid(MemUtil.HexStringToByteArray(ElementIdString));} }
+
+        public string FullId
+        {
+            get { return DatabaseId + Separator + ElementIdString; }
+        }
+    }
+}

src/Kp2aBusinessLogic/IKp2aApp.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using Android.App;
@@ -9,7 +10,8 @@ using KeePassLib;
 using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using keepass2android.Io;
-#if !NoNet
+using KeePassLib.Interfaces;
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 using Keepass2android.Javafilestorage;
 #endif 
 
@@ -27,37 +29,47 @@ namespace keepass2android
 
 	}
 
-	/// <summary>
+    /// <summary>
 	/// Interface through which Activities and the logic layer can access some app specific functionalities and Application static data
 	/// </summary>
 	/// This also contains methods which are UI specific and should be replacable for testing.
 	public interface IKp2aApp : ICertificateValidationHandler
 	{
-		/// <summary>
-		/// Locks the currently open database, quicklocking if available (unless false is passed for allowQuickUnlock)
-		/// </summary>
-		void LockDatabase(bool allowQuickUnlock = true);
+        /// <summary>
+        /// Locks all currently open databases, quicklocking if available (unless false is passed for allowQuickUnlock)
+        /// </summary>
+        void Lock(bool allowQuickUnlock, bool lockWasTriggeredByTimeout);
 
-		/// <summary>
-		/// Loads the specified data as the currently open database, as unlocked.
-		/// </summary>
-		void LoadDatabase(IOConnectionInfo ioConnectionInfo, MemoryStream memoryStream, CompositeKey compKey,
-		                  ProgressDialogStatusLogger statusLogger, IDatabaseFormat databaseFormat);
 
-		/// <summary>
-		/// Returns the current database
-		/// </summary>
-		Database GetDb();
+        /// <summary>
+        /// Loads the specified data as the currently open database, as unlocked.
+        /// </summary>
+        Database LoadDatabase(IOConnectionInfo ioConnectionInfo, MemoryStream memoryStream, CompositeKey compKey, ProgressDialogStatusLogger statusLogger, IDatabaseFormat databaseFormat, bool makeCurrent);
 
-		/// <summary>
-		/// Tell the app that the file from ioc was opened with keyfile.
-		/// </summary>
-		void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile, string displayName = "");
+
+	    HashSet<PwGroup> DirtyGroups { get; }
+
+	    void MarkAllGroupsAsDirty();
+
+        /// <summary>
+        /// Returns the current database
+        /// </summary>
+	    Database CurrentDb { get; }
+
+	    IEnumerable<Database> OpenDatabases { get; }
+	    void CloseDatabase(Database db);
+
+	    Database FindDatabaseForElement(IStructureItem element);
+        
+        /// <summary>
+        /// Tell the app that the file from ioc was opened with keyfile.
+        /// </summary>
+        void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile, bool updateTimestamp, string displayName = "");
 
 		/// <summary>
 		/// Creates a new database and returns it
 		/// </summary>
-		Database CreateNewDatabase();
+		Database CreateNewDatabase(bool makeCurrent);
 
 		/// <summary>
 		/// Returns the user-displayable string identified by stringKey
@@ -76,7 +88,8 @@ namespace keepass2android
 		                    EventHandler<DialogClickEventArgs> yesHandler,
 		                    EventHandler<DialogClickEventArgs> noHandler,
 		                    EventHandler<DialogClickEventArgs> cancelHandler,
-		                    Context ctx);
+		                    Context ctx,
+                            string messageSuffix = "");
 
 		/// <summary>
 		/// Asks the user the question "messageKey" with the options Yes/No/Cancel, but the yes/no strings can be selected freely, calls the handler corresponding to the answer.
@@ -86,7 +99,8 @@ namespace keepass2android
 		                    EventHandler<DialogClickEventArgs> yesHandler,
 		                    EventHandler<DialogClickEventArgs> noHandler,
 		                    EventHandler<DialogClickEventArgs> cancelHandler,
-		                    Context ctx);
+		                    Context ctx,
+		                    string messageSuffix = "");
 
 		/// <summary>
 		/// Returns a Handler object which can run tasks on the UI thread
@@ -109,8 +123,12 @@ namespace keepass2android
 
 		
 		bool CheckForDuplicateUuids { get; }
-#if !NoNet
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 		ICertificateErrorHandler CertificateErrorHandler { get; }
+	    
+
+
 #endif
+	    
 	}
 }

src/Kp2aBusinessLogic/Io/AndroidContentStorage.cs

@@ -82,7 +82,12 @@ namespace keepass2android.Io
 		        UrlUtil.GetFileName(ioc.Path));
         }
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return UrlUtil.GetExtension(ioc.Path);
+        }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return false;
 		}
@@ -207,8 +212,7 @@ namespace keepass2android.Io
 
 		public IOConnectionInfo GetParentPath(IOConnectionInfo ioc)
 		{
-			//TODO: required for OTP Aux file retrieval
-			throw new NotImplementedException();
+		    return IoUtil.GetParentPath(ioc);
 		}
 
 		public IOConnectionInfo GetFilePath(IOConnectionInfo folderPath, string filename)
@@ -266,7 +270,7 @@ namespace keepass2android.Io
 					}
 					else return false;
 				}
-				else throw new Exception("couldn't move to first result element: " + (cursor == null) + uri.ToString());
+				else return false;
 			}
 			catch (Exception e)
 			{
@@ -329,12 +333,13 @@ namespace keepass2android.Io
 
 		public void CommitWrite()
 		{
-		    ParcelFileDescriptor fileDescriptor = _ctx.ContentResolver.OpenFileDescriptor(Android.Net.Uri.Parse(_path), "w");
+		    ParcelFileDescriptor fileDescriptor = _ctx.ContentResolver.OpenFileDescriptor(Android.Net.Uri.Parse(_path), "rwt");
             
             using (var outputStream = new FileOutputStream(fileDescriptor.FileDescriptor))
 			{
 				byte[] data = _memoryStream.ToArray();
-				outputStream.Write(data, 0, data.Length);
+                
+				outputStream.Write(data);
 			    outputStream.Close();
 			}
             fileDescriptor.Close();

src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs

@@ -12,13 +12,10 @@ using Android.Content;
 using Android.Content.PM;
 using Android.OS;
 using Android.Preferences;
-using Android.Support.V13.App;
-using Android.Support.V4.App;
 using Java.IO;
-using Java.Util;
+using Android.Support.V4;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
-using ActivityCompat = Android.Support.V13.App.ActivityCompat;
 using File = System.IO.File;
 using FileNotFoundException = System.IO.FileNotFoundException;
 using IOException = System.IO.IOException;
@@ -204,7 +201,12 @@ namespace keepass2android.Io
 
 		}
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return UrlUtil.GetExtension(ioc.Path);
+        }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return (!ioc.IsLocalFile()) && (ioc.CredSaveMode != IOCredSaveMode.SaveCred);
 		}
@@ -255,7 +257,8 @@ namespace keepass2android.Io
 			if (ioc.IsLocalFile())
 			{
 				bool requiresPermission = !(ioc.Path.StartsWith(activity.Activity.FilesDir.CanonicalPath)
-												|| ioc.Path.StartsWith(IoUtil.GetInternalDirectory(activity.Activity).CanonicalPath));
+												|| ioc.Path.StartsWith(IoUtil.GetInternalDirectory(activity.Activity).CanonicalPath)
+				                            || ioc.Path.StartsWith(IoUtil.GetInternalDirectory(activity.Activity).CanonicalPath));
 				
 				var extDirectory = activity.Activity.GetExternalFilesDir(null);
 				if ((extDirectory != null) && (ioc.Path.StartsWith(extDirectory.CanonicalPath)))

src/Kp2aBusinessLogic/Io/CachingFileStorage.cs

@@ -65,22 +65,28 @@ namespace keepass2android.Io
 		
 		protected readonly OfflineSwitchableFileStorage _cachedStorage;
 		private readonly ICacheSupervisor _cacheSupervisor;
-		private readonly string _streamCacheDir;
+		private readonly string _legacyCacheDir;
+	    private readonly string _cacheDir;
 
-		public CachingFileStorage(IFileStorage cachedStorage, string cacheDir, ICacheSupervisor cacheSupervisor)
+        public CachingFileStorage(IFileStorage cachedStorage, Context cacheDirContext, ICacheSupervisor cacheSupervisor)
 		{
 			_cachedStorage = new OfflineSwitchableFileStorage(cachedStorage);
 			_cacheSupervisor = cacheSupervisor;
-			_streamCacheDir = cacheDir + Java.IO.File.Separator + "OfflineCache" + Java.IO.File.Separator;
-			if (!Directory.Exists(_streamCacheDir))
-				Directory.CreateDirectory(_streamCacheDir);
-			
-		}
+			_legacyCacheDir = cacheDirContext.CacheDir.Path + Java.IO.File.Separator + "OfflineCache" + Java.IO.File.Separator;
+			if (!Directory.Exists(_legacyCacheDir))
+				Directory.CreateDirectory(_legacyCacheDir);
+
+		    _cacheDir = IoUtil.GetInternalDirectory(cacheDirContext).Path + Java.IO.File.Separator + "OfflineCache" + Java.IO.File.Separator;
+		    if (!Directory.Exists(_cacheDir))
+		        Directory.CreateDirectory(_cacheDir);
+
+        }
 
 		public void ClearCache()
 		{
-			IoUtil.DeleteDir(new Java.IO.File(_streamCacheDir), true);
-		}
+			IoUtil.DeleteDir(new Java.IO.File(_legacyCacheDir), true);
+		    IoUtil.DeleteDir(new Java.IO.File(_cacheDir), true);
+        }
 
 		public IEnumerable<string> SupportedProtocols { get { return _cachedStorage.SupportedProtocols; } }
 
@@ -105,7 +111,11 @@ namespace keepass2android.Io
 		{
 			SHA256Managed sha256 = new SHA256Managed();
 			string iocAsHexString = MemUtil.ByteArrayToHexString(sha256.ComputeHash(Encoding.Unicode.GetBytes(ioc.Path.ToCharArray())))+".cache";
-			return _streamCacheDir + iocAsHexString;
+		    if (File.Exists(_legacyCacheDir + iocAsHexString))
+		        return _legacyCacheDir + iocAsHexString;
+
+		    return _cacheDir + iocAsHexString;
+
 		}
 
 		public bool IsCached(IOConnectionInfo ioc)
@@ -168,7 +178,9 @@ namespace keepass2android.Io
 				if (!IsCached(ioc))
 					throw;
 
-				Kp2aLog.Log("couldn't open from remote " + ioc.Path);
+#if DEBUG
+                Kp2aLog.Log("couldn't open from remote " + ioc.Path);
+#endif
 				Kp2aLog.Log(ex.ToString());
 
 				_cacheSupervisor.CouldntOpenFromRemote(ioc, ex);
@@ -436,7 +448,12 @@ namespace keepass2android.Io
 			return _cachedStorage.GetFilenameWithoutPathAndExt(ioc);
 		}
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return _cachedStorage.GetFileExtension(ioc);
+	    }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return _cachedStorage.RequiresCredentials(ioc);
 		}

src/Kp2aBusinessLogic/Io/IFileStorage.cs

@@ -88,11 +88,13 @@ namespace keepass2android.Io
 		IWriteTransaction OpenWriteTransaction(IOConnectionInfo ioc, bool useFileTransaction);
 
 		string GetFilenameWithoutPathAndExt(IOConnectionInfo ioc);
-		
-		/// <summary>
-		/// Returns true if the the given ioc must be filled with username/password
-		/// </summary>
-		bool RequiresCredentials(IOConnectionInfo ioc);
+
+	    string GetFileExtension(IOConnectionInfo ioc);
+
+        /// <summary>
+        /// Returns true if the the given ioc must be filled with username/password
+        /// </summary>
+        bool RequiresCredentials(IOConnectionInfo ioc);
 
 		/// <summary>
 		/// Creates the directory described by ioc

src/Kp2aBusinessLogic/Io/IoUtil.cs

@@ -128,10 +128,12 @@ namespace keepass2android.Io
 		}
 
         //creates a local ioc where the sourceIoc can be stored to
-	    public static IOConnectionInfo GetInternalIoc(IOConnectionInfo sourceIoc, Context ctx)
+	    public static IOConnectionInfo GetInternalIoc(IOConnectionInfo sourceIoc, Context ctx, IKp2aApp app)
 	    {
 	        Java.IO.File internalDirectory = IoUtil.GetInternalDirectory(ctx);
-	        string targetPath = UrlUtil.GetFileName(sourceIoc.Path);
+	        var filestorage = app.GetFileStorage(sourceIoc);
+
+	        string targetPath = filestorage.GetFilenameWithoutPathAndExt(sourceIoc);
 	        targetPath = targetPath.Trim("|\\?*<\":>+[]/'".ToCharArray());
 	        if (targetPath == "")
 	            targetPath = "internal";
@@ -153,7 +155,7 @@ namespace keepass2android.Io
 
 	    public static IOConnectionInfo ImportFileToInternalDirectory(IOConnectionInfo sourceIoc, Context ctx, IKp2aApp app)
 	    {
-	        var targetIoc = GetInternalIoc(sourceIoc, ctx);
+	        var targetIoc = GetInternalIoc(sourceIoc, ctx, app);
 
 
             IoUtil.Copy(targetIoc, sourceIoc, app);

src/Kp2aBusinessLogic/Io/JavaFileStorage.cs

@@ -177,7 +177,12 @@ namespace keepass2android.Io
 					_jfs.GetFilename(IocToPath(ioc)));
 		}
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return UrlUtil.GetExtension(ioc.Path);
+        }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return false;
 		}
@@ -233,7 +238,6 @@ namespace keepass2android.Io
 
 		public FileDescription GetFileDescription(IOConnectionInfo ioc)
 		{
-			Kp2aLog.Log("GetFileDescription "+ioc.Path);
 			try
 			{
 				return ConvertToFileDescription(Jfs.GetFileEntry(IocToPath(ioc)));
@@ -302,7 +306,9 @@ namespace keepass2android.Io
 
 		public void OnResume(IFileStorageSetupActivity activity)
 		{
+#if DEBUG
 			Kp2aLog.Log("JFS/OnResume Ioc.Path=" +activity.Ioc.Path+". Path="+((IJavaFileStorageFileStorageSetupActivity)activity).Path);
+#endif
 			_jfs.OnResume(((IJavaFileStorageFileStorageSetupActivity) activity));
 		}
 
@@ -366,4 +372,4 @@ namespace keepass2android.Io
 		}
 	}
 #endif
-}
+        }

src/Kp2aBusinessLogic/Io/NetFtpFileStorage.cs

@@ -3,12 +3,12 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Net.FtpClient;
 using System.Reflection;
 using System.Threading;
 using Android.Content;
 using Android.OS;
 using Android.Preferences;
+using FluentFTP;
 using KeePassLib;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
@@ -17,73 +17,6 @@ namespace keepass2android.Io
 {
 	public class NetFtpFileStorage: IFileStorage
 	{
-		class RetryConnectFtpClient : FtpClient
-		{
-			protected override FtpClient CloneConnection()
-			{
-				RetryConnectFtpClient conn = new RetryConnectFtpClient();
-
-				conn.m_isClone = true;
-
-				foreach (PropertyInfo prop in GetType().GetProperties())
-				{
-					object[] attributes = prop.GetCustomAttributes(typeof(FtpControlConnectionClone), true);
-
-					if (attributes != null && attributes.Length > 0)
-					{
-						prop.SetValue(conn, prop.GetValue(this, null), null);
-					}
-				}
-
-				// always accept certficate no matter what because if code execution ever
-				// gets here it means the certificate on the control connection object being
-				// cloned was already accepted.
-				conn.ValidateCertificate += new FtpSslValidation(
-					delegate(FtpClient obj, FtpSslValidationEventArgs e)
-					{
-						e.Accept = true;
-					});
-
-				return conn;
-			}
-
-			private static T DoInRetryLoop<T>(Func<T> func)
-			{
-				double timeout = 30.0;
-				double timePerRequest = 1.0;
-				var startTime = DateTime.Now;
-				while (true)
-				{
-					var attemptStartTime = DateTime.Now;
-					try
-					{
-						return func();
-					}
-					catch (System.Net.Sockets.SocketException e)
-					{
-						if ((e.ErrorCode != 10061) || (DateTime.Now > startTime.AddSeconds(timeout)))
-						{
-							throw;
-						}
-						double secondsSinceAttemptStart = (DateTime.Now - attemptStartTime).TotalSeconds;
-						if (secondsSinceAttemptStart < timePerRequest)
-						{
-							Thread.Sleep(TimeSpan.FromSeconds(timePerRequest - secondsSinceAttemptStart));
-						}
-					}
-				}
-			}
-			public override void Connect()
-			{
-				DoInRetryLoop(() =>
-				{
-					base.Connect();
-					return true;
-				}
-				);
-			}
-		}
-
 		public struct ConnectionSettings
 		{
 			public FtpEncryptionMode EncryptionMode {get; set; }
@@ -147,9 +80,8 @@ namespace keepass2android.Io
 
 		public NetFtpFileStorage(Context context, ICertificateValidationHandler app)
 		{
-			_app = app;
+            _app = app;
 			traceStream = new MemoryStream();
-			FtpTrace.AddListener(new System.Diagnostics.TextWriterTraceListener(traceStream));
 			
 		}
 
@@ -172,9 +104,9 @@ namespace keepass2android.Io
 			{
 				using (FtpClient client = GetClient(ioc))
 				{
-					string localPath = IocToUri(ioc).PathAndQuery;
+					string localPath = IocToLocalPath(ioc);
 					if (client.DirectoryExists(localPath))
-						client.DeleteDirectory(localPath, true);
+						client.DeleteDirectory(localPath);
 					else
 						client.DeleteFile(localPath);
 				}
@@ -205,7 +137,8 @@ namespace keepass2android.Io
 		{
 			var settings = ConnectionSettings.FromIoc(ioc);
 			
-			FtpClient client = new RetryConnectFtpClient();
+			FtpClient client = new FtpClient();
+		    client.RetryAttempts = 3;
 			if ((settings.Username.Length > 0) || (settings.Password.Length > 0))
 				client.Credentials = new NetworkCredential(settings.Username, settings.Password);
 			else
@@ -250,20 +183,22 @@ namespace keepass2android.Io
 				path = path.Substring(settings.Length + 1);
 				
 			}
-			return new Uri(scheme + "://" + path);
+            Kp2aLog.Log("FTP: IocToUri out = " + scheme + "://" + path);
+            return new Uri(scheme + "://" + path);
 		}
 
-		private string IocPathFromUri(IOConnectionInfo baseIoc, Uri uri)
+		private string IocPathFromUri(IOConnectionInfo baseIoc, string uri)
 		{
-			string basePath = baseIoc.Path;
+            string basePath = baseIoc.Path;
 			int schemeLength = basePath.IndexOf("://", StringComparison.Ordinal);
 			string scheme = basePath.Substring(0, schemeLength);
 			basePath = basePath.Substring(schemeLength + 3);
 			string baseSettings = basePath.Substring(0, basePath.IndexOf(ConnectionSettings.SettingsPostFix, StringComparison.Ordinal));
 			basePath = basePath.Substring(baseSettings.Length+1);
 			string baseHost = basePath.Substring(0, basePath.IndexOf("/", StringComparison.Ordinal));
-			return scheme + "://" + baseSettings + ConnectionSettings.SettingsPostFix + baseHost + uri.AbsolutePath; //TODO does this contain Query?
-		}
+			string result = scheme + "://" + baseSettings + ConnectionSettings.SettingsPostFix + baseHost + uri; //TODO does this contain Query?
+            return result;
+        }
 
 
 		public bool CheckForFileChangeFast(IOConnectionInfo ioc, string previousFileVersion)
@@ -281,9 +216,12 @@ namespace keepass2android.Io
 			try
 			{
 				using (var cl = GetClient(ioc))
-				{
-					return cl.OpenRead(IocToUri(ioc).PathAndQuery, FtpDataType.Binary, 0);
-				}
+                {
+                    var memStream = new MemoryStream();
+                    cl.OpenRead(IocToLocalPath(ioc), FtpDataType.Binary, 0).CopyTo(memStream);
+                    memStream.Seek(0, SeekOrigin.Begin);
+					return memStream;
+                }
 			}
 			catch (FtpCommandException ex)
 			{
@@ -314,7 +252,12 @@ namespace keepass2android.Io
 				UrlUtil.GetFileName(ioc.Path));
 		}
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return UrlUtil.GetExtension(ioc.Path);
+        }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return false;
 		}
@@ -325,7 +268,7 @@ namespace keepass2android.Io
 			{
 				using (var client = GetClient(ioc))
 				{
-					client.CreateDirectory(IocToUri(GetFilePath(ioc, newDirName)).PathAndQuery);
+					client.CreateDirectory(IocToLocalPath(GetFilePath(ioc, newDirName)));
 				}
 			}
 			catch (FtpCommandException ex)
@@ -334,14 +277,19 @@ namespace keepass2android.Io
 			}
 		}
 
-		public IEnumerable<FileDescription> ListContents(IOConnectionInfo ioc)
+        public static string IocToLocalPath(IOConnectionInfo ioc)
+        {
+            return WebUtility.UrlDecode(IocToUri(ioc).PathAndQuery);
+        }
+
+        public IEnumerable<FileDescription> ListContents(IOConnectionInfo ioc)
 		{
 			try
 			{
-				using (var client = GetClient(ioc))
+                using (var client = GetClient(ioc))
 				{
 					List<FileDescription> files = new List<FileDescription>();
-					foreach (FtpListItem item in client.GetListing(IocToUri(ioc).PathAndQuery,
+					foreach (FtpListItem item in client.GetListing(IocToLocalPath(ioc),
 						FtpListOption.Modify | FtpListOption.Size | FtpListOption.DerefLinks))
 					{
 
@@ -355,7 +303,7 @@ namespace keepass2android.Io
 									DisplayName = item.Name,
 									IsDirectory = true,
 									LastModified = item.Modified,
-									Path = IocPathFromUri(ioc, new Uri(item.FullName))
+									Path = IocPathFromUri(ioc, item.FullName)
 								});
 								break;
 							case FtpFileSystemObjectType.File:
@@ -366,7 +314,7 @@ namespace keepass2android.Io
 									DisplayName = item.Name,
 									IsDirectory = false,
 									LastModified = item.Modified,
-									Path = IocPathFromUri(ioc, new Uri(item.FullName)),
+									Path = IocPathFromUri(ioc, item.FullName),
 									SizeInBytes = item.Size
 								});
 								break;
@@ -391,10 +339,10 @@ namespace keepass2android.Io
 				//is it very inefficient to connect for each description?
 
 				using (FtpClient client = GetClient(ioc))
-				{
-					
-					var uri = IocToUri(ioc);
-					string path = uri.PathAndQuery;
+                {
+
+
+                    string path = IocToLocalPath(ioc);
 					if (!client.FileExists(path) && (!client.DirectoryExists(path)))
 						throw new FileNotFoundException();
 					var fileDesc = new FileDescription()
@@ -506,7 +454,7 @@ namespace keepass2android.Io
 			{
 				using (var client = GetClient(ioc))
 				{
-					return client.OpenWrite(IocToUri(ioc).PathAndQuery);
+					return client.OpenWrite(IocToLocalPath(ioc));
 
 				}
 			}
@@ -575,7 +523,7 @@ namespace keepass2android.Io
 			{
 
 				_client = _fileStorage.GetClient(_ioc, false);
-				_stream = _client.OpenWrite(NetFtpFileStorage.IocToUri(_iocTemp).PathAndQuery);
+				_stream = _client.OpenWrite(NetFtpFileStorage.IocToLocalPath(_iocTemp));
 				return _stream;
 			}
 			catch (FtpCommandException ex)
@@ -590,22 +538,11 @@ namespace keepass2android.Io
 			{
 				Android.Util.Log.Debug("NETFTP","connected: " + _client.IsConnected.ToString());
 				_stream.Close();
-				Android.Util.Log.Debug("NETFTP", "connected: " + _client.IsConnected.ToString());
+                _stream.Dispose();
+                _client.GetReply();
 
-				//make sure target file does not exist:
-				//try
-				{
-					if (_client.FileExists(NetFtpFileStorage.IocToUri(_ioc).PathAndQuery))
-						_client.DeleteFile(NetFtpFileStorage.IocToUri(_ioc).PathAndQuery);
-
-				}
-				//catch (FtpCommandException)
-				{
-					//TODO get a new clien? might be stale
-				}
-
-				_client.Rename(NetFtpFileStorage.IocToUri(_iocTemp).PathAndQuery,
-				    NetFtpFileStorage.IocToUri(_ioc).PathAndQuery);
+				_client.MoveFile(NetFtpFileStorage.IocToLocalPath(_iocTemp),
+				    NetFtpFileStorage.IocToLocalPath(_ioc));
 				
 			}
 			catch (FtpCommandException ex)

src/Kp2aBusinessLogic/Io/OfflineSwitchableFileStorage.cs

@@ -78,7 +78,12 @@ namespace keepass2android.Io
 			return _baseStorage.GetFilenameWithoutPathAndExt(ioc);
 		}
 
-		public bool RequiresCredentials(IOConnectionInfo ioc)
+	    public string GetFileExtension(IOConnectionInfo ioc)
+	    {
+	        return _baseStorage.GetFileExtension(ioc);
+	    }
+
+	    public bool RequiresCredentials(IOConnectionInfo ioc)
 		{
 			return _baseStorage.RequiresCredentials(ioc);
 		}

src/Kp2aBusinessLogic/Io/OneDrive2PrefixContainer.cs

@@ -0,0 +1,26 @@
+namespace keepass2android.Io.ItemLocation
+{
+    public abstract class OneDrive2PrefixContainer
+    {
+        public abstract string Onedrive2ProtocolId { get; }
+        public string Onedrive2Prefix { get { return Onedrive2ProtocolId + "://"; } }
+    }
+
+    //for permissions including all my files and all shared files
+    public class OneDrive2FullPrefixContainer : OneDrive2PrefixContainer
+    {
+        public override string Onedrive2ProtocolId { get { return "onedrive2_full"; }}
+    }
+
+    //for permissions including all my files
+    public class OneDrive2MyFilesPrefixContainer : OneDrive2PrefixContainer
+    {
+        public override string Onedrive2ProtocolId { get { return "onedrive2_myfiles"; } }
+    }
+
+    //for permissions to app folder only
+    public class OneDrive2AppFolderPrefixContainer : OneDrive2PrefixContainer
+    {
+        public override string Onedrive2ProtocolId { get { return "onedrive2_appfolder"; } }
+    }
+}

src/Kp2aBusinessLogic/Io/WebDavFileStorage.cs

@@ -9,14 +9,14 @@ using Android.OS;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-#if !NoNet
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 using Keepass2android.Javafilestorage;
 #endif
 using KeePassLib.Serialization;
 
 namespace keepass2android.Io
 {
-#if !NoNet
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 	public class WebDavFileStorage: JavaFileStorage
 	{
 		public WebDavFileStorage(IKp2aApp app) : base(new Keepass2android.Javafilestorage.WebDavStorage(app.CertificateErrorHandler), app)

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -12,8 +12,8 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;_EXCLUDE_KEYBOARD;_EXCLUDE_FILECHOOSER;_EXCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
+    <DefineConstants>DEBUG;_EXCLUDE_TWOFISH;_EXCLUDE_KEYBOARD;_EXCLUDE_FILECHOOSER;_EXCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
@@ -31,9 +31,10 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NoNet;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+	<JavaMaximumHeapSize>4G</JavaMaximumHeapSize>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
@@ -53,45 +54,14 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Arch.Core.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Compat.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Compat.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Core.UI.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Core.Utils.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Fragment.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Fragment.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.Media.Compat.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v13, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.v13.26.1.0.1\lib\MonoAndroid80\Xamarin.Android.Support.v13.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="database\CheckDatabaseForChanges.cs" />
     <Compile Include="database\edit\AddTemplateEntries.cs" />
     <Compile Include="database\edit\CopyEntry.cs" />
-    <Compile Include="database\edit\DeleteMultipleItems.cs" />
+    <Compile Include="database\edit\DeleteMultipleItemsFromOneDatabase.cs" />
     <Compile Include="database\edit\EditGroup.cs" />
     <Compile Include="database\edit\MoveElements.cs" />
     <Compile Include="database\KdbDatabaseFormat.cs" />
@@ -103,24 +73,17 @@
     <Compile Include="DataExchange\Formats\KeePassKdb2x.cs" />
     <Compile Include="DataExchange\Formats\KeePassXml2x.cs" />
     <Compile Include="DataExchange\PwExportInfo.cs" />
+    <Compile Include="ElementAndDatabaseId.cs" />
     <Compile Include="Io\AndroidContentStorage.cs" />
     <Compile Include="Io\BuiltInFileStorage.cs" />
     <Compile Include="Io\CachingFileStorage.cs" />
-    <Compile Include="Io\DropboxFileStorage.cs" />
-    <Compile Include="Io\DropboxFileStorageKeys.cs" />
     <Compile Include="Io\FileDescription.cs" />
     <Compile Include="Io\FileStorageSetupActivity.cs" />
     <Compile Include="Io\FileStorageSetupInitiatorActivity.cs" />
-    <Compile Include="Io\GDriveFileStorage.cs" />
     <Compile Include="Io\IFileStorage.cs" />
     <Compile Include="Io\IoUtil.cs" />
-    <Compile Include="Io\JavaFileStorage.cs" />
-    <Compile Include="Io\NetFtpFileStorage.cs" />
     <Compile Include="Io\OfflineSwitchableFileStorage.cs" />
-    <Compile Include="Io\PCloudFileStorage.cs" />
-    <Compile Include="Io\SftpFileStorage.cs" />
-    <Compile Include="Io\OneDriveFileStorage.cs" />
-    <Compile Include="Io\WebDavFileStorage.cs" />
+
     <Compile Include="IProgressDialog.cs" />
     <Compile Include="PreferenceKey.cs" />
     <Compile Include="SelectStorageLocationActivityBase.cs" />
@@ -156,14 +119,6 @@
     <Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AdalBindings\AdalBindings.csproj">
-      <Project>{0b109c0e-0514-4340-8779-5bd6a0dde84e}</Project>
-      <Name>AdalBindings</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
-      <Project>{48574278-4779-4b3a-a9e4-9cf1bc285d0b}</Project>
-      <Name>JavaFileStorageBindings</Name>
-    </ProjectReference>
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
       <Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
       <Name>KeePassLib2Android</Name>
@@ -172,10 +127,7 @@
       <Project>{70D3844A-D9FA-4A64-B205-A84C6A822196}</Project>
       <Name>KP2AKdbLibraryBinding</Name>
     </ProjectReference>
-    <ProjectReference Include="..\netftpandroid\System.Net.FtpClient\System.Net.FtpClient.Android.csproj">
-      <Project>{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}</Project>
-      <Name>System.Net.FtpClient.Android</Name>
-    </ProjectReference>
+
     <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj">
       <Project>{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}</Project>
       <Name>TwofishCipher</Name>
@@ -185,34 +137,113 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Android.Arch.Core.Common">
+      <Version>1.1.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Core.Runtime">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.Common">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
+      <Version>1.1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Annotations">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.AsyncLayoutInflater">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Collections">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Compat">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.CoordinaterLayout">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Core.UI">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Core.Utils">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.CursorAdapter">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.CustomTabs">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.CustomView">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.DocumentFile">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.DrawerLayout">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Fragment">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Interpolator">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Loader">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.LocalBroadcastManager">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Media.Compat">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Print">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.SlidingPaneLayout">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.SwipeRefreshLayout">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.v13">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.v4">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.Vector.Drawable">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.VersionedParcelable">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.ViewPager">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
-  <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.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Core.UI.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.UI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Core.UI.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.UI.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Core.Utils.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Core.Utils.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.Utils.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Fragment.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Fragment.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Fragment.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Fragment.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Media.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Media.Compat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Media.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Media.Compat.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.Android.Support.v13.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v13.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.v13.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v13.targets'))" />
-  </Target>
-  <Import Project="..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.Core.UI.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.Core.Utils.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.Fragment.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\packages\Xamarin.Android.Support.v13.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v13.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v13.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v13.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">

src/Kp2aBusinessLogic/ProgressDialogStatusLogger.cs

@@ -52,7 +52,8 @@ namespace keepass2android
 
 		public void UpdateMessage (String message)
 		{
-			_message = message;
+		    Kp2aLog.Log("status message: " + message);
+            _message = message;
 			if ( _app!= null && _progressDialog != null && _handler != null ) {
 				_handler.Post(() => {_progressDialog.SetMessage(message); } );
 			}
@@ -60,6 +61,7 @@ namespace keepass2android
 
 		public void UpdateSubMessage(String submessage)
 		{
+		    Kp2aLog.Log("status submessage: " + submessage);
 		    _submessage = submessage;
 			if (_app != null && _progressDialog != null && _handler != null)
 			{

src/Kp2aBusinessLogic/ProgressTask.cs

@@ -49,6 +49,11 @@ namespace keepass2android
 	        get { return _activeActivity; }
 	        private set
 	        {
+                if (_activeActivity != null && _activeActivity != _previouslyActiveActivity)
+                {
+                    _previouslyActiveActivity = _activeActivity;
+
+                }
 	            _activeActivity = value;
 	            if (_task != null)
 	                _task.ActiveActivity = _activeActivity;
@@ -60,12 +65,18 @@ namespace keepass2android
 	        }
 	    }
 
-	    private readonly Handler _handler;
+        public Activity PreviouslyActiveActivity
+        {
+            get { return _previouslyActiveActivity; }
+           
+        }
+
+		private readonly Handler _handler;
 		private readonly RunnableOnFinish _task;
 		private IProgressDialog _progressDialog;
         private readonly IKp2aApp _app;
 		private Thread _thread;
-	    private Activity _activeActivity;
+	    private Activity _activeActivity, _previouslyActiveActivity;
 	    private ProgressDialogStatusLogger _progressDialogStatusLogger;
 
 	    public ProgressTask(IKp2aApp app, Activity activity, RunnableOnFinish task)

src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs

@@ -23,7 +23,7 @@ namespace keepass2android
 	/// <summary>
 	/// EqualityComparer implementation to compare PwGroups based on their Id
 	/// </summary>
-	class PwGroupEqualityFromIdComparer: IEqualityComparer<PwGroup>
+	public class PwGroupEqualityFromIdComparer: IEqualityComparer<PwGroup>
 	{
 		#region IEqualityComparer implementation			
 		public bool Equals (PwGroup x, PwGroup y)

src/Kp2aBusinessLogic/SearchDbHelper.cs

@@ -72,8 +72,8 @@ namespace keepass2android
 			SearchParameters sp = SearchParameters.None;
 			sp.SearchInUrls = true;
 			sp.SearchString = url;
-		
-			if(sp.RegularExpression) // Validate regular expression
+
+            if(sp.RegularExpression) // Validate regular expression
 			{
 				new Regex(sp.SearchString); 
 			}
@@ -103,8 +103,10 @@ namespace keepass2android
 			PwGroup pgResults = new PwGroup(true, true, strGroupName, PwIcon.EMailSearch) {IsVirtual = true};
 			if (String.IsNullOrWhiteSpace(host))
 				return pgResults;
-			foreach (PwEntry entry in database.Entries.Values)
-			{
+			foreach (PwEntry entry in database.EntriesById.Values)
+            {
+                if (!entry.GetSearchingEnabled())
+                    continue;
 				string otherUrl = entry.Strings.ReadSafe(PwDefs.UrlField);
 				otherUrl = SprEngine.Compile(otherUrl, new SprContext(entry, database.KpDatabase, SprCompileFlags.References));
 				String otherHost = ExtractHost(otherUrl);

src/Kp2aBusinessLogic/UiStringKey.cs

@@ -86,6 +86,9 @@ namespace keepass2android
 		ReadOnlyReason_PreKitKat,
 		ReadOnlyReason_ReadOnlyFlag,
 		ReadOnlyReason_ReadOnlyKitKat,
-        ReadOnlyReason_LocalBackup
+        ReadOnlyReason_LocalBackup,
+        Ok,
+        cancel,
+        FileNotFound
     }
 }

src/Kp2aBusinessLogic/Utils/EntryUtil.cs

@@ -25,9 +25,7 @@ using KeePass.Util.Spr;
 
 using KeePassLib;
 using KeePassLib.Collections;
-using KeePassLib.Cryptography;
 using KeePassLib.Delegates;
-using KeePassLib.Security;
 using KeePassLib.Utility;
 
 namespace KeePass.Util
@@ -89,41 +87,8 @@ namespace KeePass.Util
 			return str;
 		}
 */
-		private static string ReplaceHmacOtpPlaceholder(string strText,
-			SprContext ctx)
-		{
-			PwEntry pe = ctx.Entry;
-			PwDatabase pd = ctx.Database;
-			if((pe == null) || (pd == null)) return strText;
 
-			string str = strText;
-
-			const string strHmacOtpPlh = @"{HMACOTP}";
-			if(str.IndexOf(strHmacOtpPlh, StrUtil.CaseIgnoreCmp) >= 0)
-			{
-				const string strKeyField = "HmacOtp-Secret";
-				const string strCounterField = "HmacOtp-Counter";
-
-				byte[] pbSecret = StrUtil.Utf8.GetBytes(pe.Strings.ReadSafe(
-					strKeyField));
-
-				string strCounter = pe.Strings.ReadSafe(strCounterField);
-				ulong uCounter;
-				ulong.TryParse(strCounter, out uCounter);
-
-				string strValue = HmacOtp.Generate(pbSecret, uCounter, 6, false, -1);
-
-				pe.Strings.Set(strCounterField, new ProtectedString(false,
-					(uCounter + 1).ToString()));
-				pd.Modified = true;
-
-				str = StrUtil.ReplaceCaseInsensitive(str, strHmacOtpPlh, strValue);
-			}
-
-			return str;
-		}
-
-		public static bool EntriesHaveSameParent(PwObjectList<PwEntry> v)
+	    public static bool EntriesHaveSameParent(PwObjectList<PwEntry> v)
 		{
 			if(v == null) { Debug.Assert(false); return true; }
 			if(v.UCount == 0) return true;

src/Kp2aBusinessLogic/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/Kp2aBusinessLogic/database/CheckDatabaseForChanges.cs

@@ -29,7 +29,7 @@ namespace keepass2android
 		{
 			try
 			{
-				IOConnectionInfo ioc = _app.GetDb().Ioc;
+				IOConnectionInfo ioc = _app.CurrentDb.Ioc;
 				IFileStorage fileStorage = _app.GetFileStorage(ioc);
 				if (fileStorage is CachingFileStorage)
 				{
@@ -49,7 +49,7 @@ namespace keepass2android
 					hashingRemoteStream.CopyTo(remoteData);
 					hashingRemoteStream.Close();
 					
-					if (!MemUtil.ArraysEqual(_app.GetDb().KpDatabase.HashOfFileOnDisk, hashingRemoteStream.Hash))
+					if (!MemUtil.ArraysEqual(_app.CurrentDb.KpDatabase.HashOfFileOnDisk, hashingRemoteStream.Hash))
 					{
 						_app.TriggerReload(_context);
 						Finish(true);

src/Kp2aBusinessLogic/database/Database.cs

@@ -26,6 +26,7 @@ using KeePassLib;
 using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using keepass2android.Io;
+using KeePassLib.Interfaces;
 using KeePassLib.Utility;
 using Exception = System.Exception;
 using String = System.String;
@@ -33,27 +34,23 @@ using String = System.String;
 namespace keepass2android
 {
 
-	public class Database {
-		
-
-		public Dictionary<PwUuid, PwGroup> Groups = new Dictionary<PwUuid, PwGroup>(new PwUuidEqualityComparer());
-		public Dictionary<PwUuid, PwEntry> Entries = new Dictionary<PwUuid, PwEntry>(new PwUuidEqualityComparer());
-		public HashSet<PwGroup> Dirty = new HashSet<PwGroup>(new PwGroupEqualityFromIdComparer());
+	public class Database
+	{
+	    public HashSet<IStructureItem> Elements = new HashSet<IStructureItem>();
+		public Dictionary<PwUuid, PwGroup> GroupsById = new Dictionary<PwUuid, PwGroup>(new PwUuidEqualityComparer());
+		public Dictionary<PwUuid, PwEntry> EntriesById = new Dictionary<PwUuid, PwEntry>(new PwUuidEqualityComparer());
 		public PwGroup Root;
 		public PwDatabase KpDatabase;
 		public IOConnectionInfo Ioc 
 		{
 			get
 			{
-				return KpDatabase == null ? null : KpDatabase.IOConnectionInfo;
+                
+                return KpDatabase?.IOConnectionInfo;
+                
 			}
 		}
 
-		/// <summary>
-		/// Information about the last opened entry. Includes the entry but also transformed fields.
-		/// </summary>
-		public PwEntryOutput LastOpenedEntry { get; set; }
-
 		/// <summary>
 		/// if an OTP key was used, this property tells the location of the OTP auxiliary file.
 		/// Must be set after loading.
@@ -73,31 +70,14 @@ namespace keepass2android
             _app = app;
 			CanWrite = true; //default
         }
-		
-		private bool _loaded;
 
-        private bool _reloadRequested;
-		private IDatabaseFormat _databaseFormat = new KdbxDatabaseFormat(KdbxFormat.Default);
+	    private IDatabaseFormat _databaseFormat = new KdbxDatabaseFormat(KdbxFormat.Default);
 
-		public bool ReloadRequested
-        {
-            get { return _reloadRequested; }
-            set { _reloadRequested = value; }
-        }
+		public bool ReloadRequested { get; set; }
 
-		public bool Loaded {
-			get { return _loaded;}
-			set { _loaded = value; }
-		}
-
-		public bool DidOpenFileChange()
+	    public bool DidOpenFileChange()
 		{
-			if (Loaded == false)
-			{
-				return false;
-			}
 			return _app.GetFileStorage(Ioc).CheckForFileChangeFast(Ioc, LastFileVersion);
-			
 		}
 
 
@@ -112,32 +92,20 @@ namespace keepass2android
 			Stream s = databaseData ?? fileStorage.OpenFileForRead(iocInfo);
 			var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo);
 			PopulateDatabaseFromStream(pwDatabase, s, iocInfo, compositeKey, status, databaseFormat);
-			try
-			{
-				LastFileVersion = fileVersion;
+		    LastFileVersion = fileVersion;
 
-				status.UpdateSubMessage("");
+		    status.UpdateSubMessage("");
 
-				Root = pwDatabase.RootGroup;
-				PopulateGlobals(Root);
+		    Root = pwDatabase.RootGroup;
+		    PopulateGlobals(Root);
 
 				
-				KpDatabase = pwDatabase;
-				SearchHelper = new SearchDbHelper(app);
+		    KpDatabase = pwDatabase;
+		    SearchHelper = new SearchDbHelper(app);
 
-				_databaseFormat = databaseFormat;
+		    _databaseFormat = databaseFormat;
 
-				CanWrite = databaseFormat.CanWrite && !fileStorage.IsReadOnly(iocInfo);
-				Loaded = true;
-			}
-			catch (Exception)
-			{
-				Clear();				
-				throw;
-			}
-			
-
-			
+		    CanWrite = databaseFormat.CanWrite && !fileStorage.IsReadOnly(iocInfo);
 		}
 
 		/// <summary>
@@ -219,8 +187,7 @@ namespace keepass2android
 
 		public void SaveData()  {
             
-			KpDatabase.UseFileTransactions = _app.GetBooleanPreference(PreferenceKey.UseFileTransactions);
-			using (IWriteTransaction trans = _app.GetFileStorage(Ioc).OpenWriteTransaction(Ioc, KpDatabase.UseFileTransactions))
+			using (IWriteTransaction trans = _app.GetFileStorage(Ioc).OpenWriteTransaction(Ioc, _app.GetBooleanPreference(PreferenceKey.UseFileTransactions)))
 			{
 				DatabaseFormat.Save(KpDatabase, trans.OpenFile());
 				
@@ -239,14 +206,18 @@ namespace keepass2android
 			{
 				if (checkForDuplicateUuids)
 				{
-					if (Entries.ContainsKey(e.Uuid))
+					if (EntriesById.ContainsKey(e.Uuid))
 					{
-						throw new DuplicateUuidsException("Same UUID for entries '"+Entries[e.Uuid].Strings.ReadSafe(PwDefs.TitleField)+"' and '"+e.Strings.ReadSafe(PwDefs.TitleField)+"'.");
+						throw new DuplicateUuidsException("Same UUID for entries '"+EntriesById[e.Uuid].Strings.ReadSafe(PwDefs.TitleField)+"' and '"+e.Strings.ReadSafe(PwDefs.TitleField)+"'.");
 					}
 					
 				}
-				Entries [e.Uuid] = e;
+				EntriesById [e.Uuid] = e;
+			    Elements.Add(e);
 			}
+
+		    GroupsById[currentGroup.Uuid] = currentGroup;
+		    Elements.Add(currentGroup);
 			foreach (PwGroup g in childGroups) 
 			{
 				if (checkForDuplicateUuids)
@@ -258,7 +229,6 @@ namespace keepass2android
 					}
 					 * */
 				}
-				Groups[g.Uuid] = g;
 				PopulateGlobals(g);
 			}
 		}
@@ -266,33 +236,15 @@ namespace keepass2android
 		{
 			PopulateGlobals(currentGroup, _app.CheckForDuplicateUuids);
 		}
-		
-		public void Clear() {
-			_loaded = false; 
-			
-			Groups.Clear();
-			Entries.Clear();
-			Dirty.Clear();
-			DrawableFactory.Clear();
-			
-			Root = null;
-			KpDatabase = null;
-			
-			CanWrite = true;
-			_reloadRequested = false;
-			OtpAuxFileIoc = null;
-		    LastOpenedEntry = null;
-		}
-		
-		public void MarkAllGroupsAsDirty() {
-			foreach ( PwGroup group in Groups.Values ) {
-				Dirty.Add(group);
-			}
-			
 
-		}
-		
-		
+
+	    public void UpdateGlobals()
+	    {
+	        EntriesById.Clear();
+	        GroupsById.Clear();
+	        Elements.Clear();
+            PopulateGlobals(Root);
+	    }
 	}
 
 	[Serializable]

src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs

@@ -216,9 +216,16 @@ namespace keepass2android
 
 		private DateTime JavaTimeToCSharp(long javatime)
 		{
+		    try
+		    {
+		        var utcTime = new DateTime(1970, 1, 1).AddMilliseconds(javatime);
+		        return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
+		    }
+		    catch (ArgumentOutOfRangeException)
+		    {
+		        return DateTime.MinValue;
+		    }
 			
-			var utcTime = new DateTime(1970, 1, 1).AddMilliseconds(javatime);
-			return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
 
 		}
 #endif

src/Kp2aBusinessLogic/database/KdbxDatabaseFormat.cs

@@ -27,7 +27,7 @@ namespace keepass2android
 		}
 
 		public byte[] HashOfLastStream { get; private set; }
-		public bool CanWrite { get { return true; } }
+		public bool CanWrite { get { return _format != KdbxFormat.PlainXml; } }
 		public string SuccessMessage { get { return null; } }
 		public void Save(PwDatabase kpDatabase, Stream stream)
 		{

src/Kp2aBusinessLogic/database/PwEntryOutput.cs

@@ -14,13 +14,13 @@ namespace keepass2android
 	public class PwEntryOutput
 	{
 		private readonly PwEntry _entry;
-		private readonly PwDatabase _db;
+		private readonly Database _db;
 		private readonly ProtectedStringDictionary _outputStrings = new ProtectedStringDictionary();
 
 		/// <summary>
 		/// Constructs the PwEntryOutput by replacing the placeholders
 		/// </summary>
-		public PwEntryOutput(PwEntry entry, PwDatabase db)
+		public PwEntryOutput(PwEntry entry, Database db)
 		{
 			_entry = entry;
 			_db = db;
@@ -34,7 +34,7 @@ namespace keepass2android
 		string GetStringAndReplacePlaceholders(string key)
 		{
 			String value = Entry.Strings.ReadSafe(key);
-			value = SprEngine.Compile(value, new SprContext(Entry, _db, SprCompileFlags.All));
+			value = SprEngine.Compile(value, new SprContext(Entry, _db.KpDatabase, SprCompileFlags.All));
 			return value;
 		}
 

src/Kp2aBusinessLogic/database/SynchronizeCachedDatabase.cs

@@ -26,7 +26,7 @@ namespace keepass2android
 		{
 			try
 			{
-				IOConnectionInfo ioc = _app.GetDb().Ioc;
+				IOConnectionInfo ioc = _app.CurrentDb.Ioc;
 				IFileStorage fileStorage = _app.GetFileStorage(ioc);
 				if (!(fileStorage is CachingFileStorage))
 				{
@@ -70,10 +70,12 @@ namespace keepass2android
 									Finish(true, _app.GetResourceString(UiStringKey.SynchronizedDatabaseSuccessfully));
 								}
 								_saveDb = null;
-							}), false, remoteData);
+							}), _app.CurrentDb, false, remoteData);
 						_saveDb.Run();
 
-						_app.GetDb().MarkAllGroupsAsDirty();
+                        _app.CurrentDb.UpdateGlobals();
+
+						_app.MarkAllGroupsAsDirty();
 					}
 					else
 					{
@@ -103,6 +105,7 @@ namespace keepass2android
 			}
 			catch (Exception e)
 			{
+                Kp2aLog.LogUnexpectedError(e);
 				Finish(false, e.Message);
 			}
 			

src/Kp2aBusinessLogic/database/edit/ActionOnFinish.cs

@@ -36,8 +36,11 @@ namespace keepass2android
 		{
 			_actionToPerform = actionToPerform;
 		}
-        
-		public override void Run()
+
+		//if set to true, the previously active active will be passed to ActionToPerformOnFinish instead null if no activity is on foreground
+        public bool AllowInactiveActivity { get; set; }
+
+        public override void Run()
 		{
 			if (Message == null)
 				Message = "";
@@ -46,7 +49,7 @@ namespace keepass2android
 				Handler.Post(() => {_actionToPerform(Success, Message, ActiveActivity);});
 			}
 			else
-				_actionToPerform(Success, Message, ActiveActivity);
+				_actionToPerform(Success, Message, AllowInactiveActivity ? (ActiveActivity ?? PreviouslyActiveActivity) :  ActiveActivity);
 			base.Run();
 		}
 	}

src/Kp2aBusinessLogic/database/edit/AddEntry.cs

@@ -24,26 +24,28 @@ namespace keepass2android
 	public class AddEntry : RunnableOnFinish {
 		protected Database Db
 		{
-			get { return _app.GetDb(); }
+			get { return _app.CurrentDb; }
 		}
 
 		private readonly IKp2aApp _app;
 		private readonly PwEntry _entry;
 		private readonly PwGroup _parentGroup;
 		private readonly Activity _ctx;
-		
-		public static AddEntry GetInstance(Activity ctx, IKp2aApp app, PwEntry entry, PwGroup parentGroup, OnFinish finish) {
+	    private readonly Database _db;
 
-			return new AddEntry(ctx, app, entry, parentGroup, finish);
+	    public static AddEntry GetInstance(Activity ctx, IKp2aApp app, PwEntry entry, PwGroup parentGroup, OnFinish finish, Database db) {
+
+			return new AddEntry(ctx, db, app, entry, parentGroup, finish);
 		}
 		
-		protected AddEntry(Activity ctx, IKp2aApp app, PwEntry entry, PwGroup parentGroup, OnFinish finish):base(ctx, finish) {
+		public AddEntry(Activity ctx, Database db, IKp2aApp app, PwEntry entry, PwGroup parentGroup, OnFinish finish):base(ctx, finish) {
 			_ctx = ctx;
-			_parentGroup = parentGroup;
+		    _db = db;
+		    _parentGroup = parentGroup;
 			_app = app;
 			_entry = entry;
 			
-			_onFinishToRun = new AfterAdd(ctx, app.GetDb(), entry, OnFinishToRun);
+			_onFinishToRun = new AfterAdd(ctx, app.CurrentDb, entry, app,OnFinishToRun);
 		}
 		
 		
@@ -57,10 +59,13 @@ namespace keepass2android
 			{
 				_parentGroup.AddEntry(_entry, true);	
 			}
-			
-			
-			// Commit to disk
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun);
+
+		    // Add entry to global
+		    _db.EntriesById[_entry.Uuid] = _entry;
+		    _db.Elements.Add(_entry);
+
+            // Commit to disk
+            SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, OnFinishToRun);
 			save.SetStatusLogger(StatusLogger);
 			save.Run();
 		}
@@ -68,12 +73,13 @@ namespace keepass2android
 		private class AfterAdd : OnFinish {
 			private readonly Database _db;
 			private readonly PwEntry _entry;
+		    private readonly IKp2aApp _app;
 
-			public AfterAdd(Activity activity, Database db, PwEntry entry, OnFinish finish):base(activity, finish) {
+		    public AfterAdd(Activity activity, Database db, PwEntry entry, IKp2aApp app, OnFinish finish):base(activity, finish) {
 				_db = db;
 				_entry = entry;
-
-			}
+		        _app = app;
+		    }
 			
 
 
@@ -83,11 +89,10 @@ namespace keepass2android
 					PwGroup parent = _entry.ParentGroup; 
 					
 					// Mark parent group dirty
-					_db.Dirty.Add(parent);
-					
-					// Add entry to global
-					_db.Entries[_entry.Uuid] = _entry;
+					_app.DirtyGroups.Add(parent);
 					
+
+
 				} else
 				{
 					StatusLogger.UpdateMessage(UiStringKey.UndoingChanges);

src/Kp2aBusinessLogic/database/edit/AddGroup.cs

@@ -26,13 +26,16 @@ namespace keepass2android
 	public class AddGroup : RunnableOnFinish {
 		internal Database Db
 		{
-			get { return _app.GetDb(); }
+			get { return _app.CurrentDb; }
 		}
-		private IKp2aApp _app;
+
+        public IKp2aApp App { get => _app; }
+
+        private IKp2aApp _app;
 		private readonly String _name;
 		private readonly int _iconId;
 		private readonly PwUuid _groupCustomIconId;
-		internal PwGroup Group;
+	    public PwGroup Group;
 		internal PwGroup Parent;
 		protected bool DontSave;
 		readonly Activity _ctx;
@@ -67,9 +70,11 @@ namespace keepass2android
 				Group.CustomIconUuid = _groupCustomIconId;
 			}
 			Parent.AddGroup(Group, true);
+		    _app.CurrentDb.GroupsById[Group.Uuid] = Group;
+		    _app.CurrentDb.Elements.Add(Group);
 
-			// Commit to disk
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun, DontSave);
+            // Commit to disk
+            SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, OnFinishToRun, DontSave);
 			save.SetStatusLogger(StatusLogger);
 			save.Run();
 		}
@@ -86,13 +91,15 @@ namespace keepass2android
 				
 				if ( Success ) {
 					// Mark parent group dirty
-					_addGroup.Db.Dirty.Add(_addGroup.Parent);
+					_addGroup.App.DirtyGroups.Add(_addGroup.Parent);
 					
 					// Add group to global list
-					_addGroup.Db.Groups[_addGroup.Group.Uuid] = _addGroup.Group;
+					_addGroup.Db.GroupsById[_addGroup.Group.Uuid] = _addGroup.Group;
+				    _addGroup.Db.Elements.Add(_addGroup.Group);
 				} else {
 					StatusLogger.UpdateMessage(UiStringKey.UndoingChanges);
 					_addGroup.Parent.Groups.Remove(_addGroup.Group);
+
 				}
 				
 				base.Run();

src/Kp2aBusinessLogic/database/edit/AddTemplateEntries.cs

@@ -28,7 +28,7 @@ namespace keepass2android
 {
 	public class AddTemplateEntries : RunnableOnFinish {
 
-		class TemplateEntry
+		public class TemplateEntry
 		{
 			public UiStringKey Title { get; set; }
 			public PwIcon Icon { get; set; }
@@ -47,11 +47,12 @@ namespace keepass2android
 				void AddToEntry(IKp2aApp app, PwEntry entry, int position);
 			}
 
-			internal enum FieldType
+		    public enum FieldType
 			{
 				Inline, ProtectedInline
 			}
-			internal enum SpecialFieldKey
+
+		    public enum SpecialFieldKey
 			{
 				ExpDate, OverrideUrl, Tags
 			}
@@ -125,7 +126,7 @@ namespace keepass2android
 
 		protected Database Db
 		{
-			get { return _app.GetDb(); }
+			get { return _app.CurrentDb; }
 		}
 
 		private readonly IKp2aApp _app;
@@ -140,7 +141,7 @@ namespace keepass2android
 			//_onFinishToRun = new AfterAdd(this, OnFinishToRun);
 		}
 
-		static readonly List<TemplateEntry> TemplateEntries = new List<TemplateEntry>()
+		public static readonly List<TemplateEntry> TemplateEntries = new List<TemplateEntry>()
 			{
 				new TemplateEntry()
 				{
@@ -285,12 +286,23 @@ namespace keepass2android
 				
 			};
 
-		public static bool ContainsAllTemplates(IKp2aApp app)
+		public static bool ContainsAllTemplates(Database db)
 		{
-			return TemplateEntries.All(t => app.GetDb().Entries.ContainsKey(t.Uuid));
+			return TemplateEntries.All(t =>
+			{
+			    string hexId = t.Uuid.ToHexString();
+                
+                return db.EntriesById.Any(kvp => kvp.Key.Equals(t.Uuid) ||
+                    kvp.Value.Strings.ReadSafe(TemplateIdStringKey) == hexId);
+			});
 		}
 
-		public override void Run() {	
+	    public static string TemplateIdStringKey
+	    {
+	        get { return "KP2A_TemplateId"; }
+	    }
+
+	    public override void Run() {	
 			StatusLogger.UpdateMessage(UiStringKey.AddingEntry);
 
 			List<PwEntry> addedEntries;
@@ -298,10 +310,10 @@ namespace keepass2android
 
 			if (addedEntries.Any())
 			{
-				_app.GetDb().Dirty.Add(templateGroup);
+				_app.DirtyGroups.Add(templateGroup);
 
 				// Commit to disk
-				SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun);
+				SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, OnFinishToRun);
 				save.SetStatusLogger(StatusLogger);
 				save.Run();
 			}
@@ -315,26 +327,28 @@ namespace keepass2android
 			}
 
 			PwGroup templateGroup;
-			if (!_app.GetDb().Groups.TryGetValue(_app.GetDb().KpDatabase.EntryTemplatesGroup, out templateGroup))
+			if (!_app.CurrentDb.GroupsById.TryGetValue(_app.CurrentDb.KpDatabase.EntryTemplatesGroup, out templateGroup))
 			{
 				//create template group
 				templateGroup = new PwGroup(true, true, _app.GetResourceString(UiStringKey.TemplateGroupName), PwIcon.Folder);
-				_app.GetDb().KpDatabase.RootGroup.AddGroup(templateGroup, true);
-				_app.GetDb().KpDatabase.EntryTemplatesGroup = templateGroup.Uuid;
-				_app.GetDb().KpDatabase.EntryTemplatesGroupChanged = DateTime.Now;
-				_app.GetDb().Dirty.Add(_app.GetDb().KpDatabase.RootGroup);
-				_app.GetDb().Groups[templateGroup.Uuid] = templateGroup;
+				_app.CurrentDb.KpDatabase.RootGroup.AddGroup(templateGroup, true);
+				_app.CurrentDb.KpDatabase.EntryTemplatesGroup = templateGroup.Uuid;
+				_app.CurrentDb.KpDatabase.EntryTemplatesGroupChanged = DateTime.Now;
+				_app.DirtyGroups.Add(_app.CurrentDb.KpDatabase.RootGroup);
+				_app.CurrentDb.GroupsById[templateGroup.Uuid] = templateGroup;
+			    _app.CurrentDb.Elements.Add(templateGroup);
+
 			}
 			addedEntries = new List<PwEntry>();
 
 			foreach (var template in TemplateEntries)
 			{
-				if (_app.GetDb().Entries.ContainsKey(template.Uuid))
+				if (_app.CurrentDb.EntriesById.ContainsKey(template.Uuid))
 					continue;
 				PwEntry entry = CreateEntry(template);
 				templateGroup.AddEntry(entry, true);
 				addedEntries.Add(entry);
-				_app.GetDb().Entries[entry.Uuid] = entry;
+				_app.CurrentDb.EntriesById[entry.Uuid] = entry;
 			}
 			return templateGroup;
 		}
@@ -373,8 +387,12 @@ namespace keepass2android
 				base.Run();
 			}
 		}
-		
-		
+
+
+	    public static bool IsTemplateId(PwUuid pwUuid)
+	    {
+	        return TemplateEntries.Any(te => te.Uuid.Equals(pwUuid));
+	    }
 	}
 
 }

src/Kp2aBusinessLogic/database/edit/CopyEntry.cs

@@ -16,8 +16,8 @@ namespace keepass2android.database.edit
 {
 	public class CopyEntry: AddEntry
 	{
-		public CopyEntry(Activity ctx, IKp2aApp app, PwEntry entry, OnFinish finish)
-			: base(ctx, app, CreateCopy(entry, app), entry.ParentGroup, finish)
+		public CopyEntry(Activity ctx, IKp2aApp app, PwEntry entry, OnFinish finish, Database db)
+			: base(ctx, db, app, CreateCopy(entry, app), entry.ParentGroup, finish)
 		{
 		}
 

src/Kp2aBusinessLogic/database/edit/CreateDB.cs

@@ -27,23 +27,22 @@ namespace keepass2android
 {
 	
 	public class CreateDb : RunnableOnFinish {
-		
-		private const ulong DefaultEncryptionRounds = PwDefs.DefaultKeyEncryptionRounds;
-		
-		private readonly IOConnectionInfo _ioc;
+	    private readonly IOConnectionInfo _ioc;
 		private readonly bool _dontSave;
 		private readonly Activity _ctx;
         private readonly IKp2aApp _app;
 		private CompositeKey _key;
+	    private readonly bool _makeCurrent;
 
-		public CreateDb(IKp2aApp app, Activity ctx, IOConnectionInfo ioc, OnFinish finish, bool dontSave): base(ctx, finish) {
+	    public CreateDb(IKp2aApp app, Activity ctx, IOConnectionInfo ioc, OnFinish finish, bool dontSave, bool makeCurrent): base(ctx, finish) {
 			_ctx = ctx;
 			_ioc = ioc;
 			_dontSave = dontSave;
-            _app = app;
+	        _makeCurrent = makeCurrent;
+	        _app = app;
 		}
 
-		public CreateDb(IKp2aApp app, Activity ctx, IOConnectionInfo ioc, OnFinish finish, bool dontSave, CompositeKey key)
+		public CreateDb(IKp2aApp app, Activity ctx, IOConnectionInfo ioc, OnFinish finish, bool dontSave, CompositeKey key, bool makeCurrent)
 			: base(ctx, finish)
 		{
 			_ctx = ctx;
@@ -51,12 +50,13 @@ namespace keepass2android
 			_dontSave = dontSave;
 			_app = app;
 			_key = key;
+		    _makeCurrent = makeCurrent;
 		}
 		
 
 		public override void Run() {
 			StatusLogger.UpdateMessage(UiStringKey.progress_create);
-			Database db = _app.CreateNewDatabase();
+			Database db = _app.CreateNewDatabase(_makeCurrent);
 
 			db.KpDatabase = new KeePassLib.PwDatabase();
 			
@@ -65,7 +65,7 @@ namespace keepass2android
 				_key = new CompositeKey(); //use a temporary key which should be changed after creation
 			}
 			
-			db.KpDatabase.New(_ioc, _key);
+			db.KpDatabase.New(_ioc, _key, _app.GetFileStorage(_ioc).GetFilenameWithoutPathAndExt(_ioc));
 
 			db.KpDatabase.KdfParameters = (new AesKdf()).GetDefaultParameters();
 			db.KpDatabase.Name = "Keepass2Android Password Database";
@@ -74,7 +74,6 @@ namespace keepass2android
 			
 			// Set Database state
 			db.Root = db.KpDatabase.RootGroup;
-			db.Loaded = true;
 			db.SearchHelper = new SearchDbHelper(_app);
 
 			// Add a couple default groups
@@ -88,12 +87,14 @@ namespace keepass2android
 			addTemplates.AddTemplates(out addedEntries);
 			
 			// Commit changes
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun, _dontSave);
+			SaveDb save = new SaveDb(_ctx, _app, db, OnFinishToRun, _dontSave);
 			save.SetStatusLogger(StatusLogger);
 			_onFinishToRun = null;
 			save.Run();
-			
-			
+
+		    db.UpdateGlobals();
+
+
 		}
 		
 	}

src/Kp2aBusinessLogic/database/edit/DeleteEntry.cs

@@ -31,7 +31,7 @@ namespace keepass2android
 
 	    public DeleteEntry(Activity activiy, IKp2aApp app, PwEntry entry, OnFinish finish):base(activiy, finish, app) {
 			Ctx = activiy;
-			Db = app.GetDb();
+			Db = app.FindDatabaseForElement(entry);
 			_entry = entry;
 			
 		}
@@ -40,7 +40,7 @@ namespace keepass2android
 		{
 			get
 			{
-				return App.GetDb().DatabaseFormat.CanRecycle && CanRecycleGroup(_entry.ParentGroup);
+				return Db.DatabaseFormat.CanRecycle && CanRecycleGroup(_entry.ParentGroup);
 			}
 		}
 

src/Kp2aBusinessLogic/database/edit/DeleteGroup.cs

@@ -47,7 +47,7 @@ namespace keepass2android
         */
         private void SetMembers(Activity activity, IKp2aApp app, PwGroup group, bool dontSave)
         {
-			base.SetMembers(activity, app.GetDb());
+			base.SetMembers(activity, app.FindDatabaseForElement(group));
 
 			_group = group;
 	        DontSave = dontSave;
@@ -58,7 +58,7 @@ namespace keepass2android
 		{
 			get
 			{
-				return App.GetDb().DatabaseFormat.CanRecycle && CanRecycleGroup(_group);
+				return Db.DatabaseFormat.CanRecycle && CanRecycleGroup(_group);
 			}
 		}
 

src/Kp2aBusinessLogic/database/edit/DeleteMultipleItemsFromOneDatabase.cs

@@ -7,12 +7,12 @@ using KeePassLib.Interfaces;
 
 namespace keepass2android
 {
-	public class DeleteMultipleItems : DeleteRunnable
+	public class DeleteMultipleItemsFromOneDatabase : DeleteRunnable
 	{
 		private readonly List<IStructureItem> _elementsToDelete;
 		private readonly bool _canRecycle;
 
-		public DeleteMultipleItems(Activity activity, Database db, List<IStructureItem> elementsToDelete, OnFinish finish, IKp2aApp app)
+		public DeleteMultipleItemsFromOneDatabase(Activity activity, Database db, List<IStructureItem> elementsToDelete, OnFinish finish, IKp2aApp app)
 			: base(activity, finish, app)
 		{
 			_elementsToDelete = elementsToDelete;
@@ -21,12 +21,13 @@ namespace keepass2android
 			//determine once. The property is queried for each delete operation, but might return false
 			//after one entry/group is deleted (and thus in recycle bin and thus can't be recycled anymore)
 			_canRecycle = DetermineCanRecycle();
+		    ShowDatabaseIocInStatus = true;
 		}
 
 		private bool DetermineCanRecycle()
 		{
 			Android.Util.Log.Debug("KP2A", "CanRecycle?");
-			if (!App.GetDb().DatabaseFormat.CanRecycle)
+			if (!Db.DatabaseFormat.CanRecycle)
 			{
 				Android.Util.Log.Debug("KP2A", "CanRecycle? No because of DB format.");
 				return false;

src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs

@@ -100,7 +100,8 @@ namespace keepass2android
 						};
 
 				Db.KpDatabase.RootGroup.AddGroup(pgRecycleBin, true);
-				Db.Groups[pgRecycleBin.Uuid] = pgRecycleBin;
+				Db.GroupsById[pgRecycleBin.Uuid] = pgRecycleBin;
+			    Db.Elements.Add(pgRecycleBin);
 				Db.KpDatabase.RecycleBinUuid = pgRecycleBin.Uuid;
 
 				bGroupListUpdateRequired = true;
@@ -121,24 +122,27 @@ namespace keepass2android
 
 		public void Start()
 		{
-			if (CanRecycle)
+            string messageSuffix = ShowDatabaseIocInStatus ? "(" + App.GetFileStorage(Db.Ioc).GetDisplayName(Db.Ioc) + ")" : "";
+
+            if (CanRecycle)
 			{
 				App.AskYesNoCancel(UiStringKey.AskDeletePermanently_title,
 					QuestionRecycleResourceId,
 					(dlgSender, dlgEvt) =>
 					{
-						DeletePermanently = true;
-						ProgressTask pt = new ProgressTask(App, Ctx, this);
-						pt.Run();
+					    DeletePermanently = true;
+					    ProgressTask pt = new ProgressTask(App, Ctx, this);
+					    pt.Run();
+
 					},
 				(dlgSender, dlgEvt) =>
 				{
-					DeletePermanently = false;
-					ProgressTask pt = new ProgressTask(App, Ctx, this);
-					pt.Run();
+				    DeletePermanently = false;
+				    ProgressTask pt = new ProgressTask(App, Ctx, this);
+				    pt.Run();
 				},
 				(dlgSender, dlgEvt) => { },
-				Ctx);
+				Ctx, messageSuffix);
 
 
 
@@ -149,12 +153,12 @@ namespace keepass2android
 					QuestionNoRecycleResourceId,
 					(dlgSender, dlgEvt) =>
 					{
-						ProgressTask pt = new ProgressTask(App, Ctx, this);
-						pt.Run();
+					    ProgressTask pt = new ProgressTask(App, Ctx, this);
+					    pt.Run();
 					},
 				null,
 				(dlgSender, dlgEvt) => { },
-				Ctx);
+				Ctx, messageSuffix);
 
 				
 			}
@@ -182,7 +186,8 @@ namespace keepass2android
 					PwDeletedObject pdo = new PwDeletedObject(pe.Uuid, dtNow);
 					pd.DeletedObjects.Add(pdo);
 					touchedGroups.Add(pgParent);
-				    Db.Entries.Remove(pe.Uuid);
+				    Db.EntriesById.Remove(pe.Uuid);
+				    Db.Elements.Remove(pe);
 				}
 				else // Recycle
 				{
@@ -215,31 +220,41 @@ namespace keepass2android
 				if (success)
 				{
 					foreach (var g in touchedGroups)
-						Db.Dirty.Add(g);
+						App.DirtyGroups.Add(g);
 					foreach (var g in permanentlyDeletedGroups)
 					{
-						//remove groups from global lists if present there
-						Db.Dirty.Remove(g);
-						Db.Groups.Remove(g.Uuid);
+                        //remove groups from global lists if present there
+					    App.DirtyGroups.Remove(g);
+						Db.GroupsById.Remove(g.Uuid);
+					    Db.Elements.Remove(g);
+
 					}
 
 				}
 				else
 				{
 					// Let's not bother recovering from a failure to save.  It is too much work.
-					App.LockDatabase(false);
+					App.Lock(false, false);
 				}
 			}, OnFinishToRun);
 
 			// Commit database
-			SaveDb save = new SaveDb(Ctx, App, OnFinishToRun, false);
-			save.SetStatusLogger(StatusLogger);
+			SaveDb save = new SaveDb(Ctx, App, Db, OnFinishToRun, false);
+		    save.ShowDatabaseIocInStatus = ShowDatabaseIocInStatus;
+
+            save.SetStatusLogger(StatusLogger);
 			save.Run();
 
 
 		}
 
-		protected abstract void PerformDelete(List<PwGroup> touchedGroups, List<PwGroup> permanentlyDeletedGroups);
+	    public bool ShowDatabaseIocInStatus
+	    {
+	        get;
+	        set;
+	    }
+
+	    protected abstract void PerformDelete(List<PwGroup> touchedGroups, List<PwGroup> permanentlyDeletedGroups);
 
 		public abstract UiStringKey StatusMessage { get; }
 

src/Kp2aBusinessLogic/database/edit/EditGroup.cs

@@ -26,9 +26,12 @@ namespace keepass2android
 	public class EditGroup : RunnableOnFinish {
 		internal Database Db
 		{
-			get { return _app.GetDb(); }
+			get { return _app.FindDatabaseForElement(Group); }
 		}
-		private IKp2aApp _app;
+
+        public IKp2aApp App { get => _app; }
+
+        private IKp2aApp _app;
 		private readonly String _name;
 		private readonly PwIcon _iconId;
 		private readonly PwUuid _customIconId;
@@ -57,7 +60,7 @@ namespace keepass2android
 			Group.Touch(true);
 
 			// Commit to disk
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun);
+			SaveDb save = new SaveDb(_ctx, _app, Db, OnFinishToRun);
 			save.SetStatusLogger(StatusLogger);
 			save.Run();
 		}
@@ -76,10 +79,10 @@ namespace keepass2android
 				
 				if ( Success ) {
 					// Mark parent group dirty
-					_editGroup.Db.Dirty.Add(_editGroup.Group.ParentGroup);
+					_editGroup.App.DirtyGroups.Add(_editGroup.Group.ParentGroup);
 				} else
 				{
-					_editGroup._app.LockDatabase(false);
+					_editGroup._app.Lock(false, false);
 				}
 				
 				base.Run();

src/Kp2aBusinessLogic/database/edit/LoadDB.cs

@@ -21,6 +21,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Android.App;
+using keepass2android.database.edit;
 using KeePassLib;
 using KeePassLib.Keys;
 using KeePassLib.Serialization;
@@ -36,20 +37,25 @@ namespace keepass2android
 		private readonly bool _rememberKeyfile;
 		IDatabaseFormat _format;
 		
-		public LoadDb(Activity activity, IKp2aApp app, IOConnectionInfo ioc, Task<MemoryStream> databaseData, CompositeKey compositeKey, String keyfileOrProvider, OnFinish finish): base(activity, finish)
+		public LoadDb(Activity activity, IKp2aApp app, IOConnectionInfo ioc, Task<MemoryStream> databaseData, CompositeKey compositeKey, String keyfileOrProvider, OnFinish finish, bool updateLastUsageTimestamp, bool makeCurrent): base(activity, finish)
 		{
 			_app = app;
 			_ioc = ioc;
 			_databaseData = databaseData;
 			_compositeKey = compositeKey;
 			_keyfileOrProvider = keyfileOrProvider;
+		    _updateLastUsageTimestamp = updateLastUsageTimestamp;
+		    _makeCurrent = makeCurrent;
 
 
-			_rememberKeyfile = app.GetBooleanPreference(PreferenceKey.remember_keyfile); 
+		    _rememberKeyfile = app.GetBooleanPreference(PreferenceKey.remember_keyfile); 
 		}
-		
-		
-		public override void Run()
+
+	    protected bool success = false;
+	    private bool _updateLastUsageTimestamp;
+	    private readonly bool _makeCurrent;
+
+	    public override void Run()
 		{
 			try
 			{
@@ -76,8 +82,12 @@ namespace keepass2android
 					}
 
 					//ok, try to load the database. Let's start with Kdbx format and retry later if that is the wrong guess:
-					_format = new KdbxDatabaseFormat(KdbpFile.GetFormatToUse(_ioc));
+					_format = new KdbxDatabaseFormat(KdbpFile.GetFormatToUse(_app.GetFileStorage(_ioc).GetFileExtension(_ioc)));
 					TryLoad(databaseStream);
+
+
+
+				    success = true;
 				}
 				catch (Exception e)
 				{
@@ -89,7 +99,7 @@ namespace keepass2android
 			{
 				Kp2aLog.Log("KeyFileException");
 				Finish(false, /*TODO Localize: use Keepass error text KPRes.KeyFileError (including "or invalid format")*/
-				       _app.GetResourceString(UiStringKey.keyfile_does_not_exist), Exception);
+				       _app.GetResourceString(UiStringKey.keyfile_does_not_exist), false, Exception);
 			}
 			catch (AggregateException e)
 			{
@@ -100,20 +110,20 @@ namespace keepass2android
 					// Override the message shown with the last (hopefully most recent) inner exception
 					Kp2aLog.LogUnexpectedError(innerException);
 				}
-				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + message, Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + message, false, Exception);
 				return;
 			}
 			catch (DuplicateUuidsException e)
 			{
 				Kp2aLog.Log(e.ToString());
-				Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError) + " " + e.Message + _app.GetResourceString(UiStringKey.DuplicateUuidsErrorAdditional), Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError) + " " + e.Message + _app.GetResourceString(UiStringKey.DuplicateUuidsErrorAdditional), false, Exception);
 				return;
 			}
 			catch (Exception e)
 			{
 				if (!(e is InvalidCompositeKeyException))
 					Kp2aLog.LogUnexpectedError(e);
-				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + e.Message, Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + (e.Message ?? (e is FileNotFoundException ? _app.GetResourceString(UiStringKey.FileNotFound) :  "")), false, Exception);
 				return;
 			}
 			
@@ -125,7 +135,7 @@ namespace keepass2android
 		/// </summary>
 		public Exception Exception { get; set; }
 
-		private void TryLoad(MemoryStream databaseStream)
+		Database TryLoad(MemoryStream databaseStream)
 		{
 			//create a copy of the stream so we can try again if we get an exception which indicates we should change parameters
 			//This is not optimal in terms of (short-time) memory usage but is hard to avoid because the Keepass library closes streams also in case of errors.
@@ -138,19 +148,16 @@ namespace keepass2android
 			//now let's go:
 			try
 			{
-                _app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _format);
+                Database newDb = _app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _format, _makeCurrent);
 				Kp2aLog.Log("LoadDB OK");
 
-			    //make sure the stored access time for the actual file is more recent than that of its backup
-			    Thread.Sleep(10);
-                SaveFileData(_ioc, _keyfileOrProvider);
-
                 Finish(true, _format.SuccessMessage);
+			    return newDb;
 			}
 			catch (OldFormatException)
 			{
 				_format = new KdbDatabaseFormat(_app);
-				TryLoad(databaseStream);
+				return TryLoad(databaseStream);
 			}
 			catch (InvalidCompositeKeyException)
 			{
@@ -162,7 +169,7 @@ namespace keepass2android
 					//retry without password:
 					_compositeKey.RemoveUserKey(passwordKey);
 					//retry:
-					TryLoad(databaseStream);
+					return TryLoad(databaseStream);
 				}
 				else throw;
 			}
@@ -175,7 +182,7 @@ namespace keepass2android
             {
                 keyfileOrProvider = "";
             }
-            _app.StoreOpenedFileAsRecent(ioc, keyfileOrProvider);
+            _app.StoreOpenedFileAsRecent(ioc, keyfileOrProvider, _updateLastUsageTimestamp);
 		}
 		
 		

src/Kp2aBusinessLogic/database/edit/MoveElements.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Android.App;
@@ -50,10 +51,19 @@ namespace keepass2android.database.edit
 
             }
 
+		    HashSet<Database> removeDatabases = new HashSet<Database>();
+            Database addDatabase = _app.FindDatabaseForElement(_targetGroup);
+		    if (addDatabase == null)
+		    {
+		        Finish(false, "Did not find target database. Did you lock it?");
+		        return;
+		    }
+
 		    foreach (var elementToMove in _elementsToMove)
 		    {
 
-                _app.GetDb().Dirty.Add(elementToMove.ParentGroup);
+                _app.DirtyGroups.Add(elementToMove.ParentGroup);
+                
 
                 PwGroup pgParent = elementToMove.ParentGroup;
                 if (pgParent != _targetGroup)
@@ -63,8 +73,14 @@ namespace keepass2android.database.edit
                         PwEntry entry = elementToMove as PwEntry;
                         if (entry != null)
                         {
+                            var dbRem = _app.FindDatabaseForElement(entry);
+                            removeDatabases.Add(dbRem);
+                            dbRem.EntriesById.Remove(entry.Uuid);
+                            dbRem.Elements.Remove(entry);
                             pgParent.Entries.Remove(entry);
                             _targetGroup.AddEntry(entry, true, true);
+                            addDatabase.EntriesById.Add(entry.Uuid, entry);
+                            addDatabase.Elements.Add(entry);
                         }
                         else
                         {
@@ -74,27 +90,60 @@ namespace keepass2android.database.edit
                                 Finish(false, _app.GetResourceString(UiStringKey.CannotMoveGroupHere));
                                 return;
                             }
+
+                            var dbRem = _app.FindDatabaseForElement(@group);
+                            if (dbRem == null)
+                            {
+                                Finish(false, "Did not find source database. Did you lock it?");
+                                return;
+                            }
+
+                            dbRem.GroupsById.Remove(group.Uuid);
+                            dbRem.Elements.Remove(group);
+                            removeDatabases.Add(dbRem);
                             pgParent.Groups.Remove(group);
                             _targetGroup.AddGroup(group, true, true);
+                            addDatabase.GroupsById.Add(group.Uuid, group);
+                            addDatabase.Elements.Add(group);
                         }
                     }
+
                 }
 
 		    }
-			
-			
-			_onFinishToRun = new ActionOnFinish(ActiveActivity, (success, message, activity) =>
-			{
-				if (!success)
-				{	// Let's not bother recovering from a failure.
-					_app.LockDatabase(false);
-				}
-			}, OnFinishToRun);
 
-			// Save
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun, false);
-			save.SetStatusLogger(StatusLogger);
-			save.Run();
+		    
+            
+		    
+		    //first save the database where we added the elements
+            var allDatabasesToSave = new List<Database> {addDatabase};
+            //then all databases where we removed elements:
+		    removeDatabases.RemoveWhere(db => db == addDatabase);
+            allDatabasesToSave.AddRange(removeDatabases);
+
+		    int indexToSave = 0;
+		    bool allSavesSuccess = true;
+		    void ContinueSave(bool success, string message, Activity activeActivity)
+		    {
+		        allSavesSuccess &= success;
+                indexToSave++;
+		        if (indexToSave == allDatabasesToSave.Count)
+		        {
+		            OnFinishToRun.SetResult(allSavesSuccess);
+		            OnFinishToRun.Run();
+		            return;
+		        }
+		        SaveDb saveDb = new SaveDb(_ctx, _app, allDatabasesToSave[indexToSave], new ActionOnFinish(activeActivity, ContinueSave), false);
+		        saveDb.SetStatusLogger(StatusLogger);
+		        saveDb.ShowDatabaseIocInStatus = allDatabasesToSave.Count > 1;
+		        saveDb.Run();
+		    }
+
+
+		    SaveDb save = new SaveDb(_ctx, _app, allDatabasesToSave[0], new ActionOnFinish(ActiveActivity, ContinueSave), false);
+            save.SetStatusLogger(StatusLogger);
+		    save.ShowDatabaseIocInStatus = allDatabasesToSave.Count > 1;
+            save.Run();
 		}
 	}
 }

src/Kp2aBusinessLogic/database/edit/OnFinish.cs

@@ -16,6 +16,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   */
 
 using System;
+using Android;
 using Android.App;
 using Android.Content;
 using Android.OS;
@@ -28,11 +29,17 @@ namespace keepass2android
 		protected bool Success;
 		protected String Message;
 		protected Exception Exception;
-		
-		protected OnFinish BaseOnFinish;
+
+	    protected bool ImportantMessage
+	    {
+	        get;
+	        set;
+	    }
+
+        protected OnFinish BaseOnFinish;
 		protected Handler Handler;
 		private ProgressDialogStatusLogger _statusLogger = new ProgressDialogStatusLogger(); //default: no logging but not null -> can be used whenever desired
-	    private Activity _activeActivity;
+	    private Activity _activeActivity, _previouslyActiveActivity;
 
 
 	    public ProgressDialogStatusLogger StatusLogger
@@ -46,7 +53,12 @@ namespace keepass2android
 	        get { return _activeActivity; }
 	        set
 	        {
-	            _activeActivity = value;
+                if (_activeActivity != null && _activeActivity != _previouslyActiveActivity)
+                {
+                    _previouslyActiveActivity = _activeActivity;
+
+                }
+				_activeActivity = value;
 	            if (BaseOnFinish != null)
 	            {
 	                BaseOnFinish.ActiveActivity = value;
@@ -54,8 +66,15 @@ namespace keepass2android
 	        }
 	    }
 
+        public Activity PreviouslyActiveActivity
+        {
+            get { return _previouslyActiveActivity; }
 
-	    protected OnFinish(Activity activeActivity, Handler handler)
+        }
+
+
+
+		protected OnFinish(Activity activeActivity, Handler handler)
 	    {
 	        ActiveActivity = activeActivity;
 			BaseOnFinish = null;
@@ -77,20 +96,22 @@ namespace keepass2android
 			Handler = null;
 		}
 
-		public void SetResult(bool success, string message, Exception exception) {
+		public void SetResult(bool success, string message, bool importantMessage, Exception exception) {
 			Success = success;
 			Message = message;
+		    ImportantMessage = importantMessage;
 			Exception = exception;
 		}
-		
-		public void SetResult(bool success) {
+
+
+	    public void SetResult(bool success) {
 			Success = success;
 		}
 		
 		public virtual void Run() {
 			if (BaseOnFinish == null) return;
 			// Pass on result on call finish
-			BaseOnFinish.SetResult(Success, Message, Exception);
+			BaseOnFinish.SetResult(Success, Message, ImportantMessage, Exception);
 				
 			if ( Handler != null ) {
 				Handler.Post(BaseOnFinish.Run); 
@@ -100,14 +121,31 @@ namespace keepass2android
 		}
 		
 		protected void DisplayMessage(Context ctx) {
-			DisplayMessage(ctx, Message);
+			DisplayMessage(ctx, Message, ImportantMessage);
 		}
 
-		public static void DisplayMessage(Context ctx, string message)
+		public static void DisplayMessage(Context ctx, string message, bool makeDialog)
 		{
 			if ( !String.IsNullOrEmpty(message) ) {
-				Kp2aLog.Log("OnFinish message: "+message);
-				Toast.MakeText(ctx ?? Application.Context, message, ToastLength.Long).Show();
+			    Kp2aLog.Log("OnFinish message: " + message);
+                if (makeDialog && ctx != null)
+			    {
+			        try
+			        {
+			            AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+			            
+			            builder.SetMessage(message)
+			                .SetPositiveButton(Android.Resource.String.Ok, (sender, args) => ((Dialog)sender).Dismiss())
+			                .Show();
+
+                    }
+                    catch (Exception)
+			        {
+			            Toast.MakeText(ctx, message, ToastLength.Long).Show();
+			        }
+			    }
+                else
+                    Toast.MakeText(ctx ?? Application.Context, message, ToastLength.Long).Show();
 			}
 		}
 	}

src/Kp2aBusinessLogic/database/edit/RunnableOnFinish.cs

@@ -50,9 +50,9 @@ namespace keepass2android
 	        }
 	    }
 
-        protected void Finish(bool result, String message, Exception exception = null) {
+        protected void Finish(bool result, String message, bool importantMessage = false, Exception exception = null) {
 			if ( OnFinishToRun != null ) {
-				OnFinishToRun.SetResult(result, message, exception);
+				OnFinishToRun.SetResult(result, message, importantMessage, exception);
 				OnFinishToRun.Run();
 			}
 		}

src/Kp2aBusinessLogic/database/edit/SaveDB.cs

@@ -34,7 +34,8 @@ namespace keepass2android
 
 	public class SaveDb : RunnableOnFinish {
 		private readonly IKp2aApp _app;
-		private readonly bool _dontSave;
+	    private readonly Database _db;
+	    private readonly bool _dontSave;
 
 		/// <summary>
 		/// stream for reading the data from the original file. If this is set to a non-null value, we know we need to sync
@@ -43,9 +44,10 @@ namespace keepass2android
 		private readonly Context _ctx;
 		private Thread _workerThread;
 
-		public SaveDb(Activity ctx, IKp2aApp app, OnFinish finish, bool dontSave)
+		public SaveDb(Activity ctx, IKp2aApp app, Database db, OnFinish finish, bool dontSave)
 			: base(ctx, finish)
 		{
+		    _db = db;
 			_ctx = ctx;
 			_app = app;
 			_dontSave = dontSave;
@@ -59,46 +61,55 @@ namespace keepass2android
 		/// <param name="finish"></param>
 		/// <param name="dontSave"></param>
 		/// <param name="streamForOrigFile">Stream for reading the data from the (changed) original location</param>
-		public SaveDb(Activity ctx, IKp2aApp app, OnFinish finish, bool dontSave, Stream streamForOrigFile)
+		public SaveDb(Activity ctx, IKp2aApp app, OnFinish finish, Database db, bool dontSave, Stream streamForOrigFile)
 			: base(ctx, finish)
 		{
+		    _db = db;
 			_ctx = ctx;
 			_app = app;
 			_dontSave = dontSave;
 			_streamForOrigFile = streamForOrigFile;
 		}
 
-		public SaveDb(Activity ctx, IKp2aApp app, OnFinish finish)
+		public SaveDb(Activity ctx, IKp2aApp app, Database db, OnFinish finish)
 			: base(ctx, finish)
 		{
 			_ctx = ctx;
 			_app = app;
-			_dontSave = false;
+		    _db = db;
+		    _dontSave = false;
 		}
-		
-		
-		public override void Run ()
+
+	    public bool ShowDatabaseIocInStatus { get; set; }
+	    
+	    public override void Run ()
 		{
 
 			if (!_dontSave)
 			{
 				try
 				{
-					if (_app.GetDb().CanWrite == false)
+					if (_db.CanWrite == false)
 					{
 						//this should only happen if there is a problem in the UI so that the user sees an edit interface.
 						Finish(false,"Cannot save changes. File is read-only!");
 						return;
 					}
 
-					StatusLogger.UpdateMessage(UiStringKey.saving_database);
-					IOConnectionInfo ioc = _app.GetDb().Ioc;
+				    string message = _app.GetResourceString(UiStringKey.saving_database);
+
+				    if (ShowDatabaseIocInStatus)
+				        message += " (" + _app.GetFileStorage(_db.Ioc).GetDisplayName(_db.Ioc) + ")";
+
+                    StatusLogger.UpdateMessage(message);
+                    
+					IOConnectionInfo ioc = _db.Ioc;
 					IFileStorage fileStorage = _app.GetFileStorage(ioc);
 
 					if (_streamForOrigFile == null)
 					{
 						if ((!_app.GetBooleanPreference(PreferenceKey.CheckForFileChangesOnSave))
-							|| (_app.GetDb().KpDatabase.HashOfFileOnDisk == null)) //first time saving
+							|| (_db.KpDatabase.HashOfFileOnDisk == null)) //first time saving
 						{
 							PerformSaveWithoutCheck(fileStorage, ioc);
 							Finish(true);
@@ -109,8 +120,8 @@ namespace keepass2android
 
 					if (
 						(_streamForOrigFile != null)
-						|| fileStorage.CheckForFileChangeFast(ioc, _app.GetDb().LastFileVersion)  //first try to use the fast change detection
-						|| (FileHashChanged(ioc, _app.GetDb().KpDatabase.HashOfFileOnDisk) == FileHashChange.Changed) //if that fails, hash the file and compare:
+						|| fileStorage.CheckForFileChangeFast(ioc, _db.LastFileVersion)  //first try to use the fast change detection
+						|| (FileHashChanged(ioc, _db.KpDatabase.HashOfFileOnDisk) == FileHashChange.Changed) //if that fails, hash the file and compare:
 						)
 					{
 
@@ -128,6 +139,7 @@ namespace keepass2android
 										//small.
 										MergeIn(fileStorage, ioc);
 										PerformSaveWithoutCheck(fileStorage, ioc);
+                                        _db.UpdateGlobals();
 										Finish(true);
 									};
 								RunInWorkerThread(runHandler);
@@ -217,13 +229,13 @@ namespace keepass2android
 			StatusLogger.UpdateSubMessage(_app.GetResourceString(UiStringKey.SynchronizingDatabase));
 
 			PwDatabase pwImp = new PwDatabase();
-			PwDatabase pwDatabase = _app.GetDb().KpDatabase;
-			pwImp.New(new IOConnectionInfo(), pwDatabase.MasterKey);
+			PwDatabase pwDatabase = _db.KpDatabase;
+			pwImp.New(new IOConnectionInfo(), pwDatabase.MasterKey, _app.GetFileStorage(ioc).GetFilenameWithoutPathAndExt(ioc));
 			pwImp.MemoryProtection = pwDatabase.MemoryProtection.CloneDeep();
 			pwImp.MasterKey = pwDatabase.MasterKey;
 			var stream = GetStreamForBaseFile(fileStorage, ioc);
 
-			_app.GetDb().DatabaseFormat.PopulateDatabaseFromStream(pwImp, stream, null);
+			_db.DatabaseFormat.PopulateDatabaseFromStream(pwImp, stream, null);
 			
 
 			pwDatabase.MergeIn(pwImp, PwMergeMethod.Synchronize, null); 
@@ -249,8 +261,8 @@ namespace keepass2android
 		private void PerformSaveWithoutCheck(IFileStorage fileStorage, IOConnectionInfo ioc)
 		{
 			StatusLogger.UpdateSubMessage("");
-			_app.GetDb().SaveData();
-			_app.GetDb().LastFileVersion = fileStorage.GetCurrentFileVersionFast(ioc);
+			_db.SaveData();
+			_db.LastFileVersion = fileStorage.GetCurrentFileVersionFast(ioc);
 		}
 
 		public byte[] HashOriginalFile(IOConnectionInfo iocFile)

src/Kp2aBusinessLogic/database/edit/SetPassword.cs

@@ -52,7 +52,7 @@ namespace keepass2android
 		public override void Run ()
 		{
 			StatusLogger.UpdateMessage(UiStringKey.SettingPassword);
-			PwDatabase pm = _app.GetDb().KpDatabase;
+			PwDatabase pm = _app.CurrentDb.KpDatabase;
 			CompositeKey newKey = new CompositeKey ();
 			if (String.IsNullOrEmpty (_password) == false) {
 				newKey.AddUserKey (new KcpPassword (_password)); 
@@ -74,7 +74,7 @@ namespace keepass2android
 
 			// Save Database
 			_onFinishToRun = new AfterSave(ActiveActivity, previousKey, previousMasterKeyChanged, pm, OnFinishToRun);
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun, _dontSave);
+			SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, OnFinishToRun, _dontSave);
 			save.SetStatusLogger(StatusLogger);
 			save.Run();
 		}

src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs

@@ -36,7 +36,7 @@ namespace keepass2android
 		
 		public override void Run() {
 			// Commit to disk
-			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun);
+			SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, OnFinishToRun);
 			save.SetStatusLogger(StatusLogger);
 			save.Run();
 		}
@@ -59,7 +59,7 @@ namespace keepass2android
 					if ( parent != null ) {
 
 						// Mark parent group dirty
-						_app.GetDb().Dirty.Add(parent);
+						_app.DirtyGroups.Add(parent);
 							
 					}
 					

src/Kp2aBusinessLogic/packages.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Annotations" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Compat" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Core.UI" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Core.Utils" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Fragment" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.Media.Compat" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.v13" version="26.1.0.1" targetFramework="monoandroid81" />
-  <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="MonoAndroid50" />
-</packages>

src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj

@@ -10,8 +10,9 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <AssemblyName>Kp2aKeyboardBinding</AssemblyName>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -67,5 +68,4 @@
   <ItemGroup>
     <Folder Include="libs\" />
   </ItemGroup>
-  
-</Project>
+</Project>

src/PCloudBindings/PCloudBindings.csproj

@@ -4,19 +4,15 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}</ProjectGuid>
-
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
-
-
-
-
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PCloudBindings</RootNamespace>
     <AssemblyName>PCouldBindings</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,7 +22,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
-
     <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +32,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
     <OutputPath>bin\ReleaseNoNet\</OutputPath>
@@ -53,27 +47,20 @@
   <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\pcloud-sdk-android-1.0.1.aar" />
+    <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.1.0.aar" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml" />
     <TransformFile Include="Transforms\EnumFields.xml" />
     <TransformFile Include="Transforms\EnumMethods.xml" />
-
   </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. 
@@ -84,7 +71,6 @@
   </Target>
   -->
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.0.1.jar" />
+    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.1.0.jar" />
   </ItemGroup>
-
-</Project>
+</Project>

src/PCloudBindings/Properties/AssemblyInfo.cs

@@ -26,5 +26,5 @@ using Android.App;
 // 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")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

src/PluginSdkBinding/PluginSdkBinding.csproj

@@ -11,7 +11,8 @@
     <AssemblyName>PluginSdkBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <LibraryProjectZip Include="..\java\Keepass2AndroidPluginSDK2\app\build\outputs\aar\app-release.aar">
-      <Link>Jars\app-release.aar</Link>
+      <Link>Jars\Keepass2AndroidPluginSDK2-release.aar</Link>
     </LibraryProjectZip>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />

src/TwofishCipher/TwofishCipher.csproj

@@ -12,8 +12,8 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/ZlibAndroid/ZlibAndroid.csproj

@@ -11,9 +11,9 @@
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AssemblyName>ZlibAndroid</AssemblyName>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/build-scripts/build-all.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+echo '*****************************************'
+echo '******* Building native libraries *******'
+echo '*****************************************'
+./build-native.sh
+
 echo '*****************************************'
 echo '********** Building Java parts **********'
 echo '*****************************************'

src/build-scripts/build-apk.sh

@@ -3,6 +3,12 @@ set -e
 
 pushd ../keepass2android
 
-xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+else
+	xabuild keepass2android.csproj /p:AndroidSdkDirectory=$ANDROID_HOME /t:SignAndroidPackage "$@"
+fi
 
 popd

src/build-scripts/build-java.bat

@@ -1,10 +1,18 @@
 cd ..\java\JavaFileStorageTest-AS
-call gradlew assemble
+./gradlew clean assemble
+
 
 cd ..\KP2ASoftkeyboard_AS
-call gradlew assemble
+./gradlew clean assemble
 
 cd ..\Keepass2AndroidPluginSDK2
-call gradlew assemble
+./gradlew clean assemble
 
-cd ..\..\build-scripts
+
+cd ..\KP2AKdbLibrary
+./gradlew clean assemble
+
+cd ..\PluginQR
+./gradlew clean assemble
+
+cd ..\..\build-scripts