bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-06 02:23:57 +00:00
Code Issues Releases Wiki Activity

Reactor rename Sites => Logins

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-03 00:17:15 -05:00
parent a176542114
commit 991afb7722
45 changed files with 543 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/iOS.Extension/LoadingViewController.cs
View File

@@ -123,22 +123,22 @@ namespace Bit.iOS.Extension
var navController = segue.DestinationViewController as UINavigationController;
if(navController != null)
{
var listSiteController = navController.TopViewController as SiteListViewController;
var addSiteController = navController.TopViewController as SiteAddViewController;
var listLoginController = navController.TopViewController as LoginListViewController;
var addLoginController = navController.TopViewController as LoginAddViewController;
var fingerprintViewController = navController.TopViewController as LockFingerprintViewController;
var pinViewController = navController.TopViewController as LockPinViewController;
var passwordViewController = navController.TopViewController as LockPasswordViewController;
var setupViewController = navController.TopViewController as SetupViewController;
if(listSiteController != null)
if(listLoginController != null)
{
listSiteController.Context = _context;
listSiteController.LoadingController = this;
listLoginController.Context = _context;
listLoginController.LoadingController = this;
}
else if(addSiteController != null)
else if(addLoginController != null)
{
addSiteController.Context = _context;
addSiteController.LoadingController = this;
addLoginController.Context = _context;
addLoginController.LoadingController = this;
}
else if(fingerprintViewController != null)
{
@@ -174,12 +174,12 @@ namespace Bit.iOS.Extension
private void ContinueOn()
{
Debug.WriteLine("BW Log, Segue to setup, site add or list.");
Debug.WriteLine("BW Log, Segue to setup, login add or list.");
_settings.AddOrUpdateValue(App.Constants.LastActivityDate, DateTime.UtcNow);
if(_context.ProviderType == Constants.UTTypeAppExtensionSaveLoginAction)
{
PerformSegue("newSiteSegue", this);
PerformSegue("newLoginSegue", this);
}
else if(_context.ProviderType == Constants.UTTypeAppExtensionSetup)
{
@@ -187,7 +187,7 @@ namespace Bit.iOS.Extension
}
else
{
PerformSegue("siteListSegue", this);
PerformSegue("loginListSegue", this);
}
}
@@ -271,7 +271,7 @@ namespace Bit.iOS.Extension
.RegisterType<IKeyDerivationService, CommonCryptoKeyDerivationService>(new ContainerControlledLifetimeManager())
.RegisterType<IAuthService, AuthService>(new ContainerControlledLifetimeManager())
.RegisterType<IFolderService, FolderService>(new ContainerControlledLifetimeManager())
.RegisterType<ISiteService, SiteService>(new ContainerControlledLifetimeManager())
.RegisterType<ILoginService, LoginService>(new ContainerControlledLifetimeManager())
.RegisterType<ISyncService, SyncService>(new ContainerControlledLifetimeManager())
.RegisterType<IPasswordGenerationService, PasswordGenerationService>(new ContainerControlledLifetimeManager())
.RegisterType<IAppIdService, AppIdService>(new ContainerControlledLifetimeManager())
@@ -283,8 +283,8 @@ namespace Bit.iOS.Extension
// Repositories
.RegisterType<IFolderRepository, FolderRepository>(new ContainerControlledLifetimeManager())
.RegisterType<IFolderApiRepository, FolderApiRepository>(new ContainerControlledLifetimeManager())
.RegisterType<ISiteRepository, SiteRepository>(new ContainerControlledLifetimeManager())
.RegisterType<ISiteApiRepository, SiteApiRepository>(new ContainerControlledLifetimeManager())
.RegisterType<ILoginRepository, LoginRepository>(new ContainerControlledLifetimeManager())
.RegisterType<ILoginApiRepository, LoginApiRepository>(new ContainerControlledLifetimeManager())
.RegisterType<IAuthApiRepository, AuthApiRepository>(new ContainerControlledLifetimeManager())
// Other
.RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
@@ -326,7 +326,7 @@ namespace Bit.iOS.Extension
Debug.WriteLine("BW LOG, ProviderType: " + _context.ProviderType);
Debug.WriteLine("BW LOG, Url: " + _context.Url);
Debug.WriteLine("BW LOG, Title: " + _context.SiteTitle);
Debug.WriteLine("BW LOG, Title: " + _context.LoginTitle);
Debug.WriteLine("BW LOG, Username: " + _context.Username);
Debug.WriteLine("BW LOG, Password: " + _context.Password);
Debug.WriteLine("BW LOG, Old Password: " + _context.OldPassword);
@@ -409,7 +409,7 @@ namespace Bit.iOS.Extension
_context.Url = new Uri(url);
}
_context.SiteTitle = title;
_context.LoginTitle = title;
_context.Username = username;
_context.Password = password;
_context.Notes = notes;
@@ -436,7 +436,7 @@ namespace Bit.iOS.Extension
_context.Url = new Uri(url);
}
_context.SiteTitle = title;
_context.LoginTitle = title;
_context.Username = username;
_context.Password = password;
_context.OldPassword = oldPassword;

14
src/iOS.Extension/MainInterface.storyboard
View File

@@ -28,11 +28,11 @@
</constraints>
</view>
<connections>
<segue destination="oCZ-GQ-aOK" kind="show" identifier="siteListSegue" id="1679"/>
<segue destination="oCZ-GQ-aOK" kind="show" identifier="loginListSegue" id="1679"/>
<segue id="8446" destination="6512" kind="presentation" identifier="lockFingerprintSegue"/>
<segue id="8924" destination="6815" kind="presentation" identifier="lockPinSegue"/>
<segue id="9874" destination="6855" kind="presentation" identifier="lockPasswordSegue"/>
<segue id="10498" destination="1845" kind="presentation" identifier="newSiteSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
<segue id="10498" destination="1845" kind="presentation" identifier="newLoginSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
<segue id="11089" destination="10580" kind="presentation" modalTransitionStyle="coverVertical" identifier="setupSegue"/>
</connections>
</viewController>
@@ -100,7 +100,7 @@
</scene>
<scene sceneID="2086">
<objects>
<tableViewController id="2087" sceneMemberID="viewController" customClass="SiteAddViewController">
<tableViewController id="2087" sceneMemberID="viewController" customClass="LoginAddViewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" id="2088" opaque="NO" allowsSelection="NO">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -112,7 +112,7 @@
<sections/>
<color key="sectionIndexBackgroundColor" colorSpace="calibratedWhite" white="0" alpha="0"/>
</tableView>
<navigationItem title="Add Site" id="2252" key="navigationItem">
<navigationItem title="Add Login" id="2252" key="navigationItem">
<barButtonItem title="Cancel" id="3747" translatesAutoresizingMaskIntoConstraints="NO" key="leftBarButtonItem">
<color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
<connections>
@@ -139,7 +139,7 @@
</scene>
<scene sceneID="2303">
<objects>
<tableViewController id="2304" sceneMemberID="viewController" customClass="SiteListViewController">
<tableViewController id="2304" sceneMemberID="viewController" customClass="LoginListViewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="2305">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -176,14 +176,14 @@
</connections>
</tableView>
<connections>
<segue id="3731" destination="1845" kind="presentation" identifier="siteAddSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
<segue id="3731" destination="1845" kind="presentation" identifier="loginAddSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical"/>
<outlet property="AddBarButton" destination="3736" id="name-outlet-3736"/>
<outlet property="CancelBarButton" destination="3735" id="name-outlet-3735"/>
<outlet property="NavItem" destination="3734" id="name-outlet-3734"/>
</connections>
<toolbarItems/>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
<navigationItem title="Sites" id="3734" translatesAutoresizingMaskIntoConstraints="NO" key="navigationItem">
<navigationItem title="Logins" id="3734" translatesAutoresizingMaskIntoConstraints="NO" key="navigationItem">
<barButtonItem title="Cancel" id="3735" translatesAutoresizingMaskIntoConstraints="NO" key="leftBarButtonItem">
<color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
<connections>

2
src/iOS.Extension/Models/Context.cs
View File

@@ -29,7 +29,7 @@ namespace Bit.iOS.Extension.Models
return _domainName;
}
}
public string SiteTitle { get; set; }
public string LoginTitle { get; set; }
public string Username { get; set; }
public string Password { get; set; }
public string OldPassword { get; set; }

14
src/iOS.Extension/Models/SiteViewModel.cs
View File

@@ -5,19 +5,19 @@ using Bit.App.Models;
namespace Bit.iOS.Extension.Models
{
public class SiteViewModel
public class LoginViewModel
{
private string _uri;
private DomainName _domain = null;
private bool _domainParsed = false;
public SiteViewModel(Site site)
public LoginViewModel(Login login)
{
Id = site.Id;
Name = site.Name?.Decrypt();
Username = site.Username?.Decrypt();
Password = site.Password?.Decrypt();
Uri = site.Uri?.Decrypt();
Id = login.Id;
Name = login.Name?.Decrypt();
Username = login.Username?.Decrypt();
Password = login.Password?.Decrypt();
Uri = login.Uri?.Decrypt();
}
public string Id { get; set; }

2
src/iOS.Extension/PasswordGeneratorViewController.cs
View File

@@ -25,7 +25,7 @@ namespace Bit.iOS.Extension
{ }
public Context Context { get; set; }
public SiteAddViewController Parent { get; set; }
public LoginAddViewController Parent { get; set; }
public UITableViewController OptionsTableViewController { get; set; }
public SwitchTableViewCell UppercaseCell { get; set; } = new SwitchTableViewCell("A-Z");
public SwitchTableViewCell LowercaseCell { get; set; } = new SwitchTableViewCell("a-z");

30
src/iOS.Extension/SiteAddViewController.cs
View File

@@ -17,19 +17,19 @@ using Bit.iOS.Core.Controllers;
namespace Bit.iOS.Extension
{
public partial class SiteAddViewController : ExtendedUITableViewController
public partial class LoginAddViewController : ExtendedUITableViewController
{
private ISiteService _siteService;
private ILoginService _loginService;
private IFolderService _folderService;
private IConnectivity _connectivity;
private IEnumerable<Folder> _folders;
private IGoogleAnalyticsService _googleAnalyticsService;
public SiteAddViewController(IntPtr handle) : base(handle)
public LoginAddViewController(IntPtr handle) : base(handle)
{ }
public Context Context { get; set; }
public SiteListViewController SiteListController { get; set; }
public LoginListViewController LoginListController { get; set; }
public LoadingViewController LoadingController { get; set; }
public FormEntryTableViewCell NameCell { get; set; } = new FormEntryTableViewCell(AppResources.Name);
public FormEntryTableViewCell UriCell { get; set; } = new FormEntryTableViewCell(AppResources.URI);
@@ -49,12 +49,12 @@ namespace Bit.iOS.Extension
public override void ViewDidLoad()
{
_siteService = Resolver.Resolve<ISiteService>();
_loginService = Resolver.Resolve<ILoginService>();
_connectivity = Resolver.Resolve<IConnectivity>();
_folderService = Resolver.Resolve<IFolderService>();
_googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
NavItem.Title = AppResources.AddSite;
NavItem.Title = AppResources.AddLogin;
CancelBarButton.Title = AppResources.Cancel;
SaveBarButton.Title = AppResources.Save;
View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
@@ -121,7 +121,7 @@ namespace Bit.iOS.Extension
partial void CancelBarButton_Activated(UIBarButtonItem sender)
{
if(SiteListController != null)
if(LoginListController != null)
{
DismissViewController(true, null);
}
@@ -151,7 +151,7 @@ namespace Bit.iOS.Extension
return;
}
var site = new Site
var login = new Login
{
Uri = string.IsNullOrWhiteSpace(UriCell.TextField.Text) ? null : UriCell.TextField.Text.Encrypt(),
Name = string.IsNullOrWhiteSpace(NameCell.TextField.Text) ? null : NameCell.TextField.Text.Encrypt(),
@@ -162,17 +162,17 @@ namespace Bit.iOS.Extension
FolderId = FolderCell.SelectedIndex == 0 ? null : _folders.ElementAtOrDefault(FolderCell.SelectedIndex - 1)?.Id
};
var saveTask = _siteService.SaveAsync(site);
var saveTask = _loginService.SaveAsync(login);
var loadingAlert = Dialogs.CreateLoadingAlert(AppResources.Saving);
PresentViewController(loadingAlert, true, null);
await saveTask;
if(saveTask.Result.Succeeded)
{
_googleAnalyticsService.TrackExtensionEvent("CreatedSite");
if(SiteListController != null)
_googleAnalyticsService.TrackExtensionEvent("CreatedLogin");
if(LoginListController != null)
{
SiteListController.DismissModal();
LoginListController.DismissModal();
}
else if(LoadingController != null)
{
@@ -216,9 +216,9 @@ namespace Bit.iOS.Extension
public class TableSource : UITableViewSource
{
private SiteAddViewController _controller;
private LoginAddViewController _controller;
public TableSource(SiteAddViewController controller)
public TableSource(LoginAddViewController controller)
{
_controller = controller;
}
@@ -302,7 +302,7 @@ namespace Bit.iOS.Extension
{
if(section == 0)
{
return AppResources.SiteInformation;
return AppResources.LoginInformation;
}
else if(section == 2)
{

4
src/iOS.Extension/SiteAddViewController.designer.cs generated
View File

@@ -11,8 +11,8 @@ using UIKit;
namespace Bit.iOS.Extension
{
[Register ("SiteAddViewController")]
partial class SiteAddViewController
[Register ("LoginAddViewController")]
partial class LoginAddViewController
{
[Outlet]
[GeneratedCode ("iOS Designer", "1.0")]

38
src/iOS.Extension/SiteListViewController.cs
View File

@@ -17,9 +17,9 @@ using Bit.App.Resources;
namespace Bit.iOS.Extension
{
public partial class SiteListViewController : ExtendedUITableViewController
public partial class LoginListViewController : ExtendedUITableViewController
{
public SiteListViewController(IntPtr handle) : base(handle)
public LoginListViewController(IntPtr handle) : base(handle)
{ }
public Context Context { get; set; }
@@ -35,7 +35,7 @@ namespace Bit.iOS.Extension
public async override void ViewDidLoad()
{
base.ViewDidLoad();
NavItem.Title = AppResources.Sites;
NavItem.Title = AppResources.Logins;
if(!CanAutoFill())
{
CancelBarButton.Title = AppResources.Close;
@@ -71,7 +71,7 @@ namespace Bit.iOS.Extension
partial void AddBarButton_Activated(UIBarButtonItem sender)
{
PerformSegue("siteAddSegue", this);
PerformSegue("loginAddSegue", this);
}
public override void PrepareForSegue(UIStoryboardSegue segue, NSObject sender)
@@ -79,11 +79,11 @@ namespace Bit.iOS.Extension
var navController = segue.DestinationViewController as UINavigationController;
if(navController != null)
{
var addSiteController = navController.TopViewController as SiteAddViewController;
if(addSiteController != null)
var addLoginController = navController.TopViewController as LoginAddViewController;
if(addLoginController != null)
{
addSiteController.Context = Context;
addSiteController.SiteListController = this;
addLoginController.Context = Context;
addLoginController.LoginListController = this;
}
}
}
@@ -101,11 +101,11 @@ namespace Bit.iOS.Extension
{
private const string CellIdentifier = "TableCell";
private IEnumerable<SiteViewModel> _tableItems;
private IEnumerable<LoginViewModel> _tableItems;
private Context _context;
private SiteListViewController _controller;
private LoginListViewController _controller;
public TableSource(SiteListViewController controller)
public TableSource(LoginListViewController controller)
{
_context = controller.Context;
_controller = controller;
@@ -113,20 +113,20 @@ namespace Bit.iOS.Extension
public async Task LoadItemsAsync()
{
_tableItems = new List<SiteViewModel>();
_tableItems = new List<LoginViewModel>();
if(_context.DomainName != null)
{
var siteService = Resolver.Resolve<ISiteService>();
var sites = await siteService.GetAllAsync();
var siteModels = sites.Select(s => new SiteViewModel(s));
_tableItems = siteModels
var loginService = Resolver.Resolve<ILoginService>();
var logins = await loginService.GetAllAsync();
var loginModels = logins.Select(s => new LoginViewModel(s));
_tableItems = loginModels
.Where(s => s.Domain != null && s.Domain.BaseDomain == _context.DomainName.BaseDomain)
.OrderBy(s => s.Name).ThenBy(s => s.Username)
.ToList();
}
}
public IEnumerable<SiteViewModel> TableItems { get; set; }
public IEnumerable<LoginViewModel> TableItems { get; set; }
public override nint RowsInSection(UITableView tableview, nint section)
{
@@ -138,7 +138,7 @@ namespace Bit.iOS.Extension
if(_tableItems.Count() == 0)
{
var noDataCell = new UITableViewCell(UITableViewCellStyle.Default, "NoDataCell");
noDataCell.TextLabel.Text = AppResources.NoSitesTap;
noDataCell.TextLabel.Text = AppResources.NoLoginsTap;
noDataCell.TextLabel.TextAlignment = UITextAlignment.Center;
noDataCell.TextLabel.LineBreakMode = UILineBreakMode.WordWrap;
noDataCell.TextLabel.Lines = 0;
@@ -176,7 +176,7 @@ namespace Bit.iOS.Extension
if(_tableItems.Count() == 0)
{
_controller.PerformSegue("siteAddSegue", this);
_controller.PerformSegue("loginAddSegue", this);
return;
}

4
src/iOS.Extension/SiteListViewController.designer.cs generated
View File

@@ -11,8 +11,8 @@ using UIKit;
namespace Bit.iOS.Extension
{
[Register ("SiteListViewController")]
partial class SiteListViewController
[Register ("LoginListViewController")]
partial class LoginListViewController
{
[Outlet]
[GeneratedCode ("iOS Designer", "1.0")]