From 5103c80e1ea7e0dcd20e61296bd8baf4a40a8cc4 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 26 Mar 2018 17:06:58 -0400 Subject: [PATCH] set default uri on add cipher --- src/Android/Resources/Resource.Designer.cs | 33 ++++------------------ src/App/Pages/Vault/VaultAddCipherPage.cs | 11 ++++++-- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 81cb43c92..0b96097c2 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -6506,17 +6506,17 @@ namespace Bit.Android // aapt resource value: 0x7f0a0051 public const int ApplicationName = 2131361873; - // aapt resource value: 0x7f0a00b2 - public const int AutoFillServiceDescription = 2131361970; + // aapt resource value: 0x7f0a00ab + public const int AutoFillServiceDescription = 2131361963; - // aapt resource value: 0x7f0a00b1 - public const int AutoFillServiceSummary = 2131361969; + // aapt resource value: 0x7f0a00aa + public const int AutoFillServiceSummary = 2131361962; // aapt resource value: 0x7f0a0050 public const int Hello = 2131361872; - // aapt resource value: 0x7f0a00b3 - public const int MyVault = 2131361971; + // aapt resource value: 0x7f0a00ac + public const int MyVault = 2131361964; // aapt resource value: 0x7f0a0027 public const int abc_action_bar_home_description = 2131361831; @@ -6671,27 +6671,6 @@ namespace Bit.Android // aapt resource value: 0x7f0a000f public const int common_signin_button_text_long = 2131361807; - // aapt resource value: 0x7f0a00ac - public const int default_web_client_id = 2131361964; - - // aapt resource value: 0x7f0a00ad - public const int firebase_database_url = 2131361965; - - // aapt resource value: 0x7f0a00aa - public const int gcm_defaultSenderId = 2131361962; - - // aapt resource value: 0x7f0a00ae - public const int google_api_key = 2131361966; - - // aapt resource value: 0x7f0a00ab - public const int google_app_id = 2131361963; - - // aapt resource value: 0x7f0a00af - public const int google_crash_reporting_api_key = 2131361967; - - // aapt resource value: 0x7f0a00b0 - public const int google_storage_bucket = 2131361968; - // aapt resource value: 0x7f0a0052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; diff --git a/src/App/Pages/Vault/VaultAddCipherPage.cs b/src/App/Pages/Vault/VaultAddCipherPage.cs index 7f41c8b0a..e554a6001 100644 --- a/src/App/Pages/Vault/VaultAddCipherPage.cs +++ b/src/App/Pages/Vault/VaultAddCipherPage.cs @@ -258,7 +258,14 @@ namespace Bit.App.Pages } } - NameCell?.Entry.FocusWithDelay(); + if(NameCell != null && string.IsNullOrWhiteSpace(NameCell.Entry.Text)) + { + NameCell.Entry.FocusWithDelay(); + } + else if(LoginUsernameCell != null && string.IsNullOrWhiteSpace(LoginUsernameCell.Entry.Text)) + { + LoginUsernameCell.Entry.FocusWithDelay(); + } } protected override void OnDisappearing() @@ -440,7 +447,7 @@ namespace Bit.App.Pages TextColor = Colors.Primary }; UrisSection.Add(AddUriCell); - UrisSection.Insert(0, Helpers.MakeUriCell(string.Empty, null, UrisSection, this)); + UrisSection.Insert(0, Helpers.MakeUriCell(_defaultUri ?? string.Empty, null, UrisSection, this)); } else if(_type == CipherType.Card) {