diff --git a/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj b/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
index c0c6d534..e0dcff19 100644
--- a/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
+++ b/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
@@ -10,7 +10,7 @@
AndroidFileChooserBinding
AndroidFileChooserBinding
512
- v8.0
+ v8.1
True
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index 7c7486b5..636cef20 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -11,7 +11,7 @@
JavaFileStorageBindings
512
True
- v8.0
+ v8.1
true
diff --git a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
index 3ff0ddff..885738cb 100644
--- a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
+++ b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
@@ -10,7 +10,7 @@
KP2AKdbLibraryBinding
KP2AKdbLibraryBinding
512
- v8.0
+ v8.1
True
diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj
index d3029e5f..d5ba5757 100644
--- a/src/KeePassLib2Android/KeePassLib2Android.csproj
+++ b/src/KeePassLib2Android/KeePassLib2Android.csproj
@@ -12,7 +12,7 @@
Resources\Resource.designer.cs
Resource
KeePassLib2Android
- v8.0
+ v8.1
True
8482b288
diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
index c3b7bb60..3edbdd4c 100644
--- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
+++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
@@ -12,7 +12,7 @@
512
Resources\Resource.Designer.cs
Off
- v8.0
+ v8.1
true
06ffb71c
diff --git a/src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj b/src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj
index df9c7b3b..68e94216 100644
--- a/src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj
+++ b/src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj
@@ -11,7 +11,7 @@
Resources
Kp2aKeyboardBinding
True
- v8.0
+ v8.1
True
diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj
index 222df093..06d74ad7 100644
--- a/src/PluginSdkBinding/PluginSdkBinding.csproj
+++ b/src/PluginSdkBinding/PluginSdkBinding.csproj
@@ -10,8 +10,8 @@
PluginSdkBinding
PluginSdkBinding
512
- True
- v8.0
+ false
+ v8.1
true
diff --git a/src/SamsungPass b/src/SamsungPass
index c9dd9b21..f3c6bbe2 160000
--- a/src/SamsungPass
+++ b/src/SamsungPass
@@ -1 +1 @@
-Subproject commit c9dd9b21a59eb7d1761ea99ba6a34ac8c5bdbf42
+Subproject commit f3c6bbe22436627376f36ba8f7efdc026bb75c60
diff --git a/src/TwofishCipher/TwofishCipher.csproj b/src/TwofishCipher/TwofishCipher.csproj
index 2368da5f..cc694ba4 100644
--- a/src/TwofishCipher/TwofishCipher.csproj
+++ b/src/TwofishCipher/TwofishCipher.csproj
@@ -13,7 +13,7 @@
Resources\Resource.Designer.cs
Off
True
- v8.0
+ v8.1
true
diff --git a/src/ZlibAndroid/ZlibAndroid.csproj b/src/ZlibAndroid/ZlibAndroid.csproj
index 76403f80..73aa0362 100644
--- a/src/ZlibAndroid/ZlibAndroid.csproj
+++ b/src/ZlibAndroid/ZlibAndroid.csproj
@@ -13,7 +13,7 @@
Assets
True
ZlibAndroid
- v8.0
+ v8.1
true
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index ef4efb71..bd46cbfe 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -1770,20 +1770,6 @@
-
-
- False
- 25.1.1.0
-
-
- False
- 25.1.1.0
-
-
- False
- 25.1.1.0
-
-
diff --git a/src/keepass2android/views/PwGroupView.cs b/src/keepass2android/views/PwGroupView.cs
index 5feba08b..243988aa 100644
--- a/src/keepass2android/views/PwGroupView.cs
+++ b/src/keepass2android/views/PwGroupView.cs
@@ -22,6 +22,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
using KeePassLib;
+using Object = Java.Lang.Object;
namespace keepass2android.view
{
@@ -91,11 +92,15 @@ namespace keepass2android.view
_textview.SetTextColor(new Color((int)_defaultTextColor));
_label.Text = _groupBaseActivity.GetString (Resource.String.group)+" - ";
- uint numEntries = CountEntries (pw);
- if (numEntries == 1)
- _label.Text += Context.GetString (Resource.String.Entry_singular);
- else
- _label.Text += Context.GetString (Resource.String.Entry_plural, new Java.Lang.Object[] { numEntries });
+ uint numEntries = CountEntries (pw);
+ if (numEntries == 1)
+ _label.Text += Context.GetString(Resource.String.Entry_singular);
+ else
+ {
+ Java.Lang.Object obj = (int)numEntries;
+ _label.Text += Context.GetString(Resource.String.Entry_plural, obj);
+ }
+
}
uint CountEntries(PwGroup g)
@@ -159,5 +164,26 @@ namespace keepass2android.view
LaunchGroup();
}
}
+
+
+ internal class JavaObjectAdapter : Java.Lang.Object
+ {
+ private readonly uint _value;
+ public JavaObjectAdapter(uint value)
+ {
+ _value = value;
+ }
+
+ public JavaObjectAdapter(System.IntPtr handle, Android.Runtime.JniHandleOwnership transfer)
+ : base(handle, transfer)
+ {
+
+ }
+
+ public override string ToString()
+ {
+ return _value.ToString();
+ }
+ }
}
diff --git a/src/netftpandroid b/src/netftpandroid
index 040e8bbe..23df4cf1 160000
--- a/src/netftpandroid
+++ b/src/netftpandroid
@@ -1 +1 @@
-Subproject commit 040e8bbe564bd140203255e11c86c01c2f7c1892
+Subproject commit 23df4cf135857eb33f3656567d08ec228d96d4b5