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

# Conflicts:
#	src/keepass2android/Properties/AndroidManifest_nonet.xml
#	src/keepass2android/keepass2android.csproj

docs/README.md

@@ -15,4 +15,4 @@ Beta-releases can be obtained by opting in to the [Beta testing channel](https:/
 # How do I learn more?
 Please see the [documentation](Documentation.md).
 
-[![Build Status](https://www.bitrise.io/app/43a23ab54dee9f7e/status.svg?token=2vryTsMQzTX3XRPikhgRwA&branch=nonet)](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/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj

@@ -63,8 +63,6 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
     <TransformFile Include="Transforms\Metadata.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="libs\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Xamarin.Android.Bindings.targets" />
 </Project>

src/keepass2android/FileSelectHelper.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 #if !NoNet
 using System.Net.FtpClient;
+using Keepass2android.Javafilestorage;
+
 #endif
 using System.Text;
 
@@ -14,7 +16,6 @@ using Android.Views;
 using Android.Widget;
 using Java.IO;
 using keepass2android.Io;
-using Keepass2android.Javafilestorage;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
 

src/keepass2android/Properties/AndroidManifest_nonet.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="104" 
-			android:versionName="1.04b" 
+			android:versionCode="119" 
+			android:versionName="1.05d" 
 			package="keepass2android.keepass2android_nonet"
 			android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_launcher_offline" android:label="KP2A entry search" android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher_offline" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android_nonet.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
 	<application android:label="keepass2android" android:icon="@mipmap/ic_launcher_offline">
@@ -42,7 +42,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
- 
 		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
@@ -52,12 +51,13 @@
         <data android:mimeType="application/octet-stream" />
         <data android:host="*" />
       </intent-filter>
-
+	  
 	  <intent-filter>
         <action android:name="kp2a.action.PasswordActivity" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
 	  
+
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.SEND" />
         <action android:name="android.intent.action.SEND_MULTIPLE" />

src/keepass2android/keepass2android.csproj

@@ -1845,6 +1845,15 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\vdots_bright.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi-v4\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi-v4\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi-v4\ic_launcher_offline.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">