diff --git a/src/KeePass.sln b/src/KeePass.sln index ab1a97d0..abdf5c86 100644 --- a/src/KeePass.sln +++ b/src/KeePass.sln @@ -284,8 +284,8 @@ Global {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|Mixed Platforms.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|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 {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {F46F101D-4076-4E0A-9781-105598E2F42A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj index 02729bd4..c3c5c767 100644 --- a/src/PluginSdkBinding/PluginSdkBinding.csproj +++ b/src/PluginSdkBinding/PluginSdkBinding.csproj @@ -31,6 +31,15 @@ prompt 4 + + bin\ReleaseNoNet\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/src/PluginSdkBinding/Properties/AssemblyInfo.cs b/src/PluginSdkBinding/Properties/AssemblyInfo.cs index 3d0cc069..136f4089 100644 --- a/src/PluginSdkBinding/Properties/AssemblyInfo.cs +++ b/src/PluginSdkBinding/Properties/AssemblyInfo.cs @@ -28,7 +28,3 @@ using Android.App; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] - -// Add some common permissions, these can be removed if not needed -[assembly: UsesPermission(Android.Manifest.Permission.Internet)] -[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs index a090c686..42d31777 100644 --- a/src/keepass2android/ChangeLog.cs +++ b/src/keepass2android/ChangeLog.cs @@ -22,7 +22,7 @@ namespace keepass2android AlertDialog.Builder builder = new AlertDialog.Builder(ctx); builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); String[] changeLog = { - ctx.GetString(Resource.String.PreviewWarning), + //ctx.GetString(Resource.String.PreviewWarning), ctx.GetString(Resource.String.ChangeLog_0_9_4), ctx.GetString(Resource.String.ChangeLog_0_9_3_r5), ctx.GetString(Resource.String.ChangeLog_0_9_3), diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml index 1d45c862..78c3132d 100644 --- a/src/keepass2android/Properties/AndroidManifest_nonet.xml +++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml @@ -1,7 +1,7 @@  diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs index 2df4d59b..f6eff9f4 100644 --- a/src/keepass2android/Resources/Resource.designer.cs +++ b/src/keepass2android/Resources/Resource.designer.cs @@ -4343,11 +4343,11 @@ namespace keepass2android // aapt resource value: 0x7f090159 public const int brackets = 2131296601; - // aapt resource value: 0x7f0902e4 - public const int browser_intall_text = 2131296996; - // aapt resource value: 0x7f0902e5 - public const int building_search_idx = 2131296997; + public const int browser_intall_text = 2131296997; + + // aapt resource value: 0x7f0902e6 + public const int building_search_idx = 2131296998; // aapt resource value: 0x7f090297 public const int button_change_location = 2131296919; @@ -4478,14 +4478,14 @@ namespace keepass2android // aapt resource value: 0x7f090101 public const int db_key = 2131296513; - // aapt resource value: 0x7f0902e6 - public const int decrypting_db = 2131296998; - // aapt resource value: 0x7f0902e7 - public const int decrypting_entry = 2131296999; + public const int decrypting_db = 2131296999; // aapt resource value: 0x7f0902e8 - public const int default_checkbox = 2131297000; + public const int decrypting_entry = 2131297000; + + // aapt resource value: 0x7f0902e9 + public const int default_checkbox = 2131297001; // aapt resource value: 0x7f0900f3 public const int default_file_path = 2131296499; @@ -4571,8 +4571,8 @@ namespace keepass2android // aapt resource value: 0x7f09016a public const int entry_accessed = 2131296618; - // aapt resource value: 0x7f0902e9 - public const int entry_and_or = 2131297001; + // aapt resource value: 0x7f0902ea + public const int entry_and_or = 2131297002; // aapt resource value: 0x7f09017b public const int entry_binaries = 2131296635; @@ -4628,8 +4628,8 @@ namespace keepass2android // aapt resource value: 0x7f09029f public const int error_adding_keyfile = 2131296927; - // aapt resource value: 0x7f0902ea - public const int error_arc4 = 2131297002; + // aapt resource value: 0x7f0902eb + public const int error_arc4 = 2131297003; // aapt resource value: 0x7f09017c public const int error_can_not_handle_uri = 2131296636; @@ -4643,8 +4643,11 @@ namespace keepass2android // aapt resource value: 0x7f09017f public const int error_database_exists = 2131296639; + // aapt resource value: 0x7f0902e4 + public const int error_database_settings = 2131296996; + // aapt resource value: 0x7f090180 - public const int error_database_settings = 2131296640; + public const int error_database_settinoverrgs = 2131296640; // aapt resource value: 0x7f090181 public const int error_failed_to_launch_link = 2131296641; @@ -4670,8 +4673,8 @@ namespace keepass2android // aapt resource value: 0x7f090187 public const int error_nopass = 2131296647; - // aapt resource value: 0x7f0902eb - public const int error_out_of_memory = 2131297003; + // aapt resource value: 0x7f0902ec + public const int error_out_of_memory = 2131297004; // aapt resource value: 0x7f090188 public const int error_pass_gen_type = 2131296648; @@ -4682,8 +4685,8 @@ namespace keepass2android // aapt resource value: 0x7f09018a public const int error_rounds_not_number = 2131296650; - // aapt resource value: 0x7f0902ec - public const int error_rounds_too_large = 2131297004; + // aapt resource value: 0x7f0902ed + public const int error_rounds_too_large = 2131297005; // aapt resource value: 0x7f090221 public const int error_string_key = 2131296801; @@ -4871,11 +4874,11 @@ namespace keepass2android // aapt resource value: 0x7f0901e8 public const int insert_element_here = 2131296744; - // aapt resource value: 0x7f0902ed - public const int install_from_market = 2131297005; - // aapt resource value: 0x7f0902ee - public const int install_from_website = 2131297006; + public const int install_from_market = 2131297006; + + // aapt resource value: 0x7f0902ef + public const int install_from_website = 2131297007; // aapt resource value: 0x7f09019f public const int invalid_algorithm = 2131296671; @@ -5087,8 +5090,8 @@ namespace keepass2android // aapt resource value: 0x7f0901b8 public const int menu_hide_password = 2131296696; - // aapt resource value: 0x7f0902ef - public const int menu_homepage = 2131297007; + // aapt resource value: 0x7f0902f0 + public const int menu_homepage = 2131297008; // aapt resource value: 0x7f0901b9 public const int menu_lock = 2131296697;