From 28fb854fb10238f1cef223ae703f2f9da778c636 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sat, 3 Aug 2013 12:30:13 +0200 Subject: [PATCH] Modifications for Mono for Android 4.8 --- .../Resources/Resource.designer.cs | 27 ++++-- .../Serialization/IOConnection.cs | 2 +- .../Transforms/Metadata.xml | 1 + .../Resources/Resource.designer.cs | 82 ++++++++++++++++-- .../SupportLib/android-support-v4.jar | Bin 385685 -> 0 bytes 5 files changed, 99 insertions(+), 13 deletions(-) delete mode 100644 src/keepass2android/SupportLib/android-support-v4.jar diff --git a/src/KeePassLib2Android/Resources/Resource.designer.cs b/src/KeePassLib2Android/Resources/Resource.designer.cs index f338879f..e83a1334 100644 --- a/src/KeePassLib2Android/Resources/Resource.designer.cs +++ b/src/KeePassLib2Android/Resources/Resource.designer.cs @@ -1,27 +1,37 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.2012 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.18051 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -[assembly: Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)] +[assembly: global::Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)] namespace KeePassLib2Android { - [System.CodeDom.Compiler.GeneratedCodeAttribute("Novell.MonoDroid.Build.Tasks", "1.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource { + static Resource() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + public partial class Attribute { + static Attribute() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + private Attribute() { } @@ -33,6 +43,11 @@ namespace KeePassLib2Android // aapt resource value: 0x7f020000 public static int library_name = 2130837504; + static String() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + private String() { } diff --git a/src/KeePassLib2Android/Serialization/IOConnection.cs b/src/KeePassLib2Android/Serialization/IOConnection.cs index db59ffeb..e63ce303 100644 --- a/src/KeePassLib2Android/Serialization/IOConnection.cs +++ b/src/KeePassLib2Android/Serialization/IOConnection.cs @@ -105,7 +105,7 @@ namespace KeePassLib.Serialization // Not implemented and ignored in Mono < 2.10 try { - request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore); + //request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore); } catch(NotImplementedException) { } catch(Exception) { Debug.Assert(false); } diff --git a/src/Kp2aKeyboardBinding/Transforms/Metadata.xml b/src/Kp2aKeyboardBinding/Transforms/Metadata.xml index 87ac70dc..f90ccd90 100644 --- a/src/Kp2aKeyboardBinding/Transforms/Metadata.xml +++ b/src/Kp2aKeyboardBinding/Transforms/Metadata.xml @@ -1,4 +1,5 @@ +