nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-20 10:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved custom TOTP setup code into place where all the editors will reside

Browse Source
This commit is contained in:
Michael Starke
2021-11-01 15:44:56 +01:00
parent cc0a855712
commit 3ea8937d11
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MacPass/MPEntryInspectorViewController.m
View File

@@ -62,8 +62,8 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
};
typedef NS_ENUM(NSUInteger, MPInpspectorEditorIndex) {
//MPInpspectorEditorIndexImageEditor,
//MPInpspectorEditorIndexTitle,
MPInpspectorEditorIndexImageEditor,
MPInpspectorEditorIndexTitle,
MPInpspectorEditorIndexUsername,
MPInpspectorEditorIndexPassword,
MPInpspectorEditorIndexURL,
@@ -145,7 +145,6 @@ typedef NS_ENUM(NSUInteger, MPInpspectorEditorIndex) {
[NSNotificationCenter.defaultCenter removeObserver:self name:KPKDidChangeEntryNotification object:self.representedEntry];
}
super.representedObject = representedObject;
self.totpViewController.representedObject = self.representedObject;
[self _updateEditors];
@@ -212,9 +211,7 @@ typedef NS_ENUM(NSUInteger, MPInpspectorEditorIndex) {
[self.togglePassword bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(showPassword)) options:nil];
self.tagsTokenField.delegate = _tagTokenFieldDelegate;
[self _setupTOPTView];
[self _setupAttributeEditors];
[self _updateEditors];
@@ -630,19 +627,24 @@ typedef NS_ENUM(NSUInteger, MPInpspectorEditorIndex) {
}
- (void)_setupAttributeEditors {
self.totpViewController = [[MPTOTPViewController alloc] init];
NSInteger urlindex = [self.fieldsStackView.arrangedSubviews indexOfObject:self.URLTextField];
NSAssert(urlindex != NSNotFound, @"Missing reference view. This should not happen!");
[self addChildViewController:self.totpViewController];
[self.fieldsStackView insertArrangedSubview:self.totpViewController.view atIndex:urlindex - 1];
/*
MPNodeExpirationViewController *vc = [[MPNodeExpirationViewController alloc] init];
vc.isEditor = NO;
[_attributeEditorViewControllers addObject:vc];
[self.fieldsStackView addArrangedSubview:vc.view];
*/
MPEntryAttributeViewController *vc = [[MPEntryAttributeViewController alloc] init];
MPEntryAttributeViewController *vc = [[MPEntryAttributeViewController alloc] init];
vc.isEditor = NO;
[_attributeEditorViewControllers addObject:vc];
[self.fieldsStackView addArrangedSubview:vc.view];
/*
for(NSUInteger index = 0; index < kKPKDefaultEntryKeysCount; index++) {
MPEntryAttributeViewController *vc = [[MPEntryAttributeViewController alloc] init];
vc.isEditor = NO;
@@ -653,16 +655,10 @@ typedef NS_ENUM(NSUInteger, MPInpspectorEditorIndex) {
}
- (void)_updateEditors {
self.totpViewController.representedObject = self.representedObject;
/* Update all the Attribute editors
_attributeEditorViewControllers[MPInpspectorEditorIndexUsername].representedObject = [self.representedEntry attributeWithKey:kKPKUsernameKey];
}
- (void)_setupTOPTView {
self.totpViewController = [[MPTOTPViewController alloc] init];
NSInteger urlindex = [self.fieldsStackView.arrangedSubviews indexOfObject:self.URLTextField];
NSAssert(urlindex != NSNotFound, @"Missing reference view. This should not happen!");
[self addChildViewController:self.totpViewController];
[self.fieldsStackView insertArrangedSubview:self.totpViewController.view atIndex:urlindex - 1];
*/
}
#pragma mark -