qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to target Android 8.1

Browse Source
This commit is contained in:
Philipp Crocoll
2018-03-26 19:56:55 +02:00
parent a04c8f6214
commit b0aa706c07
13 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
View File

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

2
src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
View File

@@ -11,7 +11,7 @@
<AssemblyName>JavaFileStorageBindings</AssemblyName> <AssemblyName>JavaFileStorageBindings</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

2
src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
View File

@@ -10,7 +10,7 @@
<RootNamespace>KP2AKdbLibraryBinding</RootNamespace> <RootNamespace>KP2AKdbLibraryBinding</RootNamespace>
<AssemblyName>KP2AKdbLibraryBinding</AssemblyName> <AssemblyName>KP2AKdbLibraryBinding</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

2
src/KeePassLib2Android/KeePassLib2Android.csproj
View File

@@ -12,7 +12,7 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass> <AndroidResgenClass>Resource</AndroidResgenClass>
<AssemblyName>KeePassLib2Android</AssemblyName> <AssemblyName>KeePassLib2Android</AssemblyName>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<NuGetPackageImportStamp>8482b288</NuGetPackageImportStamp> <NuGetPackageImportStamp>8482b288</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>

2
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@@ -12,7 +12,7 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<NuGetPackageImportStamp>06ffb71c</NuGetPackageImportStamp> <NuGetPackageImportStamp>06ffb71c</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>

2
src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj
View File

@@ -11,7 +11,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AssemblyName>Kp2aKeyboardBinding</AssemblyName> <AssemblyName>Kp2aKeyboardBinding</AssemblyName>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>

4
src/PluginSdkBinding/PluginSdkBinding.csproj
View File

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

2
src/SamsungPass

Submodule src/SamsungPass updated: c9dd9b21a5...f3c6bbe224

2
src/TwofishCipher/TwofishCipher.csproj
View File

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

2
src/ZlibAndroid/ZlibAndroid.csproj
View File

@@ -13,7 +13,7 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<AssemblyName>ZlibAndroid</AssemblyName> <AssemblyName>ZlibAndroid</AssemblyName>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

14
src/keepass2android/keepass2android.csproj
View File

@@ -1770,20 +1770,6 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\layout\autofill_service_list_item.xml" /> <AndroidResource Include="Resources\layout\autofill_service_list_item.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<XamarinComponentReference Include="xamandroidsupportdesign">
<Visible>False</Visible>
<Version>25.1.1.0</Version>
</XamarinComponentReference>
<XamarinComponentReference Include="xamandroidsupportv13-18">
<Visible>False</Visible>
<Version>25.1.1.0</Version>
</XamarinComponentReference>
<XamarinComponentReference Include="xamandroidsupportv7appcompat">
<Visible>False</Visible>
<Version>25.1.1.0</Version>
</XamarinComponentReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\ic_launcher_background_blue.xml" /> <AndroidResource Include="Resources\drawable\ic_launcher_background_blue.xml" />
</ItemGroup> </ItemGroup>

36
src/keepass2android/views/PwGroupView.cs
View File

@@ -22,6 +22,7 @@ using Android.Runtime;
using Android.Views; using Android.Views;
using Android.Widget; using Android.Widget;
using KeePassLib; using KeePassLib;
using Object = Java.Lang.Object;
namespace keepass2android.view namespace keepass2android.view
{ {
@@ -91,11 +92,15 @@ namespace keepass2android.view
_textview.SetTextColor(new Color((int)_defaultTextColor)); _textview.SetTextColor(new Color((int)_defaultTextColor));
_label.Text = _groupBaseActivity.GetString (Resource.String.group)+" - "; _label.Text = _groupBaseActivity.GetString (Resource.String.group)+" - ";
uint numEntries = CountEntries (pw); uint numEntries = CountEntries (pw);
if (numEntries == 1) if (numEntries == 1)
_label.Text += Context.GetString (Resource.String.Entry_singular); _label.Text += Context.GetString(Resource.String.Entry_singular);
else else
_label.Text += Context.GetString (Resource.String.Entry_plural, new Java.Lang.Object[] { numEntries }); {
Java.Lang.Object obj = (int)numEntries;
_label.Text += Context.GetString(Resource.String.Entry_plural, obj);
}
} }
uint CountEntries(PwGroup g) uint CountEntries(PwGroup g)
@@ -159,5 +164,26 @@ namespace keepass2android.view
LaunchGroup(); 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();
}
}
} }

2
src/netftpandroid

Submodule src/netftpandroid updated: 040e8bbe56...23df4cf135