From 6ba396440f6f0ea3a65a79ac977b4167c4526798 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 20 Oct 2017 16:57:48 -0400 Subject: [PATCH] cipher renames --- src/iOS.Extension/LoginAddViewController.cs | 2 +- src/iOS.Extension/LoginListViewController.cs | 10 +++++----- .../Models/{LoginViewModel.cs => CipherViewModel.cs} | 6 +++--- src/iOS.Extension/iOS.Extension.csproj | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename src/iOS.Extension/Models/{LoginViewModel.cs => CipherViewModel.cs} (94%) diff --git a/src/iOS.Extension/LoginAddViewController.cs b/src/iOS.Extension/LoginAddViewController.cs index cbaf1bae4..dc5e27734 100644 --- a/src/iOS.Extension/LoginAddViewController.cs +++ b/src/iOS.Extension/LoginAddViewController.cs @@ -37,7 +37,7 @@ namespace Bit.iOS.Extension public FormEntryTableViewCell PasswordCell { get; set; } = new FormEntryTableViewCell(AppResources.Password); public UITableViewCell GeneratePasswordCell { get; set; } = new UITableViewCell(UITableViewCellStyle.Subtitle, "GeneratePasswordCell"); public SwitchTableViewCell FavoriteCell { get; set; } = new SwitchTableViewCell(AppResources.Favorite); - public FormEntryTableViewCell NotesCell { get; set; } = new FormEntryTableViewCell(useTextView: true, height: 90); + public FormEntryTableViewCell NotesCell { get; set; } = new FormEntryTableViewCell(useTextView: true, height: 180); public PickerTableViewCell FolderCell { get; set; } = new PickerTableViewCell(AppResources.Folder); public override void ViewWillAppear(bool animated) diff --git a/src/iOS.Extension/LoginListViewController.cs b/src/iOS.Extension/LoginListViewController.cs index 9ae7f1409..2835ee21d 100644 --- a/src/iOS.Extension/LoginListViewController.cs +++ b/src/iOS.Extension/LoginListViewController.cs @@ -102,7 +102,7 @@ namespace Bit.iOS.Extension { private const string CellIdentifier = "TableCell"; - private IEnumerable _tableItems = new List(); + private IEnumerable _tableItems = new List(); private Context _context; private LoginListViewController _controller; private ICipherService _cipherService; @@ -132,13 +132,13 @@ namespace Bit.iOS.Extension combinedLogins.AddRange(logins.Item2); } - _tableItems = combinedLogins.Select(s => new LoginViewModel(s)) + _tableItems = combinedLogins.Select(s => new CipherViewModel(s)) .OrderBy(s => s.Name) .ThenBy(s => s.Username) - .ToList() ?? new List(); + .ToList() ?? new List(); } - public IEnumerable TableItems { get; set; } + public IEnumerable TableItems { get; set; } public override nint RowsInSection(UITableView tableview, nint section) { @@ -272,7 +272,7 @@ namespace Bit.iOS.Extension } } - private string GetTotp(LoginViewModel item) + private string GetTotp(CipherViewModel item) { string totp = null; if(_isPremium) diff --git a/src/iOS.Extension/Models/LoginViewModel.cs b/src/iOS.Extension/Models/CipherViewModel.cs similarity index 94% rename from src/iOS.Extension/Models/LoginViewModel.cs rename to src/iOS.Extension/Models/CipherViewModel.cs index 0ab937e12..c8b614d1b 100644 --- a/src/iOS.Extension/Models/LoginViewModel.cs +++ b/src/iOS.Extension/Models/CipherViewModel.cs @@ -5,9 +5,9 @@ using System.Linq; namespace Bit.iOS.Extension.Models { - public class LoginViewModel + public class CipherViewModel { - public LoginViewModel(Cipher cipher) + public CipherViewModel(Cipher cipher) { Id = cipher.Id; Name = cipher.Name?.Decrypt(cipher.OrganizationId); @@ -26,7 +26,7 @@ namespace Bit.iOS.Extension.Models foreach(var field in cipher.Fields) { fields.Add(new Tuple( - field.Name?.Decrypt(cipher.OrganizationId), + field.Name?.Decrypt(cipher.OrganizationId), field.Value?.Decrypt(cipher.OrganizationId))); } return fields; diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index 7903e7f5f..f72839139 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -259,7 +259,7 @@ - +