From 3218d2f90769c39028f1070fb2d0af6aac6cbbcf Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@googlemail.com>
Date: Fri, 12 Jul 2013 14:17:20 +0200
Subject: [PATCH] Improved editing of advanced fields, display and toggle
 protected fields like password

---
 src/keepass2android/EntryActivity.cs          |  42 +-
 src/keepass2android/EntryEditActivity.cs      |  72 +-
 .../Resources/Resource.designer.cs            | 978 +++++++++---------
 .../layout-v14/entry_edit_section.xml         |  35 -
 .../Resources/layout/entry_edit_section.xml   |  17 +-
 .../Resources/values/strings.xml              |   9 +-
 src/keepass2android/keepass2android.csproj    |   9 +-
 src/keepass2android/views/EntryEditSection.cs |  82 --
 8 files changed, 609 insertions(+), 635 deletions(-)
 delete mode 100644 src/keepass2android/Resources/layout-v14/entry_edit_section.xml
 delete mode 100644 src/keepass2android/views/EntryEditSection.cs

diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
index 41602145..fe7923ec 100644
--- a/src/keepass2android/EntryActivity.cs
+++ b/src/keepass2android/EntryActivity.cs
@@ -63,7 +63,8 @@ namespace keepass2android
 		private int _pos;
 
 		AppTask _appTask;
-		
+		private List<TextView> _protectedTextViews;
+
 
 		protected void SetEntryView() {
 			SetContentView(Resource.Layout.entry_view);
@@ -180,16 +181,15 @@ namespace keepass2android
 			}
 			bool hasExtraFields = false;
 			foreach (var view in from pair in Entry.Strings where !PwDefs.IsStandardField(pair.Key) orderby pair.Key 
-								 select CreateEditSection(pair.Key, pair.Value.ReadString()))
+								 select CreateEditSection(pair.Key, pair.Value.ReadString(), pair.Value.IsProtected))
 			{
-				//View view = new EntrySection(this, null, key, pair.Value.ReadString());
 				extraGroup.AddView(view);
 				hasExtraFields = true;
 			}
 			FindViewById(Resource.Id.entry_extra_strings_label).Visibility = hasExtraFields ? ViewStates.Visible : ViewStates.Gone;
 		}
 
-		View CreateEditSection(string key, string value)
+		View CreateEditSection(string key, string value, bool isProtected)
 		{
 			LinearLayout layout = new LinearLayout(this, null) {Orientation = Orientation.Vertical};
 			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
@@ -199,19 +199,27 @@ namespace keepass2android
 			TextView keyView = (TextView)viewInflated;
 			if (key != null)
 				keyView.Text = key;
-
+			
 			layout.AddView(keyView);
 			TextView valueView = (TextView)LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
 			if (value != null)
 				valueView.Text = value;
 			valueView.Typeface = Typeface.Monospace;
+			if (isProtected)
+				RegisterProtectedTextView(valueView);
+
 
 			if ((int)Build.VERSION.SdkInt >= 11)
 				valueView.SetTextIsSelectable(true);
 			layout.AddView(valueView);
 			return layout;
 		}
-		
+
+		private void RegisterProtectedTextView(TextView protectedTextView)
+		{
+			_protectedTextViews.Add(protectedTextView);
+		}
+
 		Android.Net.Uri WriteBinaryToFile(string key, bool writeToCacheDirectory)
 		{
 			ProtectedBinary pb = Entry.Binaries.Get(key);
@@ -365,6 +373,7 @@ namespace keepass2android
 
 		protected void FillData(bool trimList)
 		{
+			_protectedTextViews = new List<TextView>();
 			ImageView iv = (ImageView)FindViewById(Resource.Id.entry_icon);
 			if (iv != null)
 			{
@@ -388,7 +397,7 @@ namespace keepass2android
 			
 			PopulateText(Resource.Id.entry_url, Resource.Id.entry_url_label, Entry.Strings.ReadSafe(PwDefs.UrlField));
 			PopulateText(Resource.Id.entry_password, Resource.Id.entry_password_label, Entry.Strings.ReadSafe(PwDefs.PasswordField));
-			SetPasswordStyle();
+			RegisterProtectedTextView(FindViewById<TextView>(Resource.Id.entry_password));
 			
 			PopulateText(Resource.Id.entry_created, Resource.Id.entry_created_label, getDateTime(Entry.CreationTime));
 			PopulateText(Resource.Id.entry_modified, Resource.Id.entry_modified_label, getDateTime(Entry.LastModificationTime));
@@ -411,7 +420,7 @@ namespace keepass2android
 
 			PopulateBinaries(trimList);
 
-
+			SetPasswordStyle();
 		}
 		
 		private void PopulateText(int viewId, int headerViewId,int resId) {
@@ -498,12 +507,17 @@ namespace keepass2android
 		}
 		
 		private void SetPasswordStyle() {
-			TextView password = (TextView) FindViewById(Resource.Id.entry_password);
-			
-			if ( _showPassword ) {
-				password.TransformationMethod = null;
-			} else {
-				password.TransformationMethod = PasswordTransformationMethod.Instance;
+			foreach (TextView password in _protectedTextViews)
+			{
+
+				if (_showPassword)
+				{
+					password.TransformationMethod = null;
+				}
+				else
+				{
+					password.TransformationMethod = PasswordTransformationMethod.Instance;
+				}
 			}
 		}
 		protected override void OnResume()
diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index aeae3d8c..1acd7f8b 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -17,6 +17,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Android.App;
 using Android.Content;
 using Android.OS;
@@ -444,12 +445,9 @@ namespace keepass2android
 				
 				TextView valueView = (TextView)view.FindViewById(Resource.Id.value);
 				String value = valueView.Text;
-				
 
-				bool protect = true;
-				ProtectedString initialString = State.EntryInDatabase.Strings.Get(key);
-				if (initialString != null)
-					protect = initialString.IsProtected;
+
+				bool protect = ((CheckBox) view.FindViewById(Resource.Id.protection)).Checked;
 				entry.Strings.Set(key, new ProtectedString(protect, value));
 			}
 			
@@ -648,7 +646,7 @@ namespace keepass2android
 			ViewGroup binariesGroup = (ViewGroup)FindViewById(Resource.Id.binaries);
 			binariesGroup.RemoveAllViews();
 			RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
-			foreach (KeyValuePair<string, ProtectedBinary> pair in State.Entry.Binaries)
+			foreach (KeyValuePair<string, ProtectedBinary> pair in State.Entry.Binaries.OrderBy(p => p.Key) )
 			{
 				String key = pair.Key;
 				Button binaryButton = new Button(this) {Text = key};
@@ -790,10 +788,68 @@ namespace keepass2android
 			((TextView)ees.FindViewById(Resource.Id.title)).TextChanged += (sender, e) => State.EntryModified = true;
 			((TextView)ees.FindViewById(Resource.Id.value)).Text = pair.Value.ReadString();
 			((TextView)ees.FindViewById(Resource.Id.value)).TextChanged += (sender, e) => State.EntryModified = true;
-			ees.FindViewById(Resource.Id.delete).Click += (sender, e) => DeleteAdvancedString((View)sender);
+
+			((CheckBox)ees.FindViewById(Resource.Id.protection)).Checked = pair.Value.IsProtected;
+			
+			//ees.FindViewById(Resource.Id.edit_extra).Click += (sender, e) => DeleteAdvancedString((View)sender);
+			ees.FindViewById(Resource.Id.edit_extra).Click += (sender, e) => EditAdvancedString((View)sender);
 			return ees;
 		}
-		
+
+		private void EditAdvancedString(View sender)
+		{
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			View dlgView = LayoutInflater.Inflate(Resource.Layout.edit_extra_string_dialog, null);
+			builder.SetView(dlgView);
+			builder.SetNegativeButton(Android.Resource.String.Cancel, (o, args) => { });
+			builder.SetPositiveButton(Android.Resource.String.Ok, (o, args) =>
+				{
+					CopyFieldFromExtraDialog(sender, o, Resource.Id.title);
+					CopyFieldFromExtraDialog(sender, o, Resource.Id.value);
+					CopyCheckboxFromExtraDialog(sender, o, Resource.Id.protection);
+				});
+			Dialog dialog = builder.Create();
+
+			//setup delete button:
+			var deleteButton = dlgView.FindViewById<Button>(Resource.Id.delete_extra);
+			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Android.Resource.Drawable.IcMenuDelete), null, null, null);
+			deleteButton.Click += (o, args) =>
+				{
+					DeleteAdvancedString(sender);
+					dialog.Dismiss();
+				};
+			//copy values:
+			View ees = (View) sender.Parent;
+			dlgView.FindViewById<EditText>(Resource.Id.title).Text = ees.FindViewById<EditText>(Resource.Id.title).Text;
+			dlgView.FindViewById<EditText>(Resource.Id.value).Text = ees.FindViewById<EditText>(Resource.Id.value).Text;
+			dlgView.FindViewById<CheckBox>(Resource.Id.protection).Checked = ees.FindViewById<CheckBox>(Resource.Id.protection).Checked;
+			
+			dialog.Show();
+
+		}
+
+		private void CopyFieldFromExtraDialog(View eesButton, object dialog, int fieldId)
+		{
+			var sourceField = ((Dialog)dialog).FindViewById<EditText>(fieldId);
+			var targetField = ((TextView)((View)eesButton.Parent).FindViewById(fieldId));
+			if (sourceField.Text != targetField.Text)
+			{
+				targetField.Text = sourceField.Text;
+				State.EntryModified = true;
+			}	
+		}
+
+		private void CopyCheckboxFromExtraDialog(View eesButton, object dialog, int fieldId)
+		{
+			var sourceField = ((Dialog)dialog).FindViewById<CheckBox>(fieldId);
+			var targetField = ((CheckBox)((View)eesButton.Parent).FindViewById(fieldId));
+			if (sourceField.Checked != targetField.Checked)
+			{
+				targetField.Checked = sourceField.Checked;
+				State.EntryModified = true;
+			}
+		}
+
 		private void FillData() {
 			ImageButton currIconButton = (ImageButton) FindViewById(Resource.Id.icon_button);
 			App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(currIconButton, Resources, App.Kp2a.GetDb().KpDatabase, State.Entry.IconId, State.Entry.CustomIconUuid);
diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs
index 20a7831f..9b3b0fdb 100644
--- a/src/keepass2android/Resources/Resource.designer.cs
+++ b/src/keepass2android/Resources/Resource.designer.cs
@@ -558,26 +558,26 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d000a
 			public const int Credit = 2131558410;
 			
-			// aapt resource value: 0x7f0d0070
-			public const int IconGridView = 2131558512;
+			// aapt resource value: 0x7f0d0072
+			public const int IconGridView = 2131558514;
+			
+			// aapt resource value: 0x7f0d0082
+			public const int QuickUnlock_button = 2131558530;
+			
+			// aapt resource value: 0x7f0d0083
+			public const int QuickUnlock_buttonLock = 2131558531;
 			
 			// aapt resource value: 0x7f0d0080
-			public const int QuickUnlock_button = 2131558528;
+			public const int QuickUnlock_label = 2131558528;
 			
 			// aapt resource value: 0x7f0d0081
-			public const int QuickUnlock_buttonLock = 2131558529;
+			public const int QuickUnlock_password = 2131558529;
 			
-			// aapt resource value: 0x7f0d007e
-			public const int QuickUnlock_label = 2131558526;
+			// aapt resource value: 0x7f0d0056
+			public const int RelativeLayout = 2131558486;
 			
-			// aapt resource value: 0x7f0d007f
-			public const int QuickUnlock_password = 2131558527;
-			
-			// aapt resource value: 0x7f0d0054
-			public const int RelativeLayout = 2131558484;
-			
-			// aapt resource value: 0x7f0d0053
-			public const int ScrollView = 2131558483;
+			// aapt resource value: 0x7f0d0055
+			public const int ScrollView = 2131558485;
 			
 			// aapt resource value: 0x7f0d0009
 			public const int about_button = 2131558409;
@@ -585,128 +585,128 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d0000
 			public const int about_title = 2131558400;
 			
+			// aapt resource value: 0x7f0d0053
+			public const int accept_button = 2131558483;
+			
+			// aapt resource value: 0x7f0d0028
+			public const int add_advanced = 2131558440;
+			
+			// aapt resource value: 0x7f0d0069
+			public const int add_entry = 2131558505;
+			
+			// aapt resource value: 0x7f0d0068
+			public const int add_group = 2131558504;
+			
+			// aapt resource value: 0x7f0d0096
+			public const int add_url_entry = 2131558550;
+			
+			// aapt resource value: 0x7f0d0027
+			public const int advanced_container = 2131558439;
+			
+			// aapt resource value: 0x7f0d002a
+			public const int binaries = 2131558442;
+			
+			// aapt resource value: 0x7f0d0037
+			public const int bottom_bar = 2131558455;
+			
 			// aapt resource value: 0x7f0d0051
-			public const int accept_button = 2131558481;
+			public const int bottom_layout = 2131558481;
 			
-			// aapt resource value: 0x7f0d0024
-			public const int add_advanced = 2131558436;
-			
-			// aapt resource value: 0x7f0d0067
-			public const int add_entry = 2131558503;
-			
-			// aapt resource value: 0x7f0d0066
-			public const int add_group = 2131558502;
-			
-			// aapt resource value: 0x7f0d0094
-			public const int add_url_entry = 2131558548;
-			
-			// aapt resource value: 0x7f0d0023
-			public const int advanced_container = 2131558435;
-			
-			// aapt resource value: 0x7f0d0026
-			public const int binaries = 2131558438;
-			
-			// aapt resource value: 0x7f0d0035
-			public const int bottom_bar = 2131558453;
-			
-			// aapt resource value: 0x7f0d004f
-			public const int bottom_layout = 2131558479;
-			
-			// aapt resource value: 0x7f0d004a
-			public const int browse_button = 2131558474;
-			
-			// aapt resource value: 0x7f0d0059
-			public const int btn_length12 = 2131558489;
-			
-			// aapt resource value: 0x7f0d0058
-			public const int btn_length16 = 2131558488;
+			// aapt resource value: 0x7f0d004c
+			public const int browse_button = 2131558476;
 			
 			// aapt resource value: 0x7f0d005b
-			public const int btn_length6 = 2131558491;
+			public const int btn_length12 = 2131558491;
 			
 			// aapt resource value: 0x7f0d005a
-			public const int btn_length8 = 2131558490;
+			public const int btn_length16 = 2131558490;
+			
+			// aapt resource value: 0x7f0d005d
+			public const int btn_length6 = 2131558493;
+			
+			// aapt resource value: 0x7f0d005c
+			public const int btn_length8 = 2131558492;
 			
 			// aapt resource value: 0x7f0d000e
 			public const int cancel = 2131558414;
 			
-			// aapt resource value: 0x7f0d0052
-			public const int cancel_button = 2131558482;
+			// aapt resource value: 0x7f0d0054
+			public const int cancel_button = 2131558484;
 			
-			// aapt resource value: 0x7f0d0091
-			public const int cbCaseSensitive = 2131558545;
+			// aapt resource value: 0x7f0d0093
+			public const int cbCaseSensitive = 2131558547;
 			
-			// aapt resource value: 0x7f0d0092
-			public const int cbExcludeExpiredEntries = 2131558546;
-			
-			// aapt resource value: 0x7f0d0087
-			public const int cbRegEx = 2131558535;
-			
-			// aapt resource value: 0x7f0d0090
-			public const int cbSearchInGroupName = 2131558544;
-			
-			// aapt resource value: 0x7f0d008d
-			public const int cbSearchInNotes = 2131558541;
-			
-			// aapt resource value: 0x7f0d008e
-			public const int cbSearchInOtherStrings = 2131558542;
-			
-			// aapt resource value: 0x7f0d008c
-			public const int cbSearchInPassword = 2131558540;
-			
-			// aapt resource value: 0x7f0d008f
-			public const int cbSearchInTags = 2131558543;
+			// aapt resource value: 0x7f0d0094
+			public const int cbExcludeExpiredEntries = 2131558548;
 			
 			// aapt resource value: 0x7f0d0089
-			public const int cbSearchInTitle = 2131558537;
+			public const int cbRegEx = 2131558537;
 			
-			// aapt resource value: 0x7f0d008a
-			public const int cbSearchInUrl = 2131558538;
+			// aapt resource value: 0x7f0d0092
+			public const int cbSearchInGroupName = 2131558546;
+			
+			// aapt resource value: 0x7f0d008f
+			public const int cbSearchInNotes = 2131558543;
+			
+			// aapt resource value: 0x7f0d0090
+			public const int cbSearchInOtherStrings = 2131558544;
+			
+			// aapt resource value: 0x7f0d008e
+			public const int cbSearchInPassword = 2131558542;
+			
+			// aapt resource value: 0x7f0d0091
+			public const int cbSearchInTags = 2131558545;
 			
 			// aapt resource value: 0x7f0d008b
-			public const int cbSearchInUsername = 2131558539;
+			public const int cbSearchInTitle = 2131558539;
 			
-			// aapt resource value: 0x7f0d0064
-			public const int cb_brackets = 2131558500;
+			// aapt resource value: 0x7f0d008c
+			public const int cbSearchInUrl = 2131558540;
 			
-			// aapt resource value: 0x7f0d005f
-			public const int cb_digits = 2131558495;
+			// aapt resource value: 0x7f0d008d
+			public const int cbSearchInUsername = 2131558541;
 			
-			// aapt resource value: 0x7f0d005e
-			public const int cb_lowercase = 2131558494;
-			
-			// aapt resource value: 0x7f0d0060
-			public const int cb_minus = 2131558496;
-			
-			// aapt resource value: 0x7f0d0062
-			public const int cb_space = 2131558498;
-			
-			// aapt resource value: 0x7f0d0063
-			public const int cb_specials = 2131558499;
+			// aapt resource value: 0x7f0d0066
+			public const int cb_brackets = 2131558502;
 			
 			// aapt resource value: 0x7f0d0061
-			public const int cb_underline = 2131558497;
+			public const int cb_digits = 2131558497;
 			
-			// aapt resource value: 0x7f0d005d
-			public const int cb_uppercase = 2131558493;
+			// aapt resource value: 0x7f0d0060
+			public const int cb_lowercase = 2131558496;
 			
-			// aapt resource value: 0x7f0d004d
-			public const int create = 2131558477;
+			// aapt resource value: 0x7f0d0062
+			public const int cb_minus = 2131558498;
 			
-			// aapt resource value: 0x7f0d009a
-			public const int cred_password = 2131558554;
+			// aapt resource value: 0x7f0d0064
+			public const int cb_space = 2131558500;
+			
+			// aapt resource value: 0x7f0d0065
+			public const int cb_specials = 2131558501;
+			
+			// aapt resource value: 0x7f0d0063
+			public const int cb_underline = 2131558499;
+			
+			// aapt resource value: 0x7f0d005f
+			public const int cb_uppercase = 2131558495;
+			
+			// aapt resource value: 0x7f0d004f
+			public const int create = 2131558479;
+			
+			// aapt resource value: 0x7f0d009c
+			public const int cred_password = 2131558556;
+			
+			// aapt resource value: 0x7f0d009d
+			public const int cred_remember_mode = 2131558557;
 			
 			// aapt resource value: 0x7f0d009b
-			public const int cred_remember_mode = 2131558555;
+			public const int cred_username = 2131558555;
 			
-			// aapt resource value: 0x7f0d0099
-			public const int cred_username = 2131558553;
+			// aapt resource value: 0x7f0d007b
+			public const int default_database = 2131558523;
 			
-			// aapt resource value: 0x7f0d0079
-			public const int default_database = 2131558521;
-			
-			// aapt resource value: 0x7f0d0030
-			public const int delete = 2131558448;
+			// aapt resource value: 0x7f0d0014
+			public const int delete_extra = 2131558420;
 			
 			// aapt resource value: 0x7f0d0008
 			public const int disclaimer = 2131558408;
@@ -720,185 +720,188 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d0007
 			public const int divider3 = 2131558407;
 			
-			// aapt resource value: 0x7f0d007a
-			public const int enable_quickunlock = 2131558522;
+			// aapt resource value: 0x7f0d0032
+			public const int edit_extra = 2131558450;
 			
-			// aapt resource value: 0x7f0d0041
-			public const int entry_accessed = 2131558465;
+			// aapt resource value: 0x7f0d007c
+			public const int enable_quickunlock = 2131558524;
 			
-			// aapt resource value: 0x7f0d0040
-			public const int entry_accessed_label = 2131558464;
+			// aapt resource value: 0x7f0d0043
+			public const int entry_accessed = 2131558467;
 			
-			// aapt resource value: 0x7f0d0025
-			public const int entry_binaries_label = 2131558437;
-			
-			// aapt resource value: 0x7f0d0021
-			public const int entry_comment = 2131558433;
-			
-			// aapt resource value: 0x7f0d0020
-			public const int entry_comment_label = 2131558432;
-			
-			// aapt resource value: 0x7f0d001f
-			public const int entry_confpassword = 2131558431;
-			
-			// aapt resource value: 0x7f0d001e
-			public const int entry_confpassword_label = 2131558430;
-			
-			// aapt resource value: 0x7f0d0038
-			public const int entry_contents = 2131558456;
-			
-			// aapt resource value: 0x7f0d003d
-			public const int entry_created = 2131558461;
-			
-			// aapt resource value: 0x7f0d003c
-			public const int entry_created_label = 2131558460;
-			
-			// aapt resource value: 0x7f0d0037
-			public const int entry_divider2 = 2131558455;
-			
-			// aapt resource value: 0x7f0d0036
-			public const int entry_edit = 2131558454;
-			
-			// aapt resource value: 0x7f0d002d
-			public const int entry_expires = 2131558445;
-			
-			// aapt resource value: 0x7f0d002c
-			public const int entry_expires_checkbox = 2131558444;
-			
-			// aapt resource value: 0x7f0d002b
-			public const int entry_expires_label = 2131558443;
-			
-			// aapt resource value: 0x7f0d0022
-			public const int entry_extra_strings_label = 2131558434;
-			
-			// aapt resource value: 0x7f0d0031
-			public const int entry_icon = 2131558449;
-			
-			// aapt resource value: 0x7f0d003f
-			public const int entry_modified = 2131558463;
-			
-			// aapt resource value: 0x7f0d003e
-			public const int entry_modified_label = 2131558462;
-			
-			// aapt resource value: 0x7f0d002a
-			public const int entry_override_url = 2131558442;
+			// aapt resource value: 0x7f0d0042
+			public const int entry_accessed_label = 2131558466;
 			
 			// aapt resource value: 0x7f0d0029
-			public const int entry_override_url_label = 2131558441;
+			public const int entry_binaries_label = 2131558441;
 			
-			// aapt resource value: 0x7f0d001d
-			public const int entry_password = 2131558429;
+			// aapt resource value: 0x7f0d0025
+			public const int entry_comment = 2131558437;
 			
-			// aapt resource value: 0x7f0d001b
-			public const int entry_password_label = 2131558427;
+			// aapt resource value: 0x7f0d0024
+			public const int entry_comment_label = 2131558436;
 			
-			// aapt resource value: 0x7f0d0012
-			public const int entry_save = 2131558418;
+			// aapt resource value: 0x7f0d0023
+			public const int entry_confpassword = 2131558435;
 			
-			// aapt resource value: 0x7f0d0011
-			public const int entry_save_header = 2131558417;
-			
-			// aapt resource value: 0x7f0d0013
-			public const int entry_scroll = 2131558419;
+			// aapt resource value: 0x7f0d0022
+			public const int entry_confpassword_label = 2131558434;
 			
 			// aapt resource value: 0x7f0d003a
-			public const int entry_table = 2131558458;
+			public const int entry_contents = 2131558458;
 			
-			// aapt resource value: 0x7f0d0028
-			public const int entry_tags = 2131558440;
+			// aapt resource value: 0x7f0d003f
+			public const int entry_created = 2131558463;
 			
-			// aapt resource value: 0x7f0d0027
-			public const int entry_tags_label = 2131558439;
+			// aapt resource value: 0x7f0d003e
+			public const int entry_created_label = 2131558462;
 			
-			// aapt resource value: 0x7f0d0032
-			public const int entry_text = 2131558450;
+			// aapt resource value: 0x7f0d0039
+			public const int entry_divider2 = 2131558457;
+			
+			// aapt resource value: 0x7f0d0038
+			public const int entry_edit = 2131558456;
+			
+			// aapt resource value: 0x7f0d0031
+			public const int entry_expires = 2131558449;
+			
+			// aapt resource value: 0x7f0d0030
+			public const int entry_expires_checkbox = 2131558448;
+			
+			// aapt resource value: 0x7f0d002f
+			public const int entry_expires_label = 2131558447;
+			
+			// aapt resource value: 0x7f0d0026
+			public const int entry_extra_strings_label = 2131558438;
 			
 			// aapt resource value: 0x7f0d0033
-			public const int entry_text_detail = 2131558451;
+			public const int entry_icon = 2131558451;
+			
+			// aapt resource value: 0x7f0d0041
+			public const int entry_modified = 2131558465;
+			
+			// aapt resource value: 0x7f0d0040
+			public const int entry_modified_label = 2131558464;
+			
+			// aapt resource value: 0x7f0d002e
+			public const int entry_override_url = 2131558446;
+			
+			// aapt resource value: 0x7f0d002d
+			public const int entry_override_url_label = 2131558445;
+			
+			// aapt resource value: 0x7f0d0021
+			public const int entry_password = 2131558433;
+			
+			// aapt resource value: 0x7f0d001f
+			public const int entry_password_label = 2131558431;
 			
 			// aapt resource value: 0x7f0d0016
-			public const int entry_title = 2131558422;
+			public const int entry_save = 2131558422;
 			
-			// aapt resource value: 0x7f0d0014
-			public const int entry_title_label = 2131558420;
-			
-			// aapt resource value: 0x7f0d001a
-			public const int entry_url = 2131558426;
-			
-			// aapt resource value: 0x7f0d0019
-			public const int entry_url_label = 2131558425;
-			
-			// aapt resource value: 0x7f0d0018
-			public const int entry_user_name = 2131558424;
+			// aapt resource value: 0x7f0d0015
+			public const int entry_save_header = 2131558421;
 			
 			// aapt resource value: 0x7f0d0017
-			public const int entry_user_name_label = 2131558423;
+			public const int entry_scroll = 2131558423;
 			
-			// aapt resource value: 0x7f0d003b
-			public const int extra_strings = 2131558459;
+			// aapt resource value: 0x7f0d003c
+			public const int entry_table = 2131558460;
+			
+			// aapt resource value: 0x7f0d002c
+			public const int entry_tags = 2131558444;
+			
+			// aapt resource value: 0x7f0d002b
+			public const int entry_tags_label = 2131558443;
+			
+			// aapt resource value: 0x7f0d0034
+			public const int entry_text = 2131558452;
+			
+			// aapt resource value: 0x7f0d0035
+			public const int entry_text_detail = 2131558453;
+			
+			// aapt resource value: 0x7f0d001a
+			public const int entry_title = 2131558426;
+			
+			// aapt resource value: 0x7f0d0018
+			public const int entry_title_label = 2131558424;
+			
+			// aapt resource value: 0x7f0d001e
+			public const int entry_url = 2131558430;
+			
+			// aapt resource value: 0x7f0d001d
+			public const int entry_url_label = 2131558429;
+			
+			// aapt resource value: 0x7f0d001c
+			public const int entry_user_name = 2131558428;
+			
+			// aapt resource value: 0x7f0d001b
+			public const int entry_user_name_label = 2131558427;
+			
+			// aapt resource value: 0x7f0d003d
+			public const int extra_strings = 2131558461;
 			
 			// aapt resource value: 0x7f0d0006
 			public const int feedback = 2131558406;
 			
-			// aapt resource value: 0x7f0d0042
-			public const int file_filename = 2131558466;
+			// aapt resource value: 0x7f0d0044
+			public const int file_filename = 2131558468;
 			
-			// aapt resource value: 0x7f0d0043
-			public const int file_listtop = 2131558467;
+			// aapt resource value: 0x7f0d0045
+			public const int file_listtop = 2131558469;
 			
-			// aapt resource value: 0x7f0d0050
-			public const int file_select = 2131558480;
+			// aapt resource value: 0x7f0d0052
+			public const int file_select = 2131558482;
+			
+			// aapt resource value: 0x7f0d0076
+			public const int filename = 2131558518;
+			
+			// aapt resource value: 0x7f0d004a
+			public const int filename_form = 2131558474;
 			
 			// aapt resource value: 0x7f0d0074
-			public const int filename = 2131558516;
+			public const int filename_label = 2131558516;
 			
-			// aapt resource value: 0x7f0d0048
-			public const int filename_form = 2131558472;
+			// aapt resource value: 0x7f0d0075
+			public const int filenamescroll = 2131558517;
 			
-			// aapt resource value: 0x7f0d0072
-			public const int filename_label = 2131558514;
+			// aapt resource value: 0x7f0d0050
+			public const int fnv_cancel = 2131558480;
 			
-			// aapt resource value: 0x7f0d0073
-			public const int filenamescroll = 2131558515;
+			// aapt resource value: 0x7f0d0020
+			public const int generate_button = 2131558432;
 			
-			// aapt resource value: 0x7f0d004e
-			public const int fnv_cancel = 2131558478;
+			// aapt resource value: 0x7f0d0058
+			public const int generate_password_button = 2131558488;
 			
-			// aapt resource value: 0x7f0d001c
-			public const int generate_button = 2131558428;
-			
-			// aapt resource value: 0x7f0d0056
-			public const int generate_password_button = 2131558486;
-			
-			// aapt resource value: 0x7f0d0065
-			public const int group_header = 2131558501;
-			
-			// aapt resource value: 0x7f0d006b
-			public const int group_icon = 2131558507;
+			// aapt resource value: 0x7f0d0067
+			public const int group_header = 2131558503;
 			
 			// aapt resource value: 0x7f0d006d
-			public const int group_label = 2131558509;
+			public const int group_icon = 2131558509;
 			
-			// aapt resource value: 0x7f0d0068
-			public const int group_name = 2131558504;
+			// aapt resource value: 0x7f0d006f
+			public const int group_label = 2131558511;
 			
-			// aapt resource value: 0x7f0d006c
-			public const int group_text = 2131558508;
+			// aapt resource value: 0x7f0d006a
+			public const int group_name = 2131558506;
+			
+			// aapt resource value: 0x7f0d006e
+			public const int group_text = 2131558510;
 			
 			// aapt resource value: 0x7f0d0005
 			public const int homepage = 2131558405;
 			
-			// aapt resource value: 0x7f0d006a
-			public const int icon = 2131558506;
+			// aapt resource value: 0x7f0d006c
+			public const int icon = 2131558508;
 			
-			// aapt resource value: 0x7f0d0015
-			public const int icon_button = 2131558421;
+			// aapt resource value: 0x7f0d0019
+			public const int icon_button = 2131558425;
 			
-			// aapt resource value: 0x7f0d006e
-			public const int icon_image = 2131558510;
+			// aapt resource value: 0x7f0d0070
+			public const int icon_image = 2131558512;
 			
-			// aapt resource value: 0x7f0d006f
-			public const int icon_text = 2131558511;
+			// aapt resource value: 0x7f0d0071
+			public const int icon_text = 2131558513;
 			
 			// aapt resource value: 0x7f0d000c
 			public const int install_market = 2131558412;
@@ -906,104 +909,107 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d000d
 			public const int install_web = 2131558413;
 			
-			// aapt resource value: 0x7f0d0071
-			public const int keyboard = 2131558513;
+			// aapt resource value: 0x7f0d0073
+			public const int keyboard = 2131558515;
 			
-			// aapt resource value: 0x7f0d007c
-			public const int keyfileLine = 2131558524;
-			
-			// aapt resource value: 0x7f0d0049
-			public const int label_open_by_filename = 2131558473;
+			// aapt resource value: 0x7f0d007e
+			public const int keyfileLine = 2131558526;
 			
 			// aapt resource value: 0x7f0d004b
-			public const int label_open_by_filename_details = 2131558475;
+			public const int label_open_by_filename = 2131558475;
 			
-			// aapt resource value: 0x7f0d0044
-			public const int label_warning = 2131558468;
+			// aapt resource value: 0x7f0d004d
+			public const int label_open_by_filename_details = 2131558477;
 			
-			// aapt resource value: 0x7f0d005c
-			public const int length = 2131558492;
+			// aapt resource value: 0x7f0d0046
+			public const int label_warning = 2131558470;
 			
-			// aapt resource value: 0x7f0d0057
-			public const int length_label = 2131558487;
+			// aapt resource value: 0x7f0d005e
+			public const int length = 2131558494;
 			
-			// aapt resource value: 0x7f0d0086
-			public const int linearLayout1 = 2131558534;
+			// aapt resource value: 0x7f0d0059
+			public const int length_label = 2131558489;
 			
-			// aapt resource value: 0x7f0d00a5
-			public const int menu_about = 2131558565;
-			
-			// aapt resource value: 0x7f0d00a4
-			public const int menu_app_settings = 2131558564;
-			
-			// aapt resource value: 0x7f0d00a3
-			public const int menu_cancel_edit = 2131558563;
-			
-			// aapt resource value: 0x7f0d00a8
-			public const int menu_change_master_key = 2131558568;
-			
-			// aapt resource value: 0x7f0d009c
-			public const int menu_donate = 2131558556;
-			
-			// aapt resource value: 0x7f0d009e
-			public const int menu_goto_url = 2131558558;
-			
-			// aapt resource value: 0x7f0d009f
-			public const int menu_lock = 2131558559;
-			
-			// aapt resource value: 0x7f0d00a1
-			public const int menu_rate = 2131558561;
-			
-			// aapt resource value: 0x7f0d00a6
-			public const int menu_search = 2131558566;
+			// aapt resource value: 0x7f0d0088
+			public const int linearLayout1 = 2131558536;
 			
 			// aapt resource value: 0x7f0d00a7
-			public const int menu_search_advanced = 2131558567;
+			public const int menu_about = 2131558567;
 			
-			// aapt resource value: 0x7f0d00a9
-			public const int menu_sort = 2131558569;
+			// aapt resource value: 0x7f0d00a6
+			public const int menu_app_settings = 2131558566;
+			
+			// aapt resource value: 0x7f0d00a5
+			public const int menu_cancel_edit = 2131558565;
+			
+			// aapt resource value: 0x7f0d00aa
+			public const int menu_change_master_key = 2131558570;
+			
+			// aapt resource value: 0x7f0d009e
+			public const int menu_donate = 2131558558;
 			
 			// aapt resource value: 0x7f0d00a0
-			public const int menu_suggest_improvements = 2131558560;
+			public const int menu_goto_url = 2131558560;
 			
-			// aapt resource value: 0x7f0d009d
-			public const int menu_toggle_pass = 2131558557;
+			// aapt resource value: 0x7f0d00a1
+			public const int menu_lock = 2131558561;
+			
+			// aapt resource value: 0x7f0d00a3
+			public const int menu_rate = 2131558563;
+			
+			// aapt resource value: 0x7f0d00a8
+			public const int menu_search = 2131558568;
+			
+			// aapt resource value: 0x7f0d00a9
+			public const int menu_search_advanced = 2131558569;
+			
+			// aapt resource value: 0x7f0d00ab
+			public const int menu_sort = 2131558571;
 			
 			// aapt resource value: 0x7f0d00a2
-			public const int menu_translate = 2131558562;
+			public const int menu_suggest_improvements = 2131558562;
 			
-			// aapt resource value: 0x7f0d0095
-			public const int no_results = 2131558549;
+			// aapt resource value: 0x7f0d009f
+			public const int menu_toggle_pass = 2131558559;
 			
-			// aapt resource value: 0x7f0d0069
-			public const int ok = 2131558505;
-			
-			// aapt resource value: 0x7f0d004c
-			public const int open = 2131558476;
+			// aapt resource value: 0x7f0d00a4
+			public const int menu_translate = 2131558564;
 			
 			// aapt resource value: 0x7f0d0097
-			public const int pass_conf_password = 2131558551;
+			public const int no_results = 2131558551;
 			
-			// aapt resource value: 0x7f0d0077
-			public const int pass_keyfile = 2131558519;
+			// aapt resource value: 0x7f0d006b
+			public const int ok = 2131558507;
 			
-			// aapt resource value: 0x7f0d0078
-			public const int pass_ok = 2131558520;
+			// aapt resource value: 0x7f0d004e
+			public const int open = 2131558478;
 			
-			// aapt resource value: 0x7f0d0096
-			public const int pass_password = 2131558550;
+			// aapt resource value: 0x7f0d0099
+			public const int pass_conf_password = 2131558553;
 			
-			// aapt resource value: 0x7f0d0055
-			public const int password = 2131558485;
+			// aapt resource value: 0x7f0d0079
+			public const int pass_keyfile = 2131558521;
 			
-			// aapt resource value: 0x7f0d007b
-			public const int passwordLine = 2131558523;
+			// aapt resource value: 0x7f0d007a
+			public const int pass_ok = 2131558522;
 			
-			// aapt resource value: 0x7f0d0075
-			public const int password_label = 2131558517;
+			// aapt resource value: 0x7f0d0098
+			public const int pass_password = 2131558552;
+			
+			// aapt resource value: 0x7f0d0057
+			public const int password = 2131558487;
 			
 			// aapt resource value: 0x7f0d007d
-			public const int qu_filename = 2131558525;
+			public const int passwordLine = 2131558525;
+			
+			// aapt resource value: 0x7f0d0077
+			public const int password_label = 2131558519;
+			
+			// aapt resource value: 0x7f0d0013
+			public const int protection = 2131558419;
+			
+			// aapt resource value: 0x7f0d007f
+			public const int qu_filename = 2131558527;
 			
 			// aapt resource value: 0x7f0d000f
 			public const int rounds = 2131558415;
@@ -1011,53 +1017,53 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d0010
 			public const int rounds_explaination = 2131558416;
 			
+			// aapt resource value: 0x7f0d0087
+			public const int scrollView1 = 2131558535;
+			
+			// aapt resource value: 0x7f0d0086
+			public const int searchEditText = 2131558534;
+			
 			// aapt resource value: 0x7f0d0085
-			public const int scrollView1 = 2131558533;
+			public const int search_button = 2131558533;
+			
+			// aapt resource value: 0x7f0d008a
+			public const int search_in_label = 2131558538;
 			
 			// aapt resource value: 0x7f0d0084
-			public const int searchEditText = 2131558532;
+			public const int search_label = 2131558532;
 			
-			// aapt resource value: 0x7f0d0083
-			public const int search_button = 2131558531;
+			// aapt resource value: 0x7f0d0095
+			public const int select_other_entry = 2131558549;
 			
-			// aapt resource value: 0x7f0d0088
-			public const int search_in_label = 2131558536;
+			// aapt resource value: 0x7f0d0049
+			public const int start_create = 2131558473;
 			
-			// aapt resource value: 0x7f0d0082
-			public const int search_label = 2131558530;
-			
-			// aapt resource value: 0x7f0d0093
-			public const int select_other_entry = 2131558547;
+			// aapt resource value: 0x7f0d009a
+			public const int start_create_import = 2131558554;
 			
 			// aapt resource value: 0x7f0d0047
-			public const int start_create = 2131558471;
+			public const int start_open_file = 2131558471;
 			
-			// aapt resource value: 0x7f0d0098
-			public const int start_create_import = 2131558552;
-			
-			// aapt resource value: 0x7f0d0045
-			public const int start_open_file = 2131558469;
-			
-			// aapt resource value: 0x7f0d0046
-			public const int start_open_url = 2131558470;
+			// aapt resource value: 0x7f0d0048
+			public const int start_open_url = 2131558472;
 			
 			// aapt resource value: 0x7f0d000b
 			public const int text = 2131558411;
 			
-			// aapt resource value: 0x7f0d002e
-			public const int title = 2131558446;
+			// aapt resource value: 0x7f0d0011
+			public const int title = 2131558417;
 			
-			// aapt resource value: 0x7f0d0034
-			public const int title_block = 2131558452;
+			// aapt resource value: 0x7f0d0036
+			public const int title_block = 2131558454;
 			
-			// aapt resource value: 0x7f0d0076
-			public const int toggle_password = 2131558518;
+			// aapt resource value: 0x7f0d0078
+			public const int toggle_password = 2131558520;
 			
-			// aapt resource value: 0x7f0d0039
-			public const int top = 2131558457;
+			// aapt resource value: 0x7f0d003b
+			public const int top = 2131558459;
 			
-			// aapt resource value: 0x7f0d002f
-			public const int value = 2131558447;
+			// aapt resource value: 0x7f0d0012
+			public const int value = 2131558418;
 			
 			// aapt resource value: 0x7f0d0003
 			public const int version = 2131558403;
@@ -1088,106 +1094,109 @@ namespace keepass2android
 			public const int database_settings = 2130903042;
 			
 			// aapt resource value: 0x7f030003
-			public const int entry_edit = 2130903043;
+			public const int edit_extra_string_dialog = 2130903043;
 			
 			// aapt resource value: 0x7f030004
-			public const int entry_edit_section = 2130903044;
+			public const int entry_edit = 2130903044;
 			
 			// aapt resource value: 0x7f030005
-			public const int entry_extrastring_title = 2130903045;
+			public const int entry_edit_section = 2130903045;
 			
 			// aapt resource value: 0x7f030006
-			public const int entry_extrastring_value = 2130903046;
+			public const int entry_extrastring_title = 2130903046;
 			
 			// aapt resource value: 0x7f030007
-			public const int entry_list_entry = 2130903047;
+			public const int entry_extrastring_value = 2130903047;
 			
 			// aapt resource value: 0x7f030008
-			public const int entry_section = 2130903048;
+			public const int entry_list_entry = 2130903048;
 			
 			// aapt resource value: 0x7f030009
-			public const int entry_view = 2130903049;
+			public const int entry_section = 2130903049;
 			
 			// aapt resource value: 0x7f03000a
-			public const int entry_view_contents = 2130903050;
+			public const int entry_view = 2130903050;
 			
 			// aapt resource value: 0x7f03000b
-			public const int entry_view_test = 2130903051;
+			public const int entry_view_contents = 2130903051;
 			
 			// aapt resource value: 0x7f03000c
-			public const int file_row = 2130903052;
+			public const int entry_view_test = 2130903052;
 			
 			// aapt resource value: 0x7f03000d
-			public const int file_selection = 2130903053;
+			public const int file_row = 2130903053;
 			
 			// aapt resource value: 0x7f03000e
-			public const int file_selection_buttons = 2130903054;
+			public const int file_selection = 2130903054;
 			
 			// aapt resource value: 0x7f03000f
-			public const int file_selection_filename = 2130903055;
+			public const int file_selection_buttons = 2130903055;
 			
 			// aapt resource value: 0x7f030010
-			public const int file_selection_no_recent = 2130903056;
+			public const int file_selection_filename = 2130903056;
 			
 			// aapt resource value: 0x7f030011
-			public const int generate_password = 2130903057;
+			public const int file_selection_no_recent = 2130903057;
 			
 			// aapt resource value: 0x7f030012
-			public const int group_add_entry = 2130903058;
+			public const int generate_password = 2130903058;
 			
 			// aapt resource value: 0x7f030013
-			public const int group_edit = 2130903059;
+			public const int group_add_entry = 2130903059;
 			
 			// aapt resource value: 0x7f030014
-			public const int group_empty = 2130903060;
+			public const int group_edit = 2130903060;
 			
 			// aapt resource value: 0x7f030015
-			public const int group_header = 2130903061;
+			public const int group_empty = 2130903061;
 			
 			// aapt resource value: 0x7f030016
-			public const int group_list_entry = 2130903062;
+			public const int group_header = 2130903062;
 			
 			// aapt resource value: 0x7f030017
-			public const int icon = 2130903063;
+			public const int group_list_entry = 2130903063;
 			
 			// aapt resource value: 0x7f030018
-			public const int icon_picker = 2130903064;
+			public const int icon = 2130903064;
 			
 			// aapt resource value: 0x7f030019
-			public const int input = 2130903065;
+			public const int icon_picker = 2130903065;
 			
 			// aapt resource value: 0x7f03001a
-			public const int InViewButton = 2130903066;
+			public const int input = 2130903066;
 			
 			// aapt resource value: 0x7f03001b
-			public const int password = 2130903067;
+			public const int InViewButton = 2130903067;
 			
 			// aapt resource value: 0x7f03001c
-			public const int QuickUnlock = 2130903068;
+			public const int password = 2130903068;
 			
 			// aapt resource value: 0x7f03001d
-			public const int QuickUnlock_Unused = 2130903069;
+			public const int QuickUnlock = 2130903069;
 			
 			// aapt resource value: 0x7f03001e
-			public const int SaveButton = 2130903070;
+			public const int QuickUnlock_Unused = 2130903070;
 			
 			// aapt resource value: 0x7f03001f
-			public const int search = 2130903071;
+			public const int SaveButton = 2130903071;
 			
 			// aapt resource value: 0x7f030020
-			public const int searchurlresults = 2130903072;
+			public const int search = 2130903072;
 			
 			// aapt resource value: 0x7f030021
-			public const int searchurlresults_empty = 2130903073;
+			public const int searchurlresults = 2130903073;
 			
 			// aapt resource value: 0x7f030022
-			public const int set_password = 2130903074;
+			public const int searchurlresults_empty = 2130903074;
 			
 			// aapt resource value: 0x7f030023
-			public const int StartScreenButtons = 2130903075;
+			public const int set_password = 2130903075;
 			
 			// aapt resource value: 0x7f030024
-			public const int url_credentials = 2130903076;
+			public const int StartScreenButtons = 2130903076;
+			
+			// aapt resource value: 0x7f030025
+			public const int url_credentials = 2130903077;
 			
 			static Layout()
 			{
@@ -1233,47 +1242,47 @@ namespace keepass2android
 			// aapt resource value: 0x7f080034
 			public const int AboutText = 2131230772;
 			
-			// aapt resource value: 0x7f080122
-			public const int AddingEntry = 2131231010;
-			
 			// aapt resource value: 0x7f080123
-			public const int AddingGroup = 2131231011;
+			public const int AddingEntry = 2131231011;
 			
-			// aapt resource value: 0x7f080118
-			public const int AskDeletePermanentlyEntry = 2131231000;
+			// aapt resource value: 0x7f080124
+			public const int AddingGroup = 2131231012;
 			
 			// aapt resource value: 0x7f080119
-			public const int AskDeletePermanentlyGroup = 2131231001;
+			public const int AskDeletePermanentlyEntry = 2131231001;
 			
 			// aapt resource value: 0x7f08011a
-			public const int AskDeletePermanently_title = 2131231002;
-			
-			// aapt resource value: 0x7f08011d
-			public const int AskDiscardChanges = 2131231005;
-			
-			// aapt resource value: 0x7f08011e
-			public const int AskDiscardChanges_title = 2131231006;
-			
-			// aapt resource value: 0x7f080112
-			public const int AskOverwriteBinary = 2131230994;
-			
-			// aapt resource value: 0x7f080115
-			public const int AskOverwriteBinary_no = 2131230997;
-			
-			// aapt resource value: 0x7f080113
-			public const int AskOverwriteBinary_title = 2131230995;
-			
-			// aapt resource value: 0x7f080114
-			public const int AskOverwriteBinary_yes = 2131230996;
-			
-			// aapt resource value: 0x7f08011c
-			public const int AskReloadFile = 2131231004;
+			public const int AskDeletePermanentlyGroup = 2131231002;
 			
 			// aapt resource value: 0x7f08011b
-			public const int AskReloadFile_title = 2131231003;
+			public const int AskDeletePermanently_title = 2131231003;
+			
+			// aapt resource value: 0x7f08011e
+			public const int AskDiscardChanges = 2131231006;
+			
+			// aapt resource value: 0x7f08011f
+			public const int AskDiscardChanges_title = 2131231007;
+			
+			// aapt resource value: 0x7f080113
+			public const int AskOverwriteBinary = 2131230995;
 			
 			// aapt resource value: 0x7f080116
-			public const int AttachFailed = 2131230998;
+			public const int AskOverwriteBinary_no = 2131230998;
+			
+			// aapt resource value: 0x7f080114
+			public const int AskOverwriteBinary_title = 2131230996;
+			
+			// aapt resource value: 0x7f080115
+			public const int AskOverwriteBinary_yes = 2131230997;
+			
+			// aapt resource value: 0x7f08011d
+			public const int AskReloadFile = 2131231005;
+			
+			// aapt resource value: 0x7f08011c
+			public const int AskReloadFile_title = 2131231004;
+			
+			// aapt resource value: 0x7f080117
+			public const int AttachFailed = 2131230999;
 			
 			// aapt resource value: 0x7f080022
 			public const int BinaryDirectory_default = 2131230754;
@@ -1287,44 +1296,44 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800f7
 			public const int BinaryDirectory_title = 2131230967;
 			
+			// aapt resource value: 0x7f080138
+			public const int ChangeLog = 2131231032;
+			
 			// aapt resource value: 0x7f080137
-			public const int ChangeLog = 2131231031;
-			
-			// aapt resource value: 0x7f080136
-			public const int ChangeLog_0_7 = 2131231030;
-			
-			// aapt resource value: 0x7f080134
-			public const int ChangeLog_0_8 = 2131231028;
-			
-			// aapt resource value: 0x7f080133
-			public const int ChangeLog_0_8_1 = 2131231027;
-			
-			// aapt resource value: 0x7f080132
-			public const int ChangeLog_0_8_2 = 2131231026;
-			
-			// aapt resource value: 0x7f080131
-			public const int ChangeLog_0_8_3 = 2131231025;
-			
-			// aapt resource value: 0x7f080130
-			public const int ChangeLog_0_8_4 = 2131231024;
+			public const int ChangeLog_0_7 = 2131231031;
 			
 			// aapt resource value: 0x7f080135
-			public const int ChangeLog_keptDonate = 2131231029;
+			public const int ChangeLog_0_8 = 2131231029;
 			
-			// aapt resource value: 0x7f08012f
-			public const int ChangeLog_title = 2131231023;
+			// aapt resource value: 0x7f080134
+			public const int ChangeLog_0_8_1 = 2131231028;
+			
+			// aapt resource value: 0x7f080133
+			public const int ChangeLog_0_8_2 = 2131231027;
+			
+			// aapt resource value: 0x7f080132
+			public const int ChangeLog_0_8_3 = 2131231026;
+			
+			// aapt resource value: 0x7f080131
+			public const int ChangeLog_0_8_4 = 2131231025;
+			
+			// aapt resource value: 0x7f080136
+			public const int ChangeLog_keptDonate = 2131231030;
+			
+			// aapt resource value: 0x7f080130
+			public const int ChangeLog_title = 2131231024;
 			
 			// aapt resource value: 0x7f080029
 			public const int CheckForFileChangesOnSave_key = 2131230761;
 			
+			// aapt resource value: 0x7f08010c
+			public const int CheckForFileChangesOnSave_summary = 2131230988;
+			
 			// aapt resource value: 0x7f08010b
-			public const int CheckForFileChangesOnSave_summary = 2131230987;
+			public const int CheckForFileChangesOnSave_title = 2131230987;
 			
-			// aapt resource value: 0x7f08010a
-			public const int CheckForFileChangesOnSave_title = 2131230986;
-			
-			// aapt resource value: 0x7f08012b
-			public const int CheckingTargetFileForChanges = 2131231019;
+			// aapt resource value: 0x7f08012c
+			public const int CheckingTargetFileForChanges = 2131231020;
 			
 			// aapt resource value: 0x7f080049
 			public const int ClearClipboard = 2131230793;
@@ -1335,14 +1344,14 @@ namespace keepass2android
 			// aapt resource value: 0x7f080035
 			public const int CreditsText = 2131230773;
 			
-			// aapt resource value: 0x7f080129
-			public const int DecodingDatabase = 2131231017;
-			
-			// aapt resource value: 0x7f080124
-			public const int DeletingEntry = 2131231012;
+			// aapt resource value: 0x7f08012a
+			public const int DecodingDatabase = 2131231018;
 			
 			// aapt resource value: 0x7f080125
-			public const int DeletingGroup = 2131231013;
+			public const int DeletingEntry = 2131231013;
+			
+			// aapt resource value: 0x7f080126
+			public const int DeletingGroup = 2131231014;
 			
 			// aapt resource value: 0x7f080082
 			public const int FileNotFound = 2131230850;
@@ -1359,20 +1368,20 @@ namespace keepass2android
 			// aapt resource value: 0x7f08009f
 			public const int MaskedPassword = 2131230879;
 			
-			// aapt resource value: 0x7f08012d
-			public const int MessageSyncQuestion = 2131231021;
+			// aapt resource value: 0x7f08012e
+			public const int MessageSyncQuestion = 2131231022;
 			
 			// aapt resource value: 0x7f08002f
 			public const int OpenKp2aKeyboardAutomatically_key = 2131230767;
 			
+			// aapt resource value: 0x7f080112
+			public const int OpenKp2aKeyboardAutomatically_summary = 2131230994;
+			
 			// aapt resource value: 0x7f080111
-			public const int OpenKp2aKeyboardAutomatically_summary = 2131230993;
+			public const int OpenKp2aKeyboardAutomatically_title = 2131230993;
 			
-			// aapt resource value: 0x7f080110
-			public const int OpenKp2aKeyboardAutomatically_title = 2131230992;
-			
-			// aapt resource value: 0x7f08012a
-			public const int ParsingDatabase = 2131231018;
+			// aapt resource value: 0x7f08012b
+			public const int ParsingDatabase = 2131231019;
 			
 			// aapt resource value: 0x7f080023
 			public const int QuickUnlockDefaultEnabled_key = 2131230755;
@@ -1407,8 +1416,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800f1
 			public const int QuickUnlock_lockButton = 2131230961;
 			
-			// aapt resource value: 0x7f080117
-			public const int RecycleBin = 2131230999;
+			// aapt resource value: 0x7f080118
+			public const int RecycleBin = 2131231000;
 			
 			// aapt resource value: 0x7f0800fc
 			public const int SaveAttachmentDialog_open = 2131230972;
@@ -1428,20 +1437,20 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800fd
 			public const int SaveAttachment_doneMessage = 2131230973;
 			
-			// aapt resource value: 0x7f080126
-			public const int SettingPassword = 2131231014;
-			
-			// aapt resource value: 0x7f08010d
-			public const int ShowCopyToClipboardNotification_summary = 2131230989;
-			
-			// aapt resource value: 0x7f08010c
-			public const int ShowCopyToClipboardNotification_title = 2131230988;
-			
-			// aapt resource value: 0x7f08010f
-			public const int ShowKp2aKeyboardNotification_summary = 2131230991;
+			// aapt resource value: 0x7f080127
+			public const int SettingPassword = 2131231015;
 			
 			// aapt resource value: 0x7f08010e
-			public const int ShowKp2aKeyboardNotification_title = 2131230990;
+			public const int ShowCopyToClipboardNotification_summary = 2131230990;
+			
+			// aapt resource value: 0x7f08010d
+			public const int ShowCopyToClipboardNotification_title = 2131230989;
+			
+			// aapt resource value: 0x7f080110
+			public const int ShowKp2aKeyboardNotification_summary = 2131230992;
+			
+			// aapt resource value: 0x7f08010f
+			public const int ShowKp2aKeyboardNotification_title = 2131230991;
 			
 			// aapt resource value: 0x7f08001e
 			public const int ShowUsernameInList_key = 2131230750;
@@ -1455,8 +1464,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f08002b
 			public const int SuggestionsURL = 2131230763;
 			
-			// aapt resource value: 0x7f08012e
-			public const int SynchronizingDatabase = 2131231022;
+			// aapt resource value: 0x7f08012f
+			public const int SynchronizingDatabase = 2131231023;
 			
 			// aapt resource value: 0x7f08001d
 			public const int TanExpiresOnUse_key = 2131230749;
@@ -1467,17 +1476,17 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800e0
 			public const int TanExpiresOnUse_title = 2131230944;
 			
-			// aapt resource value: 0x7f08012c
-			public const int TitleSyncQuestion = 2131231020;
+			// aapt resource value: 0x7f08012d
+			public const int TitleSyncQuestion = 2131231021;
 			
-			// aapt resource value: 0x7f080128
-			public const int TransformingKey = 2131231016;
+			// aapt resource value: 0x7f080129
+			public const int TransformingKey = 2131231017;
 			
 			// aapt resource value: 0x7f08002c
 			public const int TranslationURL = 2131230764;
 			
-			// aapt resource value: 0x7f080127
-			public const int UndoingChanges = 2131231015;
+			// aapt resource value: 0x7f080128
+			public const int UndoingChanges = 2131231016;
 			
 			// aapt resource value: 0x7f080026
 			public const int UsageCount_key = 2131230758;
@@ -1485,11 +1494,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f080028
 			public const int UseFileTransactions_key = 2131230760;
 			
-			// aapt resource value: 0x7f080109
-			public const int UseFileTransactions_summary = 2131230985;
+			// aapt resource value: 0x7f08010a
+			public const int UseFileTransactions_summary = 2131230986;
 			
-			// aapt resource value: 0x7f080108
-			public const int UseFileTransactions_title = 2131230984;
+			// aapt resource value: 0x7f080109
+			public const int UseFileTransactions_title = 2131230985;
 			
 			// aapt resource value: 0x7f08002e
 			public const int UseKp2aKeyboard_key = 2131230766;
@@ -1596,8 +1605,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f080051
 			public const int creating_db_key = 2131230801;
 			
-			// aapt resource value: 0x7f080107
-			public const int credentials_dialog_title = 2131230983;
+			// aapt resource value: 0x7f080108
+			public const int credentials_dialog_title = 2131230984;
 			
 			// aapt resource value: 0x7f080052
 			public const int current_group = 2131230802;
@@ -1608,8 +1617,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f080054
 			public const int database = 2131230804;
 			
-			// aapt resource value: 0x7f080106
-			public const int database_loaded_quickunlock_enabled = 2131230982;
+			// aapt resource value: 0x7f080107
+			public const int database_loaded_quickunlock_enabled = 2131230983;
 			
 			// aapt resource value: 0x7f0800ca
 			public const int database_name = 2131230922;
@@ -1638,6 +1647,9 @@ namespace keepass2android
 			// aapt resource value: 0x7f08001f
 			public const int default_username_key = 2131230751;
 			
+			// aapt resource value: 0x7f080106
+			public const int delete_extra_string = 2131230982;
+			
 			// aapt resource value: 0x7f080058
 			public const int digits = 2131230808;
 			
@@ -2037,8 +2049,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f080103
 			public const int protection = 2131230979;
 			
-			// aapt resource value: 0x7f080120
-			public const int rate_app = 2131231008;
+			// aapt resource value: 0x7f080121
+			public const int rate_app = 2131231009;
 			
 			// aapt resource value: 0x7f0800df
 			public const int regular_expression = 2131230943;
@@ -2130,14 +2142,14 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800ea
 			public const int start_open_url = 2131230954;
 			
-			// aapt resource value: 0x7f08011f
-			public const int suggest_improvements = 2131231007;
+			// aapt resource value: 0x7f080120
+			public const int suggest_improvements = 2131231008;
 			
 			// aapt resource value: 0x7f08001c
 			public const int timeout_key = 2131230748;
 			
-			// aapt resource value: 0x7f080121
-			public const int translate_app = 2131231009;
+			// aapt resource value: 0x7f080122
+			public const int translate_app = 2131231010;
 			
 			// aapt resource value: 0x7f0800d8
 			public const int twofish = 2131230936;
diff --git a/src/keepass2android/Resources/layout-v14/entry_edit_section.xml b/src/keepass2android/Resources/layout-v14/entry_edit_section.xml
deleted file mode 100644
index 74528ab7..00000000
--- a/src/keepass2android/Resources/layout-v14/entry_edit_section.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:paddingTop="1dip"
-    android:gravity="center_vertical"
-    android:layout_height="wrap_content">
-    <EditText
-        android:id="@+id/title"
-        android:singleLine="true"
-        android:inputType="text"
-        android:hint="@string/field_name"
-        style="@style/TextAppearance_EditEntry_Value"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:gravity="top|left"
-        android:layout_marginRight="0dip" />
-    <EditText
-        android:id="@+id/value"
-        android:hint="@string/field_value"
-        android:inputType="textMultiLine"
-        style="@style/TextAppearance_EditEntry_Value"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="3"
-        android:gravity="top|left"
-        android:layout_marginRight="0dip" />
-    <ImageButton
-        android:id="@+id/delete"
-        style="@style/MinusButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_edit_section.xml b/src/keepass2android/Resources/layout/entry_edit_section.xml
index 74528ab7..77deb9db 100644
--- a/src/keepass2android/Resources/layout/entry_edit_section.xml
+++ b/src/keepass2android/Resources/layout/entry_edit_section.xml
@@ -26,10 +26,17 @@
         android:layout_weight="3"
         android:gravity="top|left"
         android:layout_marginRight="0dip" />
-    <ImageButton
-        android:id="@+id/delete"
-        style="@style/MinusButton"
-        android:layout_width="wrap_content"
+	<CheckBox
+        android:id="@+id/protection"
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+		 android:visibility="gone"
+        android:text="@string/protection"/>
+    <Button
+        android:id="@+id/edit_extra"
+        android:text="…" 
+		android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical" />
+        android:gravity="center_vertical"
+		android:layout_marginRight="8dip" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index a2976f12..8a269407 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -211,9 +211,10 @@
   <string name="error_string_key">A field name is required for each string.</string>
   <string name="field_name">Field Name</string>
   <string name="field_value">Field value</string>
-  <string name="protection">Memory Protection</string>
+  <string name="protection">Protected field</string>
   <string name="add_binary">Add file attachment...</string>
   <string name="add_extra_string">Add additional string</string>
+  <string name="delete_extra_string">Delete additional string</string>
   <string name="database_loaded_quickunlock_enabled">Database loaded, QuickUnlock enabled.</string>
   <string name="credentials_dialog_title">Enter server credentials</string>
   <string name="UseFileTransactions_title">File transactions</string>
@@ -264,11 +265,9 @@
 		* External changes are detected and merged when saving\n
 		* Improved loading performance\n
 		* Improved search toolbar with suggestions\n
-		? New app logo!\n
-		? Added support for .kdbp format for faster loading/saving\n
-		? Improved editing of extra strings and hidden display when protected\n
+		* Added support for .kdbp format for faster loading/saving\n
+		* Improved editing of extra strings and hidden display when protected\n
 		Thanks to Alex Vallat for his code contributions!\n
-		Thanks to Niki Hüttner (www.close-cut.de) for the new logo!\n
 	</string>
 		<string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
 * Username/TAN index displayed in entry list (see settings)\n
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 2db67b8a..a86ce8aa 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -131,7 +131,6 @@
     <Compile Include="services\CopyToClipboardService.cs" />
     <Compile Include="search\SearchActivity.cs" />
     <Compile Include="QuickUnlock.cs" />
-    <Compile Include="views\EntryEditSection.cs" />
     <Compile Include="LifecycleDebugActivity.cs" />
     <Compile Include="services\QuickUnlockForegroundService.cs" />
     <Compile Include="AssemblyInfo.cs" />
@@ -172,6 +171,9 @@
     <None Include="Resources\drawable-xhdpi\2_action_about.png">
       <Visible>False</Visible>
     </None>
+    <AndroidResource Include="Resources\layout\edit_extra_string_dialog.xml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
     <None Include="settings\RoundsPreference %28Kopie%29.cs">
       <Visible>False</Visible>
     </None>
@@ -565,7 +567,9 @@
     <AndroidResource Include="Resources\layout\url_credentials.xml" />
     <AndroidResource Include="Resources\drawable\section_header.xml" />
     <AndroidResource Include="Resources\drawable\extra_string_header.xml" />
-    <AndroidResource Include="Resources\layout\entry_edit_section.xml" />
+    <AndroidResource Include="Resources\layout\entry_edit_section.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\values-de\strings.xml" />
     <AndroidResource Include="Resources\values-ca\strings.xml" />
     <AndroidResource Include="Resources\values-cs\strings.xml" />
@@ -597,7 +601,6 @@
     <AndroidResource Include="Resources\layout-v14\entry_view.xml" />
     <AndroidResource Include="Resources\layout-v14\entry_edit.xml" />
     <AndroidResource Include="Resources\layout-v14\SaveButton.xml" />
-    <AndroidResource Include="Resources\layout-v14\entry_edit_section.xml" />
     <AndroidResource Include="Resources\layout-v14\generate_password.xml" />
     <AndroidResource Include="Resources\layout-v14\icon_picker.xml" />
     <AndroidResource Include="Resources\layout-v14\password.xml" />
diff --git a/src/keepass2android/views/EntryEditSection.cs b/src/keepass2android/views/EntryEditSection.cs
deleted file mode 100644
index 61f1221c..00000000
--- a/src/keepass2android/views/EntryEditSection.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. 
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-using System;
-using Android.Content;
-using Android.Runtime;
-using Android.Util;
-using Android.Widget;
-using KeePassLib.Security;
-
-namespace keepass2android.view
-{
-	public class EntryEditSection : LinearLayout 
-	{
-		public event EventHandler ContentChanged;
-
-		public EntryEditSection (IntPtr javaReference, JniHandleOwnership transfer)
-			: base(javaReference, transfer)
-		{
-			
-		}
-
-		public EntryEditSection(Context context, IAttributeSet attrs) :
-			base (context, attrs)
-		{
-			Initialize();
-		}
-
-		public EntryEditSection(Context context, IAttributeSet attrs, int defStyle) :
-			base (context, attrs, defStyle)
-		{
-			Initialize();
-		}
-
-		private void Initialize()
-		{
-		}
-				
-		
-		public void SetData(String title, ProtectedString value)
-		{
-			SetText(Resource.Id.title, title);
-			SetText(Resource.Id.value, value.ReadString());
-			
-
-		}
-
-		public ImageButton GetDeleteButton()
-		{
-			return (ImageButton)FindViewById(Resource.Id.delete);
-		}
-		
-		private void SetText(int resId, String str)
-		{
-			if (str != null)
-			{
-				TextView tv = (TextView)FindViewById(resId);
-				tv.Text = str;
-				tv.TextChanged += (sender, e) => {
-					if (ContentChanged != null)
-						ContentChanged(this, new EventArgs());
-				};
-			}
-			
-		}
-	}
-}
-