diff --git a/src/KeePass.sln b/src/KeePass.sln index 7fa006ba..c0b6a9f6 100644 --- a/src/KeePass.sln +++ b/src/KeePass.sln @@ -198,8 +198,8 @@ Global {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU EndGlobalSection diff --git a/src/TwofishCipher/TwofishCipher.csproj b/src/TwofishCipher/TwofishCipher.csproj index a3607e1c..da265914 100644 --- a/src/TwofishCipher/TwofishCipher.csproj +++ b/src/TwofishCipher/TwofishCipher.csproj @@ -32,6 +32,16 @@ prompt 4 + + bin\ReleaseNoNet\ + TRACE + true + pdbonly + AnyCPU + Off + prompt + MinimumRecommendedRules.ruleset + diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs new file mode 100644 index 00000000..2982e19a --- /dev/null +++ b/src/keepass2android/ChangeLog.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +using Android.App; +using Android.Content; +using Android.Content.Res; +using Android.OS; +using Android.Runtime; +using Android.Text; +using Android.Text.Method; +using Android.Views; +using Android.Widget; + +namespace keepass2android +{ + public static class ChangeLog + { + public static void ShowChangeLog(Context ctx, Action onDismiss) + { + AlertDialog.Builder builder = new AlertDialog.Builder(ctx); + builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); + String[] changeLog = { + ctx.GetString(Resource.String.ChangeLog_0_8_5), + ctx.GetString(Resource.String.ChangeLog_0_8_4), + ctx.GetString(Resource.String.ChangeLog_0_8_3), + ctx.GetString(Resource.String.ChangeLog_0_8_2), + ctx.GetString(Resource.String.ChangeLog_0_8_1), + ctx.GetString(Resource.String.ChangeLog_0_8), + ctx.GetString(Resource.String.ChangeLog_0_7), + ctx.GetString(Resource.String.ChangeLog) + }; + + builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => { }); + + builder.SetMessage("temp"); + Dialog dialog = builder.Create(); + dialog.DismissEvent += (sender, e) => + { + onDismiss(); + }; + dialog.Show(); + TextView message = (TextView)dialog.FindViewById(Android.Resource.Id.Message); + + message.MovementMethod = LinkMovementMethod.Instance; + message.TextFormatted = Html.FromHtml(ConcatChangeLog(ctx, changeLog)); + message.LinksClickable = true; + + } + + + static string ConcatChangeLog(Context ctx, string[] changeLog) + { + string res = ""; + bool isFirst = true; + foreach (string c in changeLog) + { + res += c; + if (isFirst) + { + if (res.EndsWith("\n") == false) + res += "\n"; + string donateUrl = ctx.GetString(Resource.String.donate_url, + new Java.Lang.Object[]{ctx.Resources.Configuration.Locale.Language, + ctx.PackageName + }); + res += " * " + + ctx.GetString(Resource.String.ChangeLog_keptDonate) + + ""; + isFirst = false; + } + + while (res.EndsWith("\n\n") == false) + res += "\n"; + } + return res.Replace("\n", "
"); + + } + } +} \ No newline at end of file diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs index 93b6c8f7..01215591 100644 --- a/src/keepass2android/Resources/Resource.designer.cs +++ b/src/keepass2android/Resources/Resource.designer.cs @@ -1292,53 +1292,53 @@ namespace keepass2android public partial class String { - // aapt resource value: 0x7f060039 - public const int AboutText = 2131099705; + // aapt resource value: 0x7f06003e + public const int AboutText = 2131099710; - // aapt resource value: 0x7f06013b - public const int AddingEntry = 2131099963; + // aapt resource value: 0x7f060145 + public const int AddingEntry = 2131099973; - // aapt resource value: 0x7f06013c - public const int AddingGroup = 2131099964; + // aapt resource value: 0x7f060146 + public const int AddingGroup = 2131099974; // aapt resource value: 0x7f060000 public const int ApplicationName = 2131099648; - // aapt resource value: 0x7f060131 - public const int AskDeletePermanentlyEntry = 2131099953; + // aapt resource value: 0x7f06013b + public const int AskDeletePermanentlyEntry = 2131099963; - // aapt resource value: 0x7f060132 - public const int AskDeletePermanentlyGroup = 2131099954; + // aapt resource value: 0x7f06013c + public const int AskDeletePermanentlyGroup = 2131099964; - // aapt resource value: 0x7f060133 - public const int AskDeletePermanently_title = 2131099955; + // aapt resource value: 0x7f06013d + public const int AskDeletePermanently_title = 2131099965; - // aapt resource value: 0x7f060136 - public const int AskDiscardChanges = 2131099958; + // aapt resource value: 0x7f060140 + public const int AskDiscardChanges = 2131099968; - // aapt resource value: 0x7f060137 - public const int AskDiscardChanges_title = 2131099959; - - // aapt resource value: 0x7f06012b - public const int AskOverwriteBinary = 2131099947; - - // aapt resource value: 0x7f06012e - public const int AskOverwriteBinary_no = 2131099950; - - // aapt resource value: 0x7f06012c - public const int AskOverwriteBinary_title = 2131099948; - - // aapt resource value: 0x7f06012d - public const int AskOverwriteBinary_yes = 2131099949; + // aapt resource value: 0x7f060141 + public const int AskDiscardChanges_title = 2131099969; // aapt resource value: 0x7f060135 - public const int AskReloadFile = 2131099957; + public const int AskOverwriteBinary = 2131099957; - // aapt resource value: 0x7f060134 - public const int AskReloadFile_title = 2131099956; + // aapt resource value: 0x7f060138 + public const int AskOverwriteBinary_no = 2131099960; - // aapt resource value: 0x7f06012f - public const int AttachFailed = 2131099951; + // aapt resource value: 0x7f060136 + public const int AskOverwriteBinary_title = 2131099958; + + // aapt resource value: 0x7f060137 + public const int AskOverwriteBinary_yes = 2131099959; + + // aapt resource value: 0x7f06013f + public const int AskReloadFile = 2131099967; + + // aapt resource value: 0x7f06013e + public const int AskReloadFile_title = 2131099966; + + // aapt resource value: 0x7f060139 + public const int AttachFailed = 2131099961; // aapt resource value: 0x7f060024 public const int BinaryDirectory_default = 2131099684; @@ -1346,347 +1346,359 @@ namespace keepass2android // aapt resource value: 0x7f060023 public const int BinaryDirectory_key = 2131099683; - // aapt resource value: 0x7f060107 - public const int BinaryDirectory_summary = 2131099911; + // aapt resource value: 0x7f060111 + public const int BinaryDirectory_summary = 2131099921; - // aapt resource value: 0x7f060106 - public const int BinaryDirectory_title = 2131099910; - - // aapt resource value: 0x7f060159 - public const int CannotMoveGroupHere = 2131099993; + // aapt resource value: 0x7f060110 + public const int BinaryDirectory_title = 2131099920; // aapt resource value: 0x7f060163 - public const int ChangeLog = 2131100003; + public const int CannotMoveGroupHere = 2131100003; - // aapt resource value: 0x7f060162 - public const int ChangeLog_0_7 = 2131100002; + // aapt resource value: 0x7f06016d + public const int ChangeLog = 2131100013; - // aapt resource value: 0x7f060160 - public const int ChangeLog_0_8 = 2131100000; + // aapt resource value: 0x7f06016c + public const int ChangeLog_0_7 = 2131100012; - // aapt resource value: 0x7f06015f - public const int ChangeLog_0_8_1 = 2131099999; + // aapt resource value: 0x7f06016a + public const int ChangeLog_0_8 = 2131100010; - // aapt resource value: 0x7f06015e - public const int ChangeLog_0_8_2 = 2131099998; + // aapt resource value: 0x7f060169 + public const int ChangeLog_0_8_1 = 2131100009; - // aapt resource value: 0x7f06015d - public const int ChangeLog_0_8_3 = 2131099997; + // aapt resource value: 0x7f060168 + public const int ChangeLog_0_8_2 = 2131100008; - // aapt resource value: 0x7f06015c - public const int ChangeLog_0_8_4 = 2131099996; + // aapt resource value: 0x7f060167 + public const int ChangeLog_0_8_3 = 2131100007; - // aapt resource value: 0x7f06015b - public const int ChangeLog_0_8_5 = 2131099995; + // aapt resource value: 0x7f060166 + public const int ChangeLog_0_8_4 = 2131100006; - // aapt resource value: 0x7f060161 - public const int ChangeLog_keptDonate = 2131100001; + // aapt resource value: 0x7f060165 + public const int ChangeLog_0_8_5 = 2131100005; - // aapt resource value: 0x7f06015a - public const int ChangeLog_title = 2131099994; + // aapt resource value: 0x7f06016b + public const int ChangeLog_keptDonate = 2131100011; - // aapt resource value: 0x7f06002c - public const int CheckForFileChangesOnSave_key = 2131099692; + // aapt resource value: 0x7f060164 + public const int ChangeLog_title = 2131100004; - // aapt resource value: 0x7f060120 - public const int CheckForFileChangesOnSave_summary = 2131099936; - - // aapt resource value: 0x7f06011f - public const int CheckForFileChangesOnSave_title = 2131099935; - - // aapt resource value: 0x7f060150 - public const int CheckingDatabaseForChanges = 2131099984; - - // aapt resource value: 0x7f060144 - public const int CheckingTargetFileForChanges = 2131099972; - - // aapt resource value: 0x7f06004f - public const int ClearClipboard = 2131099727; - - // aapt resource value: 0x7f06011e - public const int ClearOfflineCache_question = 2131099934; - - // aapt resource value: 0x7f06011d - public const int ClearOfflineCache_title = 2131099933; - - // aapt resource value: 0x7f060030 - public const int CopyToClipboardNotification_key = 2131099696; - - // aapt resource value: 0x7f060152 - public const int CouldNotLoadFromRemote = 2131099986; - - // aapt resource value: 0x7f060151 - public const int CouldNotSaveToRemote = 2131099985; - - // aapt resource value: 0x7f06003a - public const int CreditsText = 2131099706; - - // aapt resource value: 0x7f060142 - public const int DecodingDatabase = 2131099970; - - // aapt resource value: 0x7f06013d - public const int DeletingEntry = 2131099965; - - // aapt resource value: 0x7f06013e - public const int DeletingGroup = 2131099966; - - // aapt resource value: 0x7f06014b - public const int DownloadingRemoteFile = 2131099979; - - // aapt resource value: 0x7f060088 - public const int FileNotFound = 2131099784; - - // aapt resource value: 0x7f06014e - public const int FilesInSync = 2131099982; - - // aapt resource value: 0x7f06009b - public const int InvalidPassword = 2131099803; - - // aapt resource value: 0x7f060029 - public const int LastInfoVersionCode_key = 2131099689; - - // aapt resource value: 0x7f060155 - public const int LoadedFromRemoteInSync = 2131099989; - - // aapt resource value: 0x7f06002d - public const int MarketURL = 2131099693; - - // aapt resource value: 0x7f0600a5 - public const int MaskedPassword = 2131099813; - - // aapt resource value: 0x7f060146 - public const int MessageSyncQuestion = 2131099974; - - // aapt resource value: 0x7f060149 - public const int NoOverwrite = 2131099977; - - // aapt resource value: 0x7f060154 - public const int NotifyOpenFromLocalDueToConflict = 2131099988; - - // aapt resource value: 0x7f060032 - public const int OpenKp2aKeyboardAutomatically_key = 2131099698; - - // aapt resource value: 0x7f060126 - public const int OpenKp2aKeyboardAutomatically_summary = 2131099942; - - // aapt resource value: 0x7f060125 - public const int OpenKp2aKeyboardAutomatically_title = 2131099941; - - // aapt resource value: 0x7f060143 - public const int ParsingDatabase = 2131099971; - - // aapt resource value: 0x7f060036 - public const int PreloadDatabaseEnabled_key = 2131099702; + // aapt resource value: 0x7f060031 + public const int CheckForFileChangesOnSave_key = 2131099697; // aapt resource value: 0x7f06012a - public const int PreloadDatabaseEnabled_summary = 2131099946; + public const int CheckForFileChangesOnSave_summary = 2131099946; // aapt resource value: 0x7f060129 - public const int PreloadDatabaseEnabled_title = 2131099945; + public const int CheckForFileChangesOnSave_title = 2131099945; - // aapt resource value: 0x7f060025 - public const int QuickUnlockDefaultEnabled_key = 2131099685; + // aapt resource value: 0x7f06015a + public const int CheckingDatabaseForChanges = 2131099994; - // aapt resource value: 0x7f060102 - public const int QuickUnlockDefaultEnabled_summary = 2131099906; + // aapt resource value: 0x7f06014e + public const int CheckingTargetFileForChanges = 2131099982; - // aapt resource value: 0x7f060101 - public const int QuickUnlockDefaultEnabled_title = 2131099905; + // aapt resource value: 0x7f060059 + public const int ClearClipboard = 2131099737; - // aapt resource value: 0x7f060027 - public const int QuickUnlockLength_default = 2131099687; + // aapt resource value: 0x7f060128 + public const int ClearOfflineCache_question = 2131099944; - // aapt resource value: 0x7f060026 - public const int QuickUnlockLength_key = 2131099686; + // aapt resource value: 0x7f060127 + public const int ClearOfflineCache_title = 2131099943; - // aapt resource value: 0x7f060104 - public const int QuickUnlockLength_summary = 2131099908; + // aapt resource value: 0x7f060035 + public const int CopyToClipboardNotification_key = 2131099701; - // aapt resource value: 0x7f060103 - public const int QuickUnlockLength_title = 2131099907; + // aapt resource value: 0x7f06015c + public const int CouldNotLoadFromRemote = 2131099996; - // aapt resource value: 0x7f0600ff - public const int QuickUnlock_button = 2131099903; + // aapt resource value: 0x7f06015b + public const int CouldNotSaveToRemote = 2131099995; - // aapt resource value: 0x7f060105 - public const int QuickUnlock_fail = 2131099909; + // aapt resource value: 0x7f06003f + public const int CreditsText = 2131099711; - // aapt resource value: 0x7f0600fe - public const int QuickUnlock_label = 2131099902; + // aapt resource value: 0x7f06014c + public const int DecodingDatabase = 2131099980; - // aapt resource value: 0x7f060100 - public const int QuickUnlock_lockButton = 2131099904; + // aapt resource value: 0x7f060147 + public const int DeletingEntry = 2131099975; + + // aapt resource value: 0x7f060148 + public const int DeletingGroup = 2131099976; + + // aapt resource value: 0x7f060155 + public const int DownloadingRemoteFile = 2131099989; + + // aapt resource value: 0x7f060054 + public const int FileHandling_prefs = 2131099732; + + // aapt resource value: 0x7f060029 + public const int FileHandling_prefs_key = 2131099689; + + // aapt resource value: 0x7f060092 + public const int FileNotFound = 2131099794; + + // aapt resource value: 0x7f060158 + public const int FilesInSync = 2131099992; + + // aapt resource value: 0x7f0600a5 + public const int InvalidPassword = 2131099813; + + // aapt resource value: 0x7f06002e + public const int LastInfoVersionCode_key = 2131099694; + + // aapt resource value: 0x7f06015f + public const int LoadedFromRemoteInSync = 2131099999; + + // aapt resource value: 0x7f060032 + public const int MarketURL = 2131099698; + + // aapt resource value: 0x7f0600af + public const int MaskedPassword = 2131099823; + + // aapt resource value: 0x7f060150 + public const int MessageSyncQuestion = 2131099984; + + // aapt resource value: 0x7f060153 + public const int NoOverwrite = 2131099987; + + // aapt resource value: 0x7f06015e + public const int NotifyOpenFromLocalDueToConflict = 2131099998; + + // aapt resource value: 0x7f060037 + public const int OpenKp2aKeyboardAutomatically_key = 2131099703; // aapt resource value: 0x7f060130 - public const int RecycleBin = 2131099952; + public const int OpenKp2aKeyboardAutomatically_summary = 2131099952; + + // aapt resource value: 0x7f06012f + public const int OpenKp2aKeyboardAutomatically_title = 2131099951; + + // aapt resource value: 0x7f06014d + public const int ParsingDatabase = 2131099981; + + // aapt resource value: 0x7f06003b + public const int PreloadDatabaseEnabled_key = 2131099707; + + // aapt resource value: 0x7f060134 + public const int PreloadDatabaseEnabled_summary = 2131099956; + + // aapt resource value: 0x7f060133 + public const int PreloadDatabaseEnabled_title = 2131099955; + + // aapt resource value: 0x7f06002a + public const int QuickUnlockDefaultEnabled_key = 2131099690; + + // aapt resource value: 0x7f06010c + public const int QuickUnlockDefaultEnabled_summary = 2131099916; + + // aapt resource value: 0x7f06010b + public const int QuickUnlockDefaultEnabled_title = 2131099915; + + // aapt resource value: 0x7f06002c + public const int QuickUnlockLength_default = 2131099692; + + // aapt resource value: 0x7f06002b + public const int QuickUnlockLength_key = 2131099691; + + // aapt resource value: 0x7f06010e + public const int QuickUnlockLength_summary = 2131099918; + + // aapt resource value: 0x7f06010d + public const int QuickUnlockLength_title = 2131099917; + + // aapt resource value: 0x7f060109 + public const int QuickUnlock_button = 2131099913; + + // aapt resource value: 0x7f06010f + public const int QuickUnlock_fail = 2131099919; + + // aapt resource value: 0x7f060108 + public const int QuickUnlock_label = 2131099912; + + // aapt resource value: 0x7f06010a + public const int QuickUnlock_lockButton = 2131099914; + + // aapt resource value: 0x7f060053 + public const int QuickUnlock_prefs = 2131099731; + + // aapt resource value: 0x7f060028 + public const int QuickUnlock_prefs_key = 2131099688; + + // aapt resource value: 0x7f06013a + public const int RecycleBin = 2131099962; // aapt resource value: 0x7f060020 public const int RememberRecentFiles_key = 2131099680; - // aapt resource value: 0x7f0600f2 - public const int RememberRecentFiles_summary = 2131099890; + // aapt resource value: 0x7f0600fc + public const int RememberRecentFiles_summary = 2131099900; - // aapt resource value: 0x7f0600f1 - public const int RememberRecentFiles_title = 2131099889; + // aapt resource value: 0x7f0600fb + public const int RememberRecentFiles_title = 2131099899; + + // aapt resource value: 0x7f060161 + public const int RemoteDatabaseUnchanged = 2131100001; // aapt resource value: 0x7f060157 - public const int RemoteDatabaseUnchanged = 2131099991; + public const int RestoringRemoteFile = 2131099991; - // aapt resource value: 0x7f06014d - public const int RestoringRemoteFile = 2131099981; + // aapt resource value: 0x7f060115 + public const int SaveAttachmentDialog_open = 2131099925; - // aapt resource value: 0x7f06010b - public const int SaveAttachmentDialog_open = 2131099915; + // aapt resource value: 0x7f060114 + public const int SaveAttachmentDialog_save = 2131099924; - // aapt resource value: 0x7f06010a - public const int SaveAttachmentDialog_save = 2131099914; + // aapt resource value: 0x7f060113 + public const int SaveAttachmentDialog_text = 2131099923; - // aapt resource value: 0x7f060109 - public const int SaveAttachmentDialog_text = 2131099913; + // aapt resource value: 0x7f060112 + public const int SaveAttachmentDialog_title = 2131099922; - // aapt resource value: 0x7f060108 - public const int SaveAttachmentDialog_title = 2131099912; + // aapt resource value: 0x7f060117 + public const int SaveAttachment_Failed = 2131099927; - // aapt resource value: 0x7f06010d - public const int SaveAttachment_Failed = 2131099917; + // aapt resource value: 0x7f060116 + public const int SaveAttachment_doneMessage = 2131099926; - // aapt resource value: 0x7f06010c - public const int SaveAttachment_doneMessage = 2131099916; + // aapt resource value: 0x7f060149 + public const int SettingPassword = 2131099977; - // aapt resource value: 0x7f06013f - public const int SettingPassword = 2131099967; + // aapt resource value: 0x7f06012c + public const int ShowCopyToClipboardNotification_summary = 2131099948; - // aapt resource value: 0x7f060122 - public const int ShowCopyToClipboardNotification_summary = 2131099938; + // aapt resource value: 0x7f06012b + public const int ShowCopyToClipboardNotification_title = 2131099947; - // aapt resource value: 0x7f060121 - public const int ShowCopyToClipboardNotification_title = 2131099937; + // aapt resource value: 0x7f06012e + public const int ShowKp2aKeyboardNotification_summary = 2131099950; - // aapt resource value: 0x7f060124 - public const int ShowKp2aKeyboardNotification_summary = 2131099940; + // aapt resource value: 0x7f06012d + public const int ShowKp2aKeyboardNotification_title = 2131099949; - // aapt resource value: 0x7f060123 - public const int ShowKp2aKeyboardNotification_title = 2131099939; + // aapt resource value: 0x7f06003a + public const int ShowUnlockedNotification_key = 2131099706; - // aapt resource value: 0x7f060035 - public const int ShowUnlockedNotification_key = 2131099701; + // aapt resource value: 0x7f060132 + public const int ShowUnlockedNotification_summary = 2131099954; - // aapt resource value: 0x7f060128 - public const int ShowUnlockedNotification_summary = 2131099944; - - // aapt resource value: 0x7f060127 - public const int ShowUnlockedNotification_title = 2131099943; + // aapt resource value: 0x7f060131 + public const int ShowUnlockedNotification_title = 2131099953; // aapt resource value: 0x7f06001f public const int ShowUsernameInList_key = 2131099679; - // aapt resource value: 0x7f0600f0 - public const int ShowUsernameInList_summary = 2131099888; + // aapt resource value: 0x7f0600fa + public const int ShowUsernameInList_summary = 2131099898; - // aapt resource value: 0x7f0600ef - public const int ShowUsernameInList_title = 2131099887; + // aapt resource value: 0x7f0600f9 + public const int ShowUsernameInList_title = 2131099897; - // aapt resource value: 0x7f06002e - public const int SuggestionsURL = 2131099694; + // aapt resource value: 0x7f060033 + public const int SuggestionsURL = 2131099699; - // aapt resource value: 0x7f06014f - public const int SynchronizedDatabaseSuccessfully = 2131099983; + // aapt resource value: 0x7f060159 + public const int SynchronizedDatabaseSuccessfully = 2131099993; - // aapt resource value: 0x7f06014a - public const int SynchronizingCachedDatabase = 2131099978; + // aapt resource value: 0x7f060154 + public const int SynchronizingCachedDatabase = 2131099988; - // aapt resource value: 0x7f060147 - public const int SynchronizingDatabase = 2131099975; + // aapt resource value: 0x7f060151 + public const int SynchronizingDatabase = 2131099985; // aapt resource value: 0x7f06001e public const int TanExpiresOnUse_key = 2131099678; - // aapt resource value: 0x7f0600ee - public const int TanExpiresOnUse_summary = 2131099886; + // aapt resource value: 0x7f0600f8 + public const int TanExpiresOnUse_summary = 2131099896; - // aapt resource value: 0x7f0600ed - public const int TanExpiresOnUse_title = 2131099885; + // aapt resource value: 0x7f0600f7 + public const int TanExpiresOnUse_title = 2131099895; - // aapt resource value: 0x7f060145 - public const int TitleSyncQuestion = 2131099973; + // aapt resource value: 0x7f06014f + public const int TitleSyncQuestion = 2131099983; - // aapt resource value: 0x7f060141 - public const int TransformingKey = 2131099969; + // aapt resource value: 0x7f06014b + public const int TransformingKey = 2131099979; - // aapt resource value: 0x7f06002f - public const int TranslationURL = 2131099695; + // aapt resource value: 0x7f060034 + public const int TranslationURL = 2131099700; - // aapt resource value: 0x7f060140 - public const int UndoingChanges = 2131099968; + // aapt resource value: 0x7f06014a + public const int UndoingChanges = 2131099978; + + // aapt resource value: 0x7f060160 + public const int UpdatedCachedFileOnLoad = 2131100000; + + // aapt resource value: 0x7f06015d + public const int UpdatedRemoteFileOnLoad = 2131099997; // aapt resource value: 0x7f060156 - public const int UpdatedCachedFileOnLoad = 2131099990; + public const int UploadingFile = 2131099990; - // aapt resource value: 0x7f060153 - public const int UpdatedRemoteFileOnLoad = 2131099987; + // aapt resource value: 0x7f06002d + public const int UsageCount_key = 2131099693; - // aapt resource value: 0x7f06014c - public const int UploadingFile = 2131099980; + // aapt resource value: 0x7f06002f + public const int UseFileTransactions_key = 2131099695; - // aapt resource value: 0x7f060028 - public const int UsageCount_key = 2131099688; + // aapt resource value: 0x7f060124 + public const int UseFileTransactions_summary = 2131099940; - // aapt resource value: 0x7f06002a - public const int UseFileTransactions_key = 2131099690; + // aapt resource value: 0x7f060123 + public const int UseFileTransactions_title = 2131099939; - // aapt resource value: 0x7f06011a - public const int UseFileTransactions_summary = 2131099930; + // aapt resource value: 0x7f060036 + public const int UseKp2aKeyboard_key = 2131099702; - // aapt resource value: 0x7f060119 - public const int UseFileTransactions_title = 2131099929; + // aapt resource value: 0x7f060030 + public const int UseOfflineCache_key = 2131099696; - // aapt resource value: 0x7f060031 - public const int UseKp2aKeyboard_key = 2131099697; + // aapt resource value: 0x7f060126 + public const int UseOfflineCache_summary = 2131099942; - // aapt resource value: 0x7f06002b - public const int UseOfflineCache_key = 2131099691; + // aapt resource value: 0x7f060125 + public const int UseOfflineCache_title = 2131099941; - // aapt resource value: 0x7f06011c - public const int UseOfflineCache_summary = 2131099932; - - // aapt resource value: 0x7f06011b - public const int UseOfflineCache_title = 2131099931; - - // aapt resource value: 0x7f060148 - public const int YesSynchronize = 2131099976; - - // aapt resource value: 0x7f060037 - public const int about_feedback = 2131099703; - - // aapt resource value: 0x7f060038 - public const int about_homepage = 2131099704; - - // aapt resource value: 0x7f06003b - public const int accept = 2131099707; - - // aapt resource value: 0x7f060113 - public const int add_binary = 2131099923; + // aapt resource value: 0x7f060152 + public const int YesSynchronize = 2131099986; // aapt resource value: 0x7f06003c - public const int add_entry = 2131099708; - - // aapt resource value: 0x7f060114 - public const int add_extra_string = 2131099924; - - // aapt resource value: 0x7f06003e - public const int add_group = 2131099710; - - // aapt resource value: 0x7f06003f - public const int add_group_title = 2131099711; + public const int about_feedback = 2131099708; // aapt resource value: 0x7f06003d - public const int add_url_entry = 2131099709; + public const int about_homepage = 2131099709; + + // aapt resource value: 0x7f060040 + public const int accept = 2131099712; + + // aapt resource value: 0x7f06011d + public const int add_binary = 2131099933; // aapt resource value: 0x7f060041 - public const int algorithm = 2131099713; + public const int add_entry = 2131099713; + + // aapt resource value: 0x7f06011e + public const int add_extra_string = 2131099934; + + // aapt resource value: 0x7f060043 + public const int add_group = 2131099715; + + // aapt resource value: 0x7f060044 + public const int add_group_title = 2131099716; // aapt resource value: 0x7f060042 - public const int algorithm_colon = 2131099714; + public const int add_url_entry = 2131099714; + + // aapt resource value: 0x7f060046 + public const int algorithm = 2131099718; + + // aapt resource value: 0x7f060047 + public const int algorithm_colon = 2131099719; // aapt resource value: 0x7f060013 public const int algorithm_key = 2131099667; @@ -1694,95 +1706,95 @@ namespace keepass2android // aapt resource value: 0x7f060014 public const int app_key = 2131099668; - // aapt resource value: 0x7f060043 - public const int app_name = 2131099715; + // aapt resource value: 0x7f060048 + public const int app_name = 2131099720; - // aapt resource value: 0x7f060045 - public const int app_name_nonet = 2131099717; + // aapt resource value: 0x7f06004a + public const int app_name_nonet = 2131099722; - // aapt resource value: 0x7f060047 - public const int app_timeout = 2131099719; + // aapt resource value: 0x7f06004c + public const int app_timeout = 2131099724; // aapt resource value: 0x7f060015 public const int app_timeout_key = 2131099669; - // aapt resource value: 0x7f060048 - public const int app_timeout_summary = 2131099720; - - // aapt resource value: 0x7f060049 - public const int application = 2131099721; - - // aapt resource value: 0x7f06004a - public const int application_settings = 2131099722; - - // aapt resource value: 0x7f0600e9 - public const int author = 2131099881; - - // aapt resource value: 0x7f060054 - public const int available_through_keyboard = 2131099732; - - // aapt resource value: 0x7f06004b - public const int brackets = 2131099723; - - // aapt resource value: 0x7f06004c - public const int browser_intall_text = 2131099724; - // aapt resource value: 0x7f06004d - public const int building_search_idx = 2131099725; + public const int app_timeout_summary = 2131099725; // aapt resource value: 0x7f06004e - public const int cancel = 2131099726; + public const int application = 2131099726; - // aapt resource value: 0x7f0600f6 - public const int caseSensitive = 2131099894; + // aapt resource value: 0x7f06004f + public const int application_settings = 2131099727; + + // aapt resource value: 0x7f0600f3 + public const int author = 2131099891; + + // aapt resource value: 0x7f06005e + public const int available_through_keyboard = 2131099742; + + // aapt resource value: 0x7f060055 + public const int brackets = 2131099733; + + // aapt resource value: 0x7f060056 + public const int browser_intall_text = 2131099734; + + // aapt resource value: 0x7f060057 + public const int building_search_idx = 2131099735; + + // aapt resource value: 0x7f060058 + public const int cancel = 2131099736; + + // aapt resource value: 0x7f060100 + public const int caseSensitive = 2131099904; // aapt resource value: 0x7f060003 public const int change_entry = 2131099651; - // aapt resource value: 0x7f060050 - public const int clipboard_timeout = 2131099728; + // aapt resource value: 0x7f06005a + public const int clipboard_timeout = 2131099738; - // aapt resource value: 0x7f060033 - public const int clipboard_timeout_default = 2131099699; + // aapt resource value: 0x7f060038 + public const int clipboard_timeout_default = 2131099704; // aapt resource value: 0x7f060016 public const int clipboard_timeout_key = 2131099670; - // aapt resource value: 0x7f060051 - public const int clipboard_timeout_summary = 2131099729; + // aapt resource value: 0x7f06005b + public const int clipboard_timeout_summary = 2131099739; - // aapt resource value: 0x7f060053 - public const int copy_password = 2131099731; + // aapt resource value: 0x7f06005d + public const int copy_password = 2131099741; - // aapt resource value: 0x7f060052 - public const int copy_username = 2131099730; + // aapt resource value: 0x7f06005c + public const int copy_username = 2131099740; - // aapt resource value: 0x7f060057 - public const int creating_db_key = 2131099735; + // aapt resource value: 0x7f060061 + public const int creating_db_key = 2131099745; - // aapt resource value: 0x7f060118 - public const int credentials_dialog_title = 2131099928; + // aapt resource value: 0x7f060122 + public const int credentials_dialog_title = 2131099938; - // aapt resource value: 0x7f0600eb - public const int credit_plugin1 = 2131099883; + // aapt resource value: 0x7f0600f5 + public const int credit_plugin1 = 2131099893; - // aapt resource value: 0x7f060058 - public const int current_group = 2131099736; + // aapt resource value: 0x7f060062 + public const int current_group = 2131099746; - // aapt resource value: 0x7f060059 - public const int current_group_root = 2131099737; + // aapt resource value: 0x7f060063 + public const int current_group_root = 2131099747; - // aapt resource value: 0x7f06005a - public const int database = 2131099738; + // aapt resource value: 0x7f060064 + public const int database = 2131099748; - // aapt resource value: 0x7f060116 - public const int database_loaded_quickunlock_enabled = 2131099926; + // aapt resource value: 0x7f060120 + public const int database_loaded_quickunlock_enabled = 2131099936; - // aapt resource value: 0x7f060117 - public const int database_loaded_unlocked = 2131099927; + // aapt resource value: 0x7f060121 + public const int database_loaded_unlocked = 2131099937; - // aapt resource value: 0x7f0600d2 - public const int database_name = 2131099858; + // aapt resource value: 0x7f0600dc + public const int database_name = 2131099868; // aapt resource value: 0x7f060022 public const int database_name_key = 2131099682; @@ -1790,236 +1802,242 @@ namespace keepass2android // aapt resource value: 0x7f060017 public const int db_key = 2131099671; - // aapt resource value: 0x7f06005b - public const int decrypting_db = 2131099739; + // aapt resource value: 0x7f060065 + public const int decrypting_db = 2131099749; - // aapt resource value: 0x7f06005c - public const int decrypting_entry = 2131099740; + // aapt resource value: 0x7f060066 + public const int decrypting_entry = 2131099750; - // aapt resource value: 0x7f06005d - public const int default_checkbox = 2131099741; + // aapt resource value: 0x7f060067 + public const int default_checkbox = 2131099751; // aapt resource value: 0x7f06000b public const int default_file_path = 2131099659; - // aapt resource value: 0x7f0600d3 - public const int default_username = 2131099859; + // aapt resource value: 0x7f0600dd + public const int default_username = 2131099869; // aapt resource value: 0x7f060021 public const int default_username_key = 2131099681; - // aapt resource value: 0x7f060115 - public const int delete_extra_string = 2131099925; + // aapt resource value: 0x7f06011f + public const int delete_extra_string = 2131099935; - // aapt resource value: 0x7f06005e - public const int digits = 2131099742; + // aapt resource value: 0x7f060068 + public const int digits = 2131099752; - // aapt resource value: 0x7f06005f - public const int disclaimer_formal = 2131099743; + // aapt resource value: 0x7f060069 + public const int disclaimer_formal = 2131099753; + + // aapt resource value: 0x7f060051 + public const int display_prefs = 2131099729; + + // aapt resource value: 0x7f060027 + public const int display_prefs_key = 2131099687; // aapt resource value: 0x7f06000c public const int donate_url = 2131099660; - // aapt resource value: 0x7f060040 - public const int edit_group_title = 2131099712; - - // aapt resource value: 0x7f060060 - public const int ellipsis = 2131099744; - - // aapt resource value: 0x7f0600fd - public const int enable_quickunlock = 2131099901; - - // aapt resource value: 0x7f060061 - public const int enter_filename = 2131099745; - - // aapt resource value: 0x7f0600fc - public const int enter_filename_details_create_import = 2131099900; - - // aapt resource value: 0x7f0600fb - public const int enter_filename_details_url = 2131099899; - - // aapt resource value: 0x7f060062 - public const int entry_accessed = 2131099746; - - // aapt resource value: 0x7f060063 - public const int entry_and_or = 2131099747; - - // aapt resource value: 0x7f060073 - public const int entry_binaries = 2131099763; - - // aapt resource value: 0x7f060064 - public const int entry_cancel = 2131099748; - - // aapt resource value: 0x7f060065 - public const int entry_comment = 2131099749; - - // aapt resource value: 0x7f060068 - public const int entry_confpassword = 2131099752; - - // aapt resource value: 0x7f060069 - public const int entry_created = 2131099753; + // aapt resource value: 0x7f060045 + public const int edit_group_title = 2131099717; // aapt resource value: 0x7f06006a - public const int entry_expires = 2131099754; + public const int ellipsis = 2131099754; - // aapt resource value: 0x7f060072 - public const int entry_extra_strings = 2131099762; + // aapt resource value: 0x7f060107 + public const int enable_quickunlock = 2131099911; // aapt resource value: 0x7f06006b - public const int entry_keyfile = 2131099755; + public const int enter_filename = 2131099755; + + // aapt resource value: 0x7f060106 + public const int enter_filename_details_create_import = 2131099910; + + // aapt resource value: 0x7f060105 + public const int enter_filename_details_url = 2131099909; // aapt resource value: 0x7f06006c - public const int entry_modified = 2131099756; - - // aapt resource value: 0x7f060067 - public const int entry_override_url = 2131099751; + public const int entry_accessed = 2131099756; // aapt resource value: 0x7f06006d - public const int entry_password = 2131099757; - - // aapt resource value: 0x7f06006e - public const int entry_save = 2131099758; - - // aapt resource value: 0x7f060066 - public const int entry_tags = 2131099750; - - // aapt resource value: 0x7f06006f - public const int entry_title = 2131099759; - - // aapt resource value: 0x7f060070 - public const int entry_url = 2131099760; - - // aapt resource value: 0x7f060071 - public const int entry_user_name = 2131099761; - - // aapt resource value: 0x7f060074 - public const int error_arc4 = 2131099764; - - // aapt resource value: 0x7f060075 - public const int error_can_not_handle_uri = 2131099765; - - // aapt resource value: 0x7f060076 - public const int error_could_not_create_group = 2131099766; - - // aapt resource value: 0x7f060077 - public const int error_could_not_create_parent = 2131099767; - - // aapt resource value: 0x7f060078 - public const int error_database_exists = 2131099768; - - // aapt resource value: 0x7f060079 - public const int error_database_settings = 2131099769; - - // aapt resource value: 0x7f06007a - public const int error_failed_to_launch_link = 2131099770; - - // aapt resource value: 0x7f06007c - public const int error_file_not_create = 2131099772; - - // aapt resource value: 0x7f06007b - public const int error_filename_required = 2131099771; + public const int entry_and_or = 2131099757; // aapt resource value: 0x7f06007d - public const int error_invalid_db = 2131099773; + public const int entry_binaries = 2131099773; - // aapt resource value: 0x7f06010e - public const int error_invalid_expiry_date = 2131099918; + // aapt resource value: 0x7f06006e + public const int entry_cancel = 2131099758; + + // aapt resource value: 0x7f06006f + public const int entry_comment = 2131099759; + + // aapt resource value: 0x7f060072 + public const int entry_confpassword = 2131099762; + + // aapt resource value: 0x7f060073 + public const int entry_created = 2131099763; + + // aapt resource value: 0x7f060074 + public const int entry_expires = 2131099764; + + // aapt resource value: 0x7f06007c + public const int entry_extra_strings = 2131099772; + + // aapt resource value: 0x7f060075 + public const int entry_keyfile = 2131099765; + + // aapt resource value: 0x7f060076 + public const int entry_modified = 2131099766; + + // aapt resource value: 0x7f060071 + public const int entry_override_url = 2131099761; + + // aapt resource value: 0x7f060077 + public const int entry_password = 2131099767; + + // aapt resource value: 0x7f060078 + public const int entry_save = 2131099768; + + // aapt resource value: 0x7f060070 + public const int entry_tags = 2131099760; + + // aapt resource value: 0x7f060079 + public const int entry_title = 2131099769; + + // aapt resource value: 0x7f06007a + public const int entry_url = 2131099770; + + // aapt resource value: 0x7f06007b + public const int entry_user_name = 2131099771; // aapt resource value: 0x7f06007e - public const int error_invalid_path = 2131099774; + public const int error_arc4 = 2131099774; // aapt resource value: 0x7f06007f - public const int error_no_name = 2131099775; + public const int error_can_not_handle_uri = 2131099775; // aapt resource value: 0x7f060080 - public const int error_nopass = 2131099776; + public const int error_could_not_create_group = 2131099776; // aapt resource value: 0x7f060081 - public const int error_out_of_memory = 2131099777; + public const int error_could_not_create_parent = 2131099777; // aapt resource value: 0x7f060082 - public const int error_pass_gen_type = 2131099778; + public const int error_database_exists = 2131099778; // aapt resource value: 0x7f060083 - public const int error_pass_match = 2131099779; + public const int error_database_settings = 2131099779; // aapt resource value: 0x7f060084 - public const int error_rounds_not_number = 2131099780; - - // aapt resource value: 0x7f060085 - public const int error_rounds_too_large = 2131099781; - - // aapt resource value: 0x7f06010f - public const int error_string_key = 2131099919; + public const int error_failed_to_launch_link = 2131099780; // aapt resource value: 0x7f060086 - public const int error_title_required = 2131099782; + public const int error_file_not_create = 2131099782; + + // aapt resource value: 0x7f060085 + public const int error_filename_required = 2131099781; // aapt resource value: 0x7f060087 - public const int error_wrong_length = 2131099783; + public const int error_invalid_db = 2131099783; - // aapt resource value: 0x7f0600f4 - public const int excludeExpiredEntries = 2131099892; + // aapt resource value: 0x7f060118 + public const int error_invalid_expiry_date = 2131099928; - // aapt resource value: 0x7f060110 - public const int field_name = 2131099920; - - // aapt resource value: 0x7f060111 - public const int field_value = 2131099921; + // aapt resource value: 0x7f060088 + public const int error_invalid_path = 2131099784; // aapt resource value: 0x7f060089 - public const int file_browser = 2131099785; + public const int error_no_name = 2131099785; + + // aapt resource value: 0x7f06008a + public const int error_nopass = 2131099786; + + // aapt resource value: 0x7f06008b + public const int error_out_of_memory = 2131099787; + + // aapt resource value: 0x7f06008c + public const int error_pass_gen_type = 2131099788; + + // aapt resource value: 0x7f06008d + public const int error_pass_match = 2131099789; + + // aapt resource value: 0x7f06008e + public const int error_rounds_not_number = 2131099790; + + // aapt resource value: 0x7f06008f + public const int error_rounds_too_large = 2131099791; + + // aapt resource value: 0x7f060119 + public const int error_string_key = 2131099929; + + // aapt resource value: 0x7f060090 + public const int error_title_required = 2131099792; + + // aapt resource value: 0x7f060091 + public const int error_wrong_length = 2131099793; + + // aapt resource value: 0x7f0600fe + public const int excludeExpiredEntries = 2131099902; + + // aapt resource value: 0x7f06011a + public const int field_name = 2131099930; + + // aapt resource value: 0x7f06011b + public const int field_value = 2131099931; + + // aapt resource value: 0x7f060093 + public const int file_browser = 2131099795; // aapt resource value: 0x7f06000f public const int further_author_names = 2131099663; - // aapt resource value: 0x7f0600ea - public const int further_authors = 2131099882; - - // aapt resource value: 0x7f06008a - public const int generate_password = 2131099786; - - // aapt resource value: 0x7f06008b - public const int group = 2131099787; - - // aapt resource value: 0x7f06008c - public const int hint_comment = 2131099788; - - // aapt resource value: 0x7f06008d - public const int hint_conf_pass = 2131099789; - - // aapt resource value: 0x7f06008e - public const int hint_generated_password = 2131099790; - - // aapt resource value: 0x7f06008f - public const int hint_group_name = 2131099791; - - // aapt resource value: 0x7f060090 - public const int hint_keyfile = 2131099792; - - // aapt resource value: 0x7f060091 - public const int hint_length = 2131099793; - - // aapt resource value: 0x7f060093 - public const int hint_login_pass = 2131099795; - - // aapt resource value: 0x7f060096 - public const int hint_override_url = 2131099798; - - // aapt resource value: 0x7f060092 - public const int hint_pass = 2131099794; - - // aapt resource value: 0x7f060097 - public const int hint_tags = 2131099799; + // aapt resource value: 0x7f0600f4 + public const int further_authors = 2131099892; // aapt resource value: 0x7f060094 - public const int hint_title = 2131099796; + public const int generate_password = 2131099796; // aapt resource value: 0x7f060095 - public const int hint_url = 2131099797; + public const int group = 2131099797; + + // aapt resource value: 0x7f060096 + public const int hint_comment = 2131099798; + + // aapt resource value: 0x7f060097 + public const int hint_conf_pass = 2131099799; // aapt resource value: 0x7f060098 - public const int hint_username = 2131099800; + public const int hint_generated_password = 2131099800; + + // aapt resource value: 0x7f060099 + public const int hint_group_name = 2131099801; + + // aapt resource value: 0x7f06009a + public const int hint_keyfile = 2131099802; + + // aapt resource value: 0x7f06009b + public const int hint_length = 2131099803; + + // aapt resource value: 0x7f06009d + public const int hint_login_pass = 2131099805; + + // aapt resource value: 0x7f0600a0 + public const int hint_override_url = 2131099808; + + // aapt resource value: 0x7f06009c + public const int hint_pass = 2131099804; + + // aapt resource value: 0x7f0600a1 + public const int hint_tags = 2131099809; + + // aapt resource value: 0x7f06009e + public const int hint_title = 2131099806; + + // aapt resource value: 0x7f06009f + public const int hint_url = 2131099807; + + // aapt resource value: 0x7f0600a2 + public const int hint_username = 2131099810; // aapt resource value: 0x7f06000d public const int homepage = 2131099661; @@ -2030,35 +2048,35 @@ namespace keepass2android // aapt resource value: 0x7f060001 public const int ime_name = 2131099649; - // aapt resource value: 0x7f0600e0 - public const int insert_element_here = 2131099872; + // aapt resource value: 0x7f0600ea + public const int insert_element_here = 2131099882; - // aapt resource value: 0x7f060099 - public const int install_from_market = 2131099801; + // aapt resource value: 0x7f0600a3 + public const int install_from_market = 2131099811; - // aapt resource value: 0x7f06009a - public const int install_from_website = 2131099802; + // aapt resource value: 0x7f0600a4 + public const int install_from_website = 2131099812; - // aapt resource value: 0x7f06009c - public const int invalid_algorithm = 2131099804; + // aapt resource value: 0x7f0600a6 + public const int invalid_algorithm = 2131099814; - // aapt resource value: 0x7f06009d - public const int invalid_db_sig = 2131099805; + // aapt resource value: 0x7f0600a7 + public const int invalid_db_sig = 2131099815; // aapt resource value: 0x7f060010 public const int issues = 2131099664; - // aapt resource value: 0x7f06009e - public const int keyfile_does_not_exist = 2131099806; + // aapt resource value: 0x7f0600a8 + public const int keyfile_does_not_exist = 2131099816; - // aapt resource value: 0x7f06009f - public const int keyfile_is_empty = 2131099807; + // aapt resource value: 0x7f0600a9 + public const int keyfile_is_empty = 2131099817; // aapt resource value: 0x7f060019 public const int keyfile_key = 2131099673; - // aapt resource value: 0x7f0600f3 - public const int kp2a_findUrl = 2131099891; + // aapt resource value: 0x7f0600fd + public const int kp2a_findUrl = 2131099901; // aapt resource value: 0x7f060006 public const int label_go_key = 2131099654; @@ -2072,119 +2090,119 @@ namespace keepass2android // aapt resource value: 0x7f060009 public const int label_subtype_generic = 2131099657; - // aapt resource value: 0x7f0600a0 - public const int length = 2131099808; + // aapt resource value: 0x7f0600aa + public const int length = 2131099818; // aapt resource value: 0x7f06000a public const int library_name = 2131099658; - // aapt resource value: 0x7f060034 - public const int list_size_default = 2131099700; + // aapt resource value: 0x7f060039 + public const int list_size_default = 2131099705; // aapt resource value: 0x7f06001c public const int list_size_key = 2131099676; - // aapt resource value: 0x7f0600a2 - public const int list_size_summary = 2131099810; + // aapt resource value: 0x7f0600ac + public const int list_size_summary = 2131099820; - // aapt resource value: 0x7f0600a1 - public const int list_size_title = 2131099809; + // aapt resource value: 0x7f0600ab + public const int list_size_title = 2131099819; - // aapt resource value: 0x7f0600a3 - public const int loading_database = 2131099811; + // aapt resource value: 0x7f0600ad + public const int loading_database = 2131099821; - // aapt resource value: 0x7f0600a4 - public const int lowercase = 2131099812; + // aapt resource value: 0x7f0600ae + public const int lowercase = 2131099822; // aapt resource value: 0x7f06001a public const int maskpass_key = 2131099674; - // aapt resource value: 0x7f0600a7 - public const int maskpass_summary = 2131099815; - - // aapt resource value: 0x7f0600a6 - public const int maskpass_title = 2131099814; - - // aapt resource value: 0x7f0600a8 - public const int menu_about = 2131099816; - - // aapt resource value: 0x7f0600ad - public const int menu_app_settings = 2131099821; - - // aapt resource value: 0x7f0600bb - public const int menu_change_db = 2131099835; - - // aapt resource value: 0x7f0600a9 - public const int menu_change_key = 2131099817; - - // aapt resource value: 0x7f0600aa - public const int menu_copy_pass = 2131099818; - - // aapt resource value: 0x7f0600ab - public const int menu_copy_user = 2131099819; - - // aapt resource value: 0x7f0600ac - public const int menu_create = 2131099820; - - // aapt resource value: 0x7f0600ae - public const int menu_db_settings = 2131099822; - - // aapt resource value: 0x7f0600af - public const int menu_delete = 2131099823; - // aapt resource value: 0x7f0600b1 - public const int menu_donate = 2131099825; - - // aapt resource value: 0x7f0600b2 - public const int menu_edit = 2131099826; - - // aapt resource value: 0x7f0600b3 - public const int menu_hide_password = 2131099827; - - // aapt resource value: 0x7f0600b4 - public const int menu_homepage = 2131099828; - - // aapt resource value: 0x7f0600b5 - public const int menu_lock = 2131099829; + public const int maskpass_summary = 2131099825; // aapt resource value: 0x7f0600b0 - public const int menu_move = 2131099824; + public const int maskpass_title = 2131099824; - // aapt resource value: 0x7f0600b6 - public const int menu_open = 2131099830; + // aapt resource value: 0x7f0600b2 + public const int menu_about = 2131099826; // aapt resource value: 0x7f0600b7 - public const int menu_rename = 2131099831; + public const int menu_app_settings = 2131099831; + + // aapt resource value: 0x7f0600c5 + public const int menu_change_db = 2131099845; + + // aapt resource value: 0x7f0600b3 + public const int menu_change_key = 2131099827; + + // aapt resource value: 0x7f0600b4 + public const int menu_copy_pass = 2131099828; + + // aapt resource value: 0x7f0600b5 + public const int menu_copy_user = 2131099829; + + // aapt resource value: 0x7f0600b6 + public const int menu_create = 2131099830; // aapt resource value: 0x7f0600b8 - public const int menu_search = 2131099832; + public const int menu_db_settings = 2131099832; // aapt resource value: 0x7f0600b9 - public const int menu_search_advanced = 2131099833; + public const int menu_delete = 2131099833; - // aapt resource value: 0x7f0600ba - public const int menu_url = 2131099834; + // aapt resource value: 0x7f0600bb + public const int menu_donate = 2131099835; // aapt resource value: 0x7f0600bc - public const int minus = 2131099836; + public const int menu_edit = 2131099836; // aapt resource value: 0x7f0600bd - public const int never = 2131099837; + public const int menu_hide_password = 2131099837; + + // aapt resource value: 0x7f0600be + public const int menu_homepage = 2131099838; // aapt resource value: 0x7f0600bf - public const int no = 2131099839; + public const int menu_lock = 2131099839; + + // aapt resource value: 0x7f0600ba + public const int menu_move = 2131099834; // aapt resource value: 0x7f0600c0 - public const int no_keys = 2131099840; + public const int menu_open = 2131099840; // aapt resource value: 0x7f0600c1 - public const int no_results = 2131099841; + public const int menu_rename = 2131099841; // aapt resource value: 0x7f0600c2 - public const int no_url_handler = 2131099842; + public const int menu_search = 2131099842; - // aapt resource value: 0x7f060055 - public const int not_possible_im_picker = 2131099733; + // aapt resource value: 0x7f0600c3 + public const int menu_search_advanced = 2131099843; + + // aapt resource value: 0x7f0600c4 + public const int menu_url = 2131099844; + + // aapt resource value: 0x7f0600c6 + public const int minus = 2131099846; + + // aapt resource value: 0x7f0600c7 + public const int never = 2131099847; + + // aapt resource value: 0x7f0600c9 + public const int no = 2131099849; + + // aapt resource value: 0x7f0600ca + public const int no_keys = 2131099850; + + // aapt resource value: 0x7f0600cb + public const int no_results = 2131099851; + + // aapt resource value: 0x7f0600cc + public const int no_url_handler = 2131099852; + + // aapt resource value: 0x7f06005f + public const int not_possible_im_picker = 2131099743; // aapt resource value: 0x7f060011 public const int oi_filemanager_market = 2131099665; @@ -2195,11 +2213,11 @@ namespace keepass2android // aapt resource value: 0x7f06001b public const int omitbackup_key = 2131099675; - // aapt resource value: 0x7f0600c5 - public const int omitbackup_summary = 2131099845; + // aapt resource value: 0x7f0600cf + public const int omitbackup_summary = 2131099855; - // aapt resource value: 0x7f0600c4 - public const int omitbackup_title = 2131099844; + // aapt resource value: 0x7f0600ce + public const int omitbackup_title = 2131099854; // aapt resource value: 0x7f060004 public const int open_entry = 2131099652; @@ -2207,158 +2225,170 @@ namespace keepass2android // aapt resource value: 0x7f060005 public const int open_entry_for_app = 2131099653; - // aapt resource value: 0x7f0600c3 - public const int open_recent = 2131099843; - - // aapt resource value: 0x7f0600c6 - public const int pass_filename = 2131099846; - - // aapt resource value: 0x7f0600c7 - public const int password_title = 2131099847; - - // aapt resource value: 0x7f060056 - public const int please_activate_keyboard = 2131099734; - - // aapt resource value: 0x7f0600c8 - public const int progress_create = 2131099848; - - // aapt resource value: 0x7f0600c9 - public const int progress_title = 2131099849; - - // aapt resource value: 0x7f060112 - public const int protection = 2131099922; - - // aapt resource value: 0x7f060139 - public const int rate_app = 2131099961; - - // aapt resource value: 0x7f0600ec - public const int regular_expression = 2131099884; - - // aapt resource value: 0x7f0600ca - public const int remember_keyfile_summary = 2131099850; - - // aapt resource value: 0x7f0600cb - public const int remember_keyfile_title = 2131099851; - - // aapt resource value: 0x7f0600cc - public const int remove_from_filelist = 2131099852; - // aapt resource value: 0x7f0600cd - public const int rijndael = 2131099853; - - // aapt resource value: 0x7f0600ce - public const int root = 2131099854; - - // aapt resource value: 0x7f0600cf - public const int rounds = 2131099855; + public const int open_recent = 2131099853; // aapt resource value: 0x7f0600d0 - public const int rounds_explaination = 2131099856; + public const int pass_filename = 2131099856; + + // aapt resource value: 0x7f060052 + public const int password_access_prefs = 2131099730; + + // aapt resource value: 0x7f060025 + public const int password_access_prefs_key = 2131099685; // aapt resource value: 0x7f0600d1 - public const int rounds_hint = 2131099857; + public const int password_title = 2131099857; + + // aapt resource value: 0x7f060060 + public const int please_activate_keyboard = 2131099744; + + // aapt resource value: 0x7f0600d2 + public const int progress_create = 2131099858; + + // aapt resource value: 0x7f0600d3 + public const int progress_title = 2131099859; + + // aapt resource value: 0x7f06011c + public const int protection = 2131099932; + + // aapt resource value: 0x7f060143 + public const int rate_app = 2131099971; + + // aapt resource value: 0x7f0600f6 + public const int regular_expression = 2131099894; + + // aapt resource value: 0x7f0600d4 + public const int remember_keyfile_summary = 2131099860; + + // aapt resource value: 0x7f0600d5 + public const int remember_keyfile_title = 2131099861; + + // aapt resource value: 0x7f0600d6 + public const int remove_from_filelist = 2131099862; + + // aapt resource value: 0x7f0600d7 + public const int rijndael = 2131099863; + + // aapt resource value: 0x7f0600d8 + public const int root = 2131099864; + + // aapt resource value: 0x7f0600d9 + public const int rounds = 2131099865; + + // aapt resource value: 0x7f0600da + public const int rounds_explaination = 2131099866; + + // aapt resource value: 0x7f0600db + public const int rounds_hint = 2131099867; // aapt resource value: 0x7f060018 public const int rounds_key = 2131099672; - // aapt resource value: 0x7f0600d4 - public const int saving_database = 2131099860; - - // aapt resource value: 0x7f0600db - public const int search_hint = 2131099867; - - // aapt resource value: 0x7f0600dd - public const int search_in = 2131099869; - - // aapt resource value: 0x7f0600d6 - public const int search_label = 2131099862; - - // aapt resource value: 0x7f0600f5 - public const int search_options = 2131099893; - - // aapt resource value: 0x7f0600dc - public const int search_results = 2131099868; - - // aapt resource value: 0x7f0600df - public const int select_group_then_add = 2131099871; - // aapt resource value: 0x7f0600de - public const int select_other_entry = 2131099870; + public const int saving_database = 2131099870; - // aapt resource value: 0x7f060044 - public const int short_app_name = 2131099716; + // aapt resource value: 0x7f0600e5 + public const int search_hint = 2131099877; - // aapt resource value: 0x7f060046 - public const int short_app_name_nonet = 2131099718; + // aapt resource value: 0x7f0600e7 + public const int search_in = 2131099879; - // aapt resource value: 0x7f0600d7 - public const int show_password = 2131099863; + // aapt resource value: 0x7f0600e0 + public const int search_label = 2131099872; - // aapt resource value: 0x7f0600d9 - public const int sort_db = 2131099865; + // aapt resource value: 0x7f0600ff + public const int search_options = 2131099903; + + // aapt resource value: 0x7f0600e6 + public const int search_results = 2131099878; + + // aapt resource value: 0x7f060050 + public const int security_prefs = 2131099728; + + // aapt resource value: 0x7f060026 + public const int security_prefs_key = 2131099686; + + // aapt resource value: 0x7f0600e9 + public const int select_group_then_add = 2131099881; + + // aapt resource value: 0x7f0600e8 + public const int select_other_entry = 2131099880; + + // aapt resource value: 0x7f060049 + public const int short_app_name = 2131099721; + + // aapt resource value: 0x7f06004b + public const int short_app_name_nonet = 2131099723; + + // aapt resource value: 0x7f0600e1 + public const int show_password = 2131099873; + + // aapt resource value: 0x7f0600e3 + public const int sort_db = 2131099875; // aapt resource value: 0x7f06001d public const int sort_key = 2131099677; - // aapt resource value: 0x7f0600d8 - public const int sort_name = 2131099864; - - // aapt resource value: 0x7f0600d5 - public const int space = 2131099861; - - // aapt resource value: 0x7f0600da - public const int special = 2131099866; - - // aapt resource value: 0x7f0600f8 - public const int start_create = 2131099896; - - // aapt resource value: 0x7f0600fa - public const int start_create_import = 2131099898; - - // aapt resource value: 0x7f0600f7 - public const int start_open_file = 2131099895; - - // aapt resource value: 0x7f0600f9 - public const int start_open_url = 2131099897; - - // aapt resource value: 0x7f060138 - public const int suggest_improvements = 2131099960; - - // aapt resource value: 0x7f060158 - public const int synchronize_database_menu = 2131099992; - - // aapt resource value: 0x7f06013a - public const int translate_app = 2131099962; - - // aapt resource value: 0x7f0600e1 - public const int twofish = 2131099873; - // aapt resource value: 0x7f0600e2 - public const int underline = 2131099874; + public const int sort_name = 2131099874; - // aapt resource value: 0x7f0600e3 - public const int unsupported_db_version = 2131099875; + // aapt resource value: 0x7f0600df + public const int space = 2131099871; // aapt resource value: 0x7f0600e4 - public const int uppercase = 2131099876; + public const int special = 2131099876; - // aapt resource value: 0x7f0600e8 - public const int version_history = 2131099880; + // aapt resource value: 0x7f060102 + public const int start_create = 2131099906; - // aapt resource value: 0x7f0600e7 - public const int version_label = 2131099879; + // aapt resource value: 0x7f060104 + public const int start_create_import = 2131099908; - // aapt resource value: 0x7f0600e5 - public const int warning_read_only = 2131099877; + // aapt resource value: 0x7f060101 + public const int start_open_file = 2131099905; - // aapt resource value: 0x7f0600e6 - public const int warning_unmounted = 2131099878; + // aapt resource value: 0x7f060103 + public const int start_open_url = 2131099907; + + // aapt resource value: 0x7f060142 + public const int suggest_improvements = 2131099970; + + // aapt resource value: 0x7f060162 + public const int synchronize_database_menu = 2131100002; + + // aapt resource value: 0x7f060144 + public const int translate_app = 2131099972; + + // aapt resource value: 0x7f0600eb + public const int twofish = 2131099883; + + // aapt resource value: 0x7f0600ec + public const int underline = 2131099884; + + // aapt resource value: 0x7f0600ed + public const int unsupported_db_version = 2131099885; + + // aapt resource value: 0x7f0600ee + public const int uppercase = 2131099886; + + // aapt resource value: 0x7f0600f2 + public const int version_history = 2131099890; + + // aapt resource value: 0x7f0600f1 + public const int version_label = 2131099889; + + // aapt resource value: 0x7f0600ef + public const int warning_read_only = 2131099887; + + // aapt resource value: 0x7f0600f0 + public const int warning_unmounted = 2131099888; // aapt resource value: 0x7f060002 public const int word_separators = 2131099650; - // aapt resource value: 0x7f0600be - public const int yes = 2131099838; + // aapt resource value: 0x7f0600c8 + public const int yes = 2131099848; static String() { diff --git a/src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png new file mode 100644 index 00000000..7c3e1989 Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png differ diff --git a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png index 4b0dde6a..05369fa4 100644 Binary files a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png and b/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png differ diff --git a/src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png b/src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png new file mode 100644 index 00000000..4b0dde6a Binary files /dev/null and b/src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png differ diff --git a/src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png new file mode 100644 index 00000000..244b2772 Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png differ diff --git a/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png new file mode 100644 index 00000000..5fc114af Binary files /dev/null and b/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png differ diff --git a/src/keepass2android/Resources/drawable/transparent.png b/src/keepass2android/Resources/drawable/transparent.png new file mode 100644 index 00000000..d401564d Binary files /dev/null and b/src/keepass2android/Resources/drawable/transparent.png differ diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml index ab25e198..1162c3cb 100644 --- a/src/keepass2android/Resources/values/config.xml +++ b/src/keepass2android/Resources/values/config.xml @@ -55,8 +55,17 @@ true true - - Enable_QuickUnlock_by_default + + + + + password_access_prefs_key + security_prefs_key + display_prefs_key + QuickUnlock_prefs_key + FileHandling_prefs_key + + Enable_QuickUnlock_by_default QuickUnlockLength 3 diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index 4e64d3ad..0c9282c2 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -21,7 +21,13 @@ Time before locking database when the application is inactive. Application Application settings - Brackets + + Security + Display + Password entry access + QuickUnlock + File handling + Brackets File browsing requires the Open Intents File Manager, click below to install it. Due to some quirks in the file manager, browsing may not work correctly, the first time you browse. Building search index… Cancel @@ -225,7 +231,7 @@ Protected field Add file attachment... Add additional string - Delete additional string + Delete additional string %1$s: Locked. QuickUnlock enabled. %1$s: Unlocked. Enter server credentials diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml index 4672ef88..1da4219e 100644 --- a/src/keepass2android/Resources/xml/preferences.xml +++ b/src/keepass2android/Resources/xml/preferences.xml @@ -21,7 +21,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + android:summary="@string/QuickUnlockDefaultEnabled_summary" + android:defaultValue="true" + android:title="@string/QuickUnlockDefaultEnabled_title" + android:key="@string/QuickUnlockDefaultEnabled_key" /> + + + + + + + + + + + + + + + diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj index b4a95aa0..efd246d5 100644 --- a/src/keepass2android/keepass2android.csproj +++ b/src/keepass2android/keepass2android.csproj @@ -735,4 +735,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/keepass2android/settings/AppSettingsActivity.cs b/src/keepass2android/settings/AppSettingsActivity.cs index b2ecad6b..3a09810a 100644 --- a/src/keepass2android/settings/AppSettingsActivity.cs +++ b/src/keepass2android/settings/AppSettingsActivity.cs @@ -51,7 +51,7 @@ namespace keepass2android #if NoNet try { - ((PreferenceCategory) FindPreference(GetString(Resource.String.db_key))).RemovePreference(cachingPreference); + ((PreferenceScreen) FindPreference(GetString(Resource.String.FileHandling_prefs_key))).RemovePreference(cachingPreference); } catch (Exception ex) {