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

@@ -8,3 +8,27 @@ files:
       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/README.md

@@ -13,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>
@@ -83,12 +85,6 @@
   <ItemGroup>
     <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>
@@ -144,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,8 +21,6 @@ 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}"
@@ -111,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
@@ -189,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
@@ -207,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
@@ -225,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
@@ -255,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

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/KcpUserAccount.cs

@@ -21,7 +21,6 @@
 
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Security;
 
 #if !KeePassUAP
@@ -78,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/PwDatabase.cs

@@ -587,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");
@@ -602,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.
@@ -669,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.
@@ -717,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/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

@@ -375,13 +375,16 @@ namespace KeePassLib.Serialization
 
             // See also KeePassKdb2x3.Export (KDBX 3.1 export module)
 		    uint minVersionForKeys = m_pwDatabase.MasterKey.UserKeys.Select(key => key.GetMinKdbxVersion()).Max();
-		    
+
+		    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 Math.Max(FileVersion32, minVersionForKeys);
+				return Math.Max(FileVersion32, minRequiredVersion);
 
 			if(m_pwDatabase.PublicCustomData.Count > 0)
-			    return Math.Max(FileVersion32, minVersionForKeys);
+			    return Math.Max(FileVersion32, minRequiredVersion);
 
 
 
@@ -401,9 +404,9 @@ namespace KeePassLib.Serialization
 			gh(m_pwDatabase.RootGroup);
 			m_pwDatabase.RootGroup.TraverseTree(TraversalMethod.PreOrder, gh, eh);
 			if(bCustomData)
-			    return Math.Max(FileVersion32, minVersionForKeys);
+			    return Math.Max(FileVersion32, minRequiredVersion);
 
-            return Math.Max(FileVersion32_3, minVersionForKeys); ; // 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/IKp2aApp.cs

@@ -11,7 +11,7 @@ using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using keepass2android.Io;
 using KeePassLib.Interfaces;
-#if !NoNet
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 using Keepass2android.Javafilestorage;
 #endif 
 
@@ -29,7 +29,7 @@ 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.
@@ -38,7 +38,7 @@ namespace keepass2android
         /// <summary>
         /// Locks all currently open databases, quicklocking if available (unless false is passed for allowQuickUnlock)
         /// </summary>
-        void Lock(bool allowQuickUnlock);
+        void Lock(bool allowQuickUnlock, bool lockWasTriggeredByTimeout);
 
 
         /// <summary>
@@ -123,7 +123,7 @@ namespace keepass2android
 
 		
 		bool CheckForDuplicateUuids { get; }
-#if !NoNet
+#if !NoNet && !EXCLUDE_JAVAFILESTORAGE
 		ICertificateErrorHandler CertificateErrorHandler { get; }
 	    
 

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;
 		}
@@ -265,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)
 			{
@@ -328,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);
 		}

src/Kp2aBusinessLogic/Io/CachingFileStorage.cs

@@ -448,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;
 		}

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,39 +54,8 @@
     <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" />
@@ -107,21 +77,13 @@
     <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" />
@@ -157,10 +119,6 @@
     <Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
   </ItemGroup>
   <ItemGroup>
-    <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>
@@ -169,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>
@@ -182,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/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/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); 
 			}
@@ -104,7 +104,9 @@ namespace keepass2android
 			if (String.IsNullOrWhiteSpace(host))
 				return pgResults;
 			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

@@ -88,6 +88,7 @@ namespace keepass2android
 		ReadOnlyReason_ReadOnlyKitKat,
         ReadOnlyReason_LocalBackup,
         Ok,
-        cancel
+        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/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/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

@@ -31,15 +31,17 @@ namespace keepass2android
 		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);
 		}
 		
-		public 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;
 			
@@ -57,10 +59,13 @@ namespace keepass2android
 			{
 				_parentGroup.AddEntry(_entry, true);	
 			}
-			
-			
-			// Commit to disk
-			SaveDb save = new SaveDb(_ctx, _app, _app.CurrentDb, 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();
 		}
@@ -86,9 +91,7 @@ namespace keepass2android
 					// Mark parent group dirty
 					_app.DirtyGroups.Add(parent);
 					
-					// Add entry to global
-					_db.EntriesById[_entry.Uuid] = _entry;
-				    _db.Elements.Add(_entry);
+
 
 				} else
 				{

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

@@ -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";

src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs

@@ -234,7 +234,7 @@ namespace keepass2android
 				else
 				{
 					// Let's not bother recovering from a failure to save.  It is too much work.
-					App.Lock(false);
+					App.Lock(false, false);
 				}
 			}, OnFinishToRun);
 

src/Kp2aBusinessLogic/database/edit/EditGroup.cs

@@ -82,7 +82,7 @@ namespace keepass2android
 					_editGroup.App.DirtyGroups.Add(_editGroup.Group.ParentGroup);
 				} else
 				{
-					_editGroup._app.Lock(false);
+					_editGroup._app.Lock(false, false);
 				}
 				
 				base.Run();

src/Kp2aBusinessLogic/database/edit/LoadDB.cs

@@ -82,7 +82,7 @@ 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);
 
 
@@ -123,7 +123,7 @@ namespace keepass2android
 			{
 				if (!(e is InvalidCompositeKeyException))
 					Kp2aLog.LogUnexpectedError(e);
-				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + e.Message, false, Exception);
+				Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + (e.Message ?? (e is FileNotFoundException ? _app.GetResourceString(UiStringKey.FileNotFound) :  "")), false, Exception);
 				return;
 			}
 			

src/Kp2aBusinessLogic/database/edit/OnFinish.cs

@@ -39,7 +39,7 @@ namespace keepass2android
         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
@@ -53,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;
@@ -61,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;

src/Kp2aBusinessLogic/database/edit/SaveDB.cs

@@ -230,7 +230,7 @@ namespace keepass2android
 
 			PwDatabase pwImp = new PwDatabase();
 			PwDatabase pwDatabase = _db.KpDatabase;
-			pwImp.New(new IOConnectionInfo(), pwDatabase.MasterKey);
+			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);

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>

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>
@@ -53,7 +54,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <LibraryProjectZip Include="..\java\Keepass2AndroidPluginSDK2\app\build\outputs\aar\Keepass2AndroidPluginSDK2-release.aar">
+    <LibraryProjectZip Include="..\java\Keepass2AndroidPluginSDK2\app\build\outputs\aar\app-release.aar">
       <Link>Jars\Keepass2AndroidPluginSDK2-release.aar</Link>
     </LibraryProjectZip>
     <None Include="Jars\AboutJars.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,13 +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 ..\KP2AKdbLibrary
+./gradlew clean assemble
 
 cd ..\PluginQR
-call gradlew assemble
+./gradlew clean assemble
 
 cd ..\..\build-scripts

src/build-scripts/build-java.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+unset ANDROID_NDK_HOME ANDROID_NDK
+
 pushd ../java/
 
 pushd JavaFileStorageTest-AS

src/build-scripts/build-native.sh

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

src/build-scripts/build-xamarin.bat

@@ -6,11 +6,11 @@ if exist "DropboxFileStorageKeys.cs" (
 )
 
 cd ..\..\keepass2android
-call UseManifestDebug.bat
+call UseManifestNoNet.bat
 cd ..
 
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 
-msbuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU"
+msbuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Release" /p:Platform="Any CPU"
 
 cd build-scripts

src/build-scripts/build-xamarin.sh

@@ -20,6 +20,12 @@ popd
 
 # call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 
-xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+else
+	xabuild KeePass.sln /target:keepass2android /p:AndroidSdkDirectory=$ANDROID_HOME /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+fi
 
 popd

src/build-scripts/get-dependencies.bat

@@ -0,0 +1,17 @@
+cd ..\java\JavaFileStorageTest-AS
+./gradlew -q :app:dependencies > ../../build-scripts/dependencies-JavaFileStorageTest-AS.txt
+
+cd ..\KP2ASoftkeyboard_AS
+./gradlew -q :app:dependencies > ../../build-scripts/dependencies-KP2ASoftkeyboard_AS.txt
+
+cd ..\Keepass2AndroidPluginSDK2
+./gradlew -q :app:dependencies > ../../build-scripts/dependencies-Keepass2AndroidPluginSDK2.txt
+
+
+cd ..\KP2AKdbLibrary
+./gradlew -q :app:dependencies > ../../build-scripts/dependencies-KP2AKdbLibrary.txt
+
+cd ..\PluginQR
+./gradlew -q :app:dependencies > ../../build-scripts/dependencies-PluginQR.txt
+
+cd ..\..\build-scripts

src/build.readme.md

@@ -43,6 +43,7 @@ build-java.bat will call gradlew for several Java modules. build-xamarin.bat wil
 - Install [libzip](https://libzip.org/) for your distribution.
   - Note: Xamarin seems to require `libzip4`, yet most distributions only ships `libzip5`. As a dirty workaround, it's possible to symlink `libzip.so.5` to `libzip.so.4`. Luckily, it appears to be working.
   - `sudo ln -s /usr/lib/libzip.so.5 /usr/lib/libzip.so.4`
+  - or `sudo ln -s /usr/lib64/libzip.so.5 /usr/lib/libzip.so.4`
 - Install NuGet dependencies:
   - `cd src/ && nuget restore KeePass.sln`
 - Build:

src/java/JavaFileStorage/app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 28
     }
     buildTypes {
         release {
@@ -21,26 +21,27 @@ android {
     }
 }
 
+/*
+NOTE: If you change dependencies here, don't forget to update the jar files in JavaFileStorageBindings as well!
+ */
+
 dependencies {
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.burgstaller:okhttp-digest:1.7'
+    compile 'com.android.support:appcompat-v7:28.0.0'
+    compile 'com.squareup.okhttp3:okhttp:4.10.0-RC1'
+    compile 'com.burgstaller:okhttp-digest:2.5'
     compile 'com.google.android.gms:play-services:4.0.30'
     compile 'com.google.http-client:google-http-client-gson:1.20.0'
     compile('com.google.api-client:google-api-client-android:1.16.0-rc') {
         exclude group: 'com.google.android.google-play-services'
     }
     compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
-    compile 'com.dropbox.core:dropbox-core-sdk:3.0.3'
+    compile 'com.dropbox.core:dropbox-core-sdk:3.1.1'
     //onedrive:
     compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
         transitive = false
     }
-    compile 'com.pcloud.sdk:java-core:1.0.1'
-    compile 'com.pcloud.sdk:android:1.0.1'
-    compile('com.microsoft.graph:msgraph-sdk-android:1.2.+')
-    compile ('com.microsoft.identity.client:msal:0.1.+') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
+    compile 'com.pcloud.sdk:java-core:1.1.0'
+    compile 'com.pcloud.sdk:android:1.1.0'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.microsoft.services.msa:msa-auth:0.8.6'
     compile 'com.microsoft.aad:adal:1.14.0'

src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jgss/GSSContextKrb5.java

@@ -31,147 +31,7 @@ package com.jcraft.jsch.jgss;
 
 import com.jcraft.jsch.JSchException;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import org.ietf.jgss.GSSContext;
-import org.ietf.jgss.GSSCredential;
-import org.ietf.jgss.GSSException;
-import org.ietf.jgss.GSSManager;
-import org.ietf.jgss.GSSName;
-import org.ietf.jgss.MessageProp;
-import org.ietf.jgss.Oid;
 
-public class GSSContextKrb5 implements com.jcraft.jsch.GSSContext{
+public class GSSContextKrb5 {
 
-  private static final String pUseSubjectCredsOnly = 
-    "javax.security.auth.useSubjectCredsOnly";
-  private static String useSubjectCredsOnly = 
-    getSystemProperty(pUseSubjectCredsOnly);
-
-  private GSSContext context=null;
-  public void create(String user, String host) throws JSchException{
-    try{
-      // RFC 1964
-      Oid krb5=new Oid("1.2.840.113554.1.2.2");
-      // Kerberos Principal Name Form
-      Oid principalName=new Oid("1.2.840.113554.1.2.2.1");
-
-      GSSManager mgr=GSSManager.getInstance();
-
-      GSSCredential crd=null;
-      /*
-      try{
-        GSSName _user=mgr.createName(user, principalName);
-        crd=mgr.createCredential(_user,
-                                 GSSCredential.DEFAULT_LIFETIME,
-                                 krb5,
-                                 GSSCredential.INITIATE_ONLY);
-      }
-      catch(GSSException crdex){
-      }
-      */
-
-      String cname=host;
-      try{
-        cname=InetAddress.getByName(cname).getCanonicalHostName();
-      }
-      catch(UnknownHostException e){
-      }
-      GSSName _host=mgr.createName("host/"+cname, principalName);
-
-      context=mgr.createContext(_host,
-                                krb5,
-                                crd,
-                                GSSContext.DEFAULT_LIFETIME);
-
-      // RFC4462  3.4.  GSS-API Session
-      //
-      // When calling GSS_Init_sec_context(), the client MUST set
-      // integ_req_flag to "true" to request that per-message integrity
-      // protection be supported for this context.  In addition,
-      // deleg_req_flag MAY be set to "true" to request access delegation, if
-      // requested by the user.
-      //
-      // Since the user authentication process by its nature authenticates
-      // only the client, the setting of mutual_req_flag is not needed for
-      // this process.  This flag SHOULD be set to "false".
-
-      // TODO: OpenSSH's sshd does accepts 'false' for mutual_req_flag
-      //context.requestMutualAuth(false);
-      context.requestMutualAuth(true);
-      context.requestConf(true);
-      context.requestInteg(true);             // for MIC
-      context.requestCredDeleg(true);
-      context.requestAnonymity(false);
-
-      return;
-    }
-    catch(GSSException ex){
-      throw new JSchException(ex.toString());
-    }
-  }
-
-  public boolean isEstablished(){
-    return context.isEstablished();
-  }
-
-  public byte[] init(byte[] token, int s, int l) throws JSchException {
-    try{
-      // Without setting "javax.security.auth.useSubjectCredsOnly" to "false",
-      // Sun's JVM for Un*x will show messages to stderr in
-      // processing context.initSecContext().
-      // This hack is not thread safe ;-<.
-      // If that property is explicitly given as "true" or "false",
-      // this hack must not be invoked.
-      if(useSubjectCredsOnly==null){
-        setSystemProperty(pUseSubjectCredsOnly, "false");
-      }
-      return context.initSecContext(token, 0, l);
-    }
-    catch(GSSException ex){
-      throw new JSchException(ex.toString());
-    }
-    catch(java.lang.SecurityException ex){
-      throw new JSchException(ex.toString());
-    }
-    finally{
-      if(useSubjectCredsOnly==null){
-        // By the default, it must be "true".
-        setSystemProperty(pUseSubjectCredsOnly, "true");
-      }
-    }
-  }
-
-  public byte[] getMIC(byte[] message, int s, int l){
-    try{
-      MessageProp prop =  new MessageProp(0, true);
-      return context.getMIC(message, s, l, prop);
-    }
-    catch(GSSException ex){
-      return null;
-    }
-  }
-
-  public void dispose(){
-    try{
-      context.dispose();
-    }
-    catch(GSSException ex){
-    }
-  }
-
-  private static String getSystemProperty(String key){
-    try{ return System.getProperty(key); }
-    catch(Exception e){ 
-      // We are not allowed to get the System properties.
-      return null; 
-    } 
-  }
-
-  private static void setSystemProperty(String key, String value){
-    try{ System.setProperty(key, value); }
-    catch(Exception e){ 
-      // We are not allowed to set the System properties.
-    }
-  }
 }

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

@@ -186,7 +186,8 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
 				return displayName;
 			
 			String[] parts = mAccountLocalPath.split("/");
-			
+			if (parts.length == 0)
+				return "";
 			String part = parts[parts.length-1];
 			logDebug("parsing part " + part);
 			int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP);

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

@@ -1,486 +0,0 @@
-package keepass2android.javafilestorage;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-
-import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.DefaultClientConfig;
-import com.microsoft.graph.core.GraphErrorCodes;
-import com.microsoft.graph.extensions.DriveItem;
-import com.microsoft.graph.extensions.GraphServiceClient;
-import com.microsoft.graph.extensions.IDriveItemCollectionPage;
-import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
-import com.microsoft.graph.extensions.IDriveItemRequest;
-import com.microsoft.graph.extensions.IDriveItemRequestBuilder;
-import com.microsoft.graph.extensions.IGraphServiceClient;
-import com.microsoft.identity.client.AuthenticationCallback;
-import com.microsoft.identity.client.AuthenticationResult;
-import com.microsoft.identity.client.MsalException;
-import com.microsoft.identity.client.PublicClientApplication;
-import com.microsoft.identity.client.User;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
-import keepass2android.javafilestorage.onedrive2.GraphServiceClientManager;
-
-
-/**
- * Created by Philipp on 20.11.2016.
- */
-public class OneDriveStorage2 extends JavaFileStorageBase
-{
-    PublicClientApplication mPublicClientApp;
-
-    final HashMap<String /*userid*/, IGraphServiceClient> mClientByUser = new HashMap<String /*userid*/, IGraphServiceClient>();
-
-    private static final String[] scopes = {"openid","offline_access", "https://graph.microsoft.com/Files.ReadWrite","https://graph.microsoft.com/User.Read"};
-
-
-    public OneDriveStorage2(final Activity context, final String clientId) {
-
-        mPublicClientApp = new PublicClientApplication(context, clientId);
-        initAuthenticator(context);
-
-
-    }
-
-
-    @Override
-    public boolean requiresSetup(String path)
-    {
-
-        return !isConnected(null);
-    }
-
-    @Override
-    public void startSelectFile(FileStorageSetupInitiatorActivity activity, boolean isForSave, int requestCode) {
-
-        initAuthenticator((Activity)activity.getActivity());
-
-        String path = getProtocolId()+":///";
-        Log.d("KP2AJ", "startSelectFile "+path+", connected: "+path);
-		if (isConnected(null))
-		{
-			Intent intent = new Intent();
-			intent.putExtra(EXTRA_IS_FOR_SAVE, isForSave);
-			intent.putExtra(EXTRA_PATH, path);
-			activity.onImmediateResult(requestCode, RESULT_FILECHOOSER_PREPARED, intent);
-		}
-		else
-        {
-            activity.startSelectFileProcess(path, isForSave, requestCode);
-        }
-    }
-
-    private boolean isConnected(String path) {
-        try {
-            if (tryGetMsGraphClient(path) == null)
-                try {
-                    final CountDownLatch latch = new CountDownLatch(1);
-
-                    Log.d("KP2AJ", "trying silent login");
-
-                    String userId = extractUserId(path);
-                    final MsalException[] _exception = {null};
-                    final AuthenticationResult[] _result = {null};
-                    User user = mPublicClientApp.getUser(userId);
-                    mPublicClientApp.acquireTokenSilentAsync(scopes, user,
-                            new AuthenticationCallback() {
-
-                                @Override
-                                public void onSuccess(AuthenticationResult authenticationResult) {
-                                    _result[0] = authenticationResult;
-                                    latch.countDown();
-                                }
-
-                                @Override
-                                public void onError(MsalException exception) {
-                                    _exception[0] = exception;
-                                    latch.countDown();
-                                }
-
-                                @Override
-                                public void onCancel() {
-                                    latch.countDown();
-
-                                }
-                            });
-                    latch.await();
-                    if (_result[0] != null) {
-                        buildClient(_result[0]);
-                    } else if (_exception[0] != null){
-                        _exception[0].printStackTrace();
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            return tryGetMsGraphClient(path) != null;
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-
-    }
-
-    private IGraphServiceClient tryGetMsGraphClient(String path) throws Exception
-    {
-        String userId = extractUserId(path);
-        if (mClientByUser.containsKey(userId))
-            return mClientByUser.get(userId);
-        return null;
-    }
-
-    private String extractUserId(String path) throws Exception {
-        String pathWithoutProtocol = removeProtocol(path);
-        String[] parts = pathWithoutProtocol.split("/",1);
-        if (parts.length != 2 || ("".equals(parts[0])))
-        {
-            throw new Exception("path does not contain user");
-        }
-        return parts[0];
-    }
-
-    private void initAuthenticator(Activity activity) {
-
-
-    }
-
-
-    @Override
-    public void prepareFileUsage(FileStorageSetupInitiatorActivity activity, String path, int requestCode, boolean alwaysReturnSuccess) {
-        initAuthenticator((Activity)activity.getActivity());
-        if (isConnected(path))
-        {
-            Intent intent = new Intent();
-            intent.putExtra(EXTRA_PATH, path);
-            activity.onImmediateResult(requestCode, RESULT_FILEUSAGE_PREPARED, intent);
-        }
-        else
-        {
-            activity.startFileUsageProcess(path, requestCode, alwaysReturnSuccess);
-        }
-
-    }
-
-    @Override
-    public String getProtocolId() {
-        return "onedrive";
-    }
-
-    @Override
-    public void prepareFileUsage(Context appContext, String path) throws UserInteractionRequiredException {
-        if (!isConnected(null))
-        {
-            throw new UserInteractionRequiredException();
-        }
-
-    }
-
-    @Override
-    public void onCreate(FileStorageSetupActivity activity, Bundle savedInstanceState) {
-
-        Log.d("KP2AJ", "OnCreate");
-
-    }
-
-    @Override
-    public void onResume(final FileStorageSetupActivity activity) {
-
-
-
-
-    }
-
-
-
-    private IGraphServiceClient buildClient(AuthenticationResult authenticationResult) throws InterruptedException {
-
-        IGraphServiceClient newClient = new GraphServiceClient.Builder()
-                .fromConfig(DefaultClientConfig.createWithAuthenticationProvider(new GraphServiceClientManager(authenticationResult.getAccessToken())))
-                .buildClient();
-        mClientByUser.put(authenticationResult.getUser().getUserIdentifier(), newClient);
-
-        return newClient;
-    }
-
-
-
-    String removeProtocol(String path) throws Exception {
-        if (path == null)
-            return null;
-        return path.substring(getProtocolId().length()+3);
-    }
-
-    @Override
-    public String getDisplayName(String path) {
-
-        if (path == null)
-            return null;
-
-        return path;
-    }
-
-    @Override
-    public String getFilename(String path) throws Exception {
-        return path.substring(path.lastIndexOf("/")+1);
-    }
-
-    @Override
-    public boolean checkForFileChangeFast(String path, String previousFileVersion) throws Exception {
-        return false;
-    }
-
-    @Override
-    public String getCurrentFileVersionFast(String path) {
-        return null;
-    }
-
-    class ClientAndPath
-    {
-        public IGraphServiceClient client;
-        public String oneDrivePath;
-        public IDriveItemRequestBuilder getPathItem()
-        {
-            IDriveItemRequestBuilder pathItem = client.getDrive().getRoot();
-            if ("".equals(oneDrivePath) == false) {
-                pathItem = pathItem.getItemWithPath(oneDrivePath);
-            }
-            return pathItem;
-        }
-    }
-
-    @Override
-    public InputStream openFileForRead(String path) throws Exception {
-        try {
-            ClientAndPath clientAndpath = getOneDriveClientAndPath(path);
-            logDebug("openFileForRead. Path="+path);
-            InputStream result = clientAndpath.client.getDrive()
-                    .getRoot()
-                    .getItemWithPath(clientAndpath.oneDrivePath)
-                    .getContent()
-                    .buildRequest()
-                    .get();
-            logDebug("ok");
-            return result;
-
-        }
-        catch (ClientException e)
-        {
-            throw convertException(e);
-        }
-    }
-
-    private ClientAndPath getOneDriveClientAndPath(String path) throws Exception {
-        ClientAndPath result = new ClientAndPath();
-
-        String pathWithoutProtocol = removeProtocol(path);
-        String[] parts = pathWithoutProtocol.split("/",2);
-        if (parts.length != 2 || ("".equals(parts[0])))
-        {
-            throw new Exception("path does not contain user");
-        }
-        result.client = mClientByUser.get(parts[0]);
-        result.oneDrivePath = parts[1];
-        return result;
-
-    }
-
-
-    private Exception convertException(ClientException e) {
-        if (e.isError(GraphErrorCodes.ItemNotFound))
-            return new FileNotFoundException(e.getMessage());
-        return e;
-    }
-
-    @Override
-    public void uploadFile(String path, byte[] data, boolean writeTransactional) throws Exception {
-        try {
-            ClientAndPath clientAndPath = getOneDriveClientAndPath(path);
-            clientAndPath.client.getDrive()
-                    .getRoot()
-                    .getItemWithPath(clientAndPath.oneDrivePath)
-                    .getContent()
-                    .buildRequest()
-                    .put(data);
-        } catch (ClientException e) {
-            throw convertException(e);
-        }
-    }
-
-    @Override
-    public String createFolder(String parentPath, String newDirName) throws Exception {
-        throw new Exception("not implemented.");
-    }
-
-    @Override
-    public String createFilePath(String parentPath, String newFileName) throws Exception {
-        String path = parentPath;
-        if (!path.endsWith("/"))
-            path = path + "/";
-        path = path + newFileName;
-
-        return path;
-    }
-
-    @Override
-    public List<FileEntry> listFiles(String parentPath) throws Exception {
-        try {
-            ArrayList<FileEntry> result = new ArrayList<FileEntry>();
-            ClientAndPath clientAndPath = getOneDriveClientAndPath(parentPath);
-            parentPath = clientAndPath.oneDrivePath;
-
-            IDriveItemCollectionPage itemsPage = clientAndPath.getPathItem()
-                    .getChildren()
-                    .buildRequest()
-                    .get();
-            if (parentPath.endsWith("/"))
-                parentPath = parentPath.substring(0,parentPath.length()-1);
-            while (true)
-            {
-                List<DriveItem> items = itemsPage.getCurrentPage();
-                if (items.isEmpty())
-                    return result;
-
-                for (DriveItem i: items)
-                {
-                    FileEntry e = getFileEntry(parentPath + "/" + i.name, i);
-                    Log.d("KP2AJ", e.path);
-                    result.add(e);
-                }
-                IDriveItemCollectionRequestBuilder nextPageReqBuilder = itemsPage.getNextPage();
-                if (nextPageReqBuilder == null)
-                    return result;
-                itemsPage = nextPageReqBuilder.buildRequest().get();
-
-            }
-        } catch (ClientException e) {
-            throw convertException(e);
-        }
-    }
-
-    private FileEntry getFileEntry(String path, DriveItem i) {
-        FileEntry e = new FileEntry();
-        if (i.size != null)
-            e.sizeInBytes = i.size;
-        else if ((i.remoteItem != null) && (i.remoteItem.size != null))
-            e.sizeInBytes = i.remoteItem.size;
-
-        e.displayName = i.name;
-        e.canRead = e.canWrite = true;
-        e.path = getProtocolId() +"://"+path;
-        if (i.lastModifiedDateTime != null)
-            e.lastModifiedTime = i.lastModifiedDateTime.getTimeInMillis();
-        else if ((i.remoteItem != null)&&(i.remoteItem.lastModifiedDateTime != null))
-            e.lastModifiedTime = i.remoteItem.lastModifiedDateTime.getTimeInMillis();
-        e.isDirectory = (i.folder != null) || ((i.remoteItem != null) && (i.remoteItem.folder != null));
-        return e;
-    }
-
-    @Override
-    public FileEntry getFileEntry(String filename) throws Exception {
-        try {
-
-            ClientAndPath clientAndPath = getOneDriveClientAndPath(filename);
-            IDriveItemRequestBuilder pathItem = clientAndPath.getPathItem();
-
-            IDriveItemRequest request = pathItem.buildRequest();
-            DriveItem item = request.get();
-            return getFileEntry(filename, item);
-        } catch (ClientException e) {
-            throw convertException(e);
-        }
-    }
-
-    @Override
-    public void delete(String path) throws Exception {
-        try {
-            ClientAndPath clientAndPath = getOneDriveClientAndPath(path);
-            clientAndPath.client.getDrive()
-                    .getRoot()
-                    .getItemWithPath(clientAndPath.oneDrivePath)
-                    .buildRequest()
-                    .delete();
-        } catch (ClientException e) {
-            throw convertException(e);
-        }
-    }
-
-    boolean acquireTokenRunning = false;
-    @Override
-    public void onStart(final FileStorageSetupActivity activity) {
-        Log.d("KP2AJ", "onStart " + activity.getPath());
-        if (activity.getProcessName().equals(PROCESS_NAME_SELECTFILE))
-            activity.getState().putString(EXTRA_PATH, activity.getPath());
-
-        String userId = activity.getState().getString("OneDriveUser");
-        if (mClientByUser.containsKey(userId)) {
-            finishActivityWithSuccess(activity);
-            return;
-        }
-
-
-        JavaFileStorage.FileStorageSetupActivity storageSetupAct = activity;
-
-        final CountDownLatch latch = new CountDownLatch(1);
-        final AuthenticationResult[] _authenticationResult = {null};
-        MsalException _exception[] = {null};
-
-        if (!acquireTokenRunning) {
-            acquireTokenRunning = true;
-
-            mPublicClientApp.acquireToken((Activity) activity, scopes, new AuthenticationCallback() {
-                @Override
-                public void onSuccess(AuthenticationResult authenticationResult) {
-                    Log.i(TAG, "authenticating successful");
-
-                    try {
-                        buildClient(authenticationResult);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    activity.getState().putString(EXTRA_PATH, getProtocolPrefix() + authenticationResult.getUser().getUserIdentifier() + "/");
-
-                    finishActivityWithSuccess(activity);
-                    acquireTokenRunning = false;
-                    return;
-                }
-
-                @Override
-                public void onError(MsalException exception) {
-                    Log.i(TAG, "authenticating not successful");
-                    Intent data = new Intent();
-                    data.putExtra(EXTRA_ERROR_MESSAGE, "authenticating not successful");
-                    ((Activity) activity).setResult(Activity.RESULT_CANCELED, data);
-                    ((Activity) activity).finish();
-                    acquireTokenRunning = false;
-                }
-
-                @Override
-                public void onCancel() {
-
-                    Log.i(TAG, "authenticating cancelled");
-                    Intent data = new Intent();
-                    data.putExtra(EXTRA_ERROR_MESSAGE, "authenticating not cancelled");
-                    ((Activity) activity).setResult(Activity.RESULT_CANCELED, data);
-                    ((Activity) activity).finish();
-                    acquireTokenRunning = false;
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onActivityResult(FileStorageSetupActivity activity, int requestCode, int resultCode, Intent data) {
-        mPublicClientApp.handleInteractiveRequestRedirect(requestCode, resultCode, data);
-    }
-}

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

@@ -28,6 +28,7 @@ import com.pcloud.sdk.PCloudSdk;
 import com.pcloud.sdk.RemoteEntry;
 import com.pcloud.sdk.RemoteFile;
 import com.pcloud.sdk.RemoteFolder;
+import com.pcloud.sdk.UploadOptions;
 
 /**
  * FileStorage implementation for PCloud provider.
@@ -136,10 +137,10 @@ public class PCloudFileStorage extends JavaFileStorageBase
         String filePath = path.substring(0, path.lastIndexOf("/") + 1);
         RemoteFolder remoteFolder = this.getRemoteFolderByPath(filePath);
 
-        String tempName = "." + UUID.randomUUID().toString();
         try {
-            RemoteFile remoteFile = this.apiClient.createFile(remoteFolder, tempName, dataSource).execute();
-            this.apiClient.rename(remoteFile, filename).execute();
+            RemoteFile remoteFile = this.apiClient.createFile(
+                remoteFolder, filename, dataSource, null, null, UploadOptions.OVERRIDE_FILE
+            ).execute();
         } catch (ApiError e) {
             throw convertApiError(e);
         }

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 
 import com.burgstaller.okhttp.AuthenticationCacheInterceptor;
@@ -52,6 +53,7 @@ import okhttp3.internal.tls.OkHostnameVerifier;
 public class WebDavStorage extends JavaFileStorageBase {
 
     private final ICertificateErrorHandler mCertificateErrorHandler;
+    private Context appContext;
 
     public WebDavStorage(ICertificateErrorHandler certificateErrorHandler)
     {
@@ -125,9 +127,13 @@ public class WebDavStorage extends JavaFileStorageBase {
         }
     }
 
+    //client to be reused (connection pool/thread pool). We're building a custom client for each ConnectionInfo in getClient for actual usage
+    final OkHttpClient baseClient = new OkHttpClient();
+
     private OkHttpClient getClient(ConnectionInfo ci) throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
 
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+        OkHttpClient.Builder builder = baseClient.newBuilder();
         final Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
 
         com.burgstaller.okhttp.digest.Credentials credentials = new com.burgstaller.okhttp.digest.Credentials(ci.username, ci.password);
@@ -447,10 +453,20 @@ public class WebDavStorage extends JavaFileStorageBase {
         if (href.endsWith("/"))
             href = href.substring(0, href.length()-1);
         int lastIndex = href.lastIndexOf("/");
+
+        String displayName;
+
         if (lastIndex >= 0)
-            return href.substring(lastIndex + 1);
+            displayName = href.substring(lastIndex + 1);
         else
-            return href;
+            displayName = href;
+
+        try {
+            displayName = java.net.URLDecoder.decode(displayName, UTF_8);
+        } catch (UnsupportedEncodingException e) {
+        }
+
+        return displayName;
     }
 
     @Override
@@ -493,7 +509,7 @@ public class WebDavStorage extends JavaFileStorageBase {
 
     @Override
     public void prepareFileUsage(Context appContext, String path) {
-        //nothing to do
+        this.appContext = appContext;
 
     }
 

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

@@ -1,45 +0,0 @@
-package keepass2android.javafilestorage.onedrive2;
-
-import com.microsoft.graph.authentication.IAuthenticationProvider;
-import com.microsoft.graph.core.DefaultClientConfig;
-import com.microsoft.graph.core.IClientConfig;
-import com.microsoft.graph.extensions.GraphServiceClient;
-import com.microsoft.graph.extensions.IGraphServiceClient;
-import com.microsoft.graph.http.IHttpRequest;
-
-/**
- * Singleton class that manages a GraphServiceClient object.
- * It implements IAuthentication provider to authenticate requests using an access token.
- */
-public class GraphServiceClientManager implements IAuthenticationProvider {
-    private IGraphServiceClient mGraphServiceClient;
-    private String mAccessToken;
-
-    public GraphServiceClientManager(String accessToken) {
-        mAccessToken = accessToken;
-    }
-
-    @Override
-    public void authenticateRequest(IHttpRequest request)  {
-        try {
-            request.addHeader("Authorization", "Bearer " + mAccessToken);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public synchronized IGraphServiceClient getGraphServiceClient() {
-        return getGraphServiceClient(this);
-    }
-
-    public synchronized IGraphServiceClient getGraphServiceClient(IAuthenticationProvider authenticationProvider) {
-        if (mGraphServiceClient == null) {
-            IClientConfig clientConfig = DefaultClientConfig.createWithAuthenticationProvider(
-                    authenticationProvider
-            );
-            mGraphServiceClient = new GraphServiceClient.Builder().fromConfig(clientConfig).buildClient();
-        }
-
-        return mGraphServiceClient;
-    }
-}

src/java/JavaFileStorage/build.gradle

@@ -2,14 +2,19 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+		google()
     }
 }

src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

src/java/JavaFileStorageTest-AS/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.crocoapps.javafilestoragetest"
         minSdkVersion 21
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -28,7 +28,7 @@ android {
     }
 }
 
-apply plugin: 'com.getkeepsafe.dexcount'
+//apply plugin: 'com.getkeepsafe.dexcount'
 
 dependencies {
     compile project(':android-filechooser')

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

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

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

@@ -147,7 +147,6 @@ import java.util.List;
 //import keepass2android.javafilestorage.DropboxCloudRailStorage;
 import keepass2android.javafilestorage.JavaFileStorage;
 import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
-import keepass2android.javafilestorage.OneDriveStorage2;
 import keepass2android.javafilestorage.SftpStorage;
 import keepass2android.javafilestorage.UserInteractionRequiredException;
 import keepass2android.javafilestorage.WebDavStorage;
@@ -430,11 +429,11 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 						&& (e.canWrite == file.canWrite)
 						&& (e.isDirectory == file.isDirectory)
 						&& (e.displayName.equals(file.displayName))
-						&& (e.sizeInBytes == file.sizeInBytes ))
+						&& (file.isDirectory || (e.sizeInBytes == file.sizeInBytes )))
 					return;
 			}
 				
-			throw new Exception("didn't find file " + file.path + " in file list!");
+			throw new Exception("didn't find file " + file.path + " (" + file.displayName + ") in file list!");
 		
 		}
 	}
@@ -535,9 +534,8 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 	}
 
 	static JavaFileStorage createStorageToTest(Context ctx, Context appContext, boolean simulateRestart) {
-		//storageToTest = new SftpStorage(ctx.getApplicationContext());
+		storageToTest = new SftpStorage(ctx.getApplicationContext());
 		//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
-		storageToTest = new OneDriveStorage2((Activity) ctx, "8374f801-0f55-407d-80cc-9a04fe86d9b2");
 
 
 		//storageToTest = new GoogleDriveFileStorage();

src/java/JavaFileStorageTest-AS/build.gradle

@@ -9,11 +9,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1'
+        //classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1'
     }
 
 }

src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

src/java/KP2AKdbLibrary/.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

src/java/KP2AKdbLibrary/.gitignore

@@ -1,5 +0,0 @@
-build.properties
-local.properties
-bin
-gen
-obj

src/java/KP2AKdbLibrary/.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>KP2AKdbLibrary</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

src/java/KP2AKdbLibrary/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6

src/java/KP2AKdbLibrary/COPYING.gpl-2.0

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.